Changeset 11609 for branches

Timestamp:

11/10/08 14:33:37 (8 weeks ago)

Author:

juruen@…

Message:

--- Merging r11608 into from trunk into m-0.12.10

Location:

branches/maintenance-0.12-0.12.10/hardy-base/client/samba

Files:

• . (modified) (1 prop)
• ChangeLog (modified) (1 diff)
• conf/80samba.conf (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/EBox/SambaLdapUser.pm (modified) (4 diffs)

branches/maintenance-0.12-0.12.10/hardy-base/client/samba/ChangeLog

@@ +1 @@
+0.12.5
+        + Bugfix. Set loginShell when adding users. By default it takes /bin/false
+        but users can change it using /etc/ebox/80samba.conf
 0.12.4
         + Bugfix. Check and correct if there is a user or group with a wrong SID.

branches/maintenance-0.12-0.12.10/hardy-base/client/samba/conf/80samba.conf

@@ -21 +21 @@
 # enable quota support
 enable_quota = yes
+
+# default login shell for users
+login_shell = /bin/false

branches/maintenance-0.12-0.12.10/hardy-base/client/samba/configure.ac

@@ -1 @@
-AC_INIT([EBox-samba], [0.12.4])
+AC_INIT([EBox-samba], [0.12.5])
 
 AC_CONFIG_AUX_DIR([config])

branches/maintenance-0.12-0.12.10/hardy-base/client/samba/src/EBox/SambaLdapUser.pm

@@ -49 +49 @@
 use constant GECOS              => 'Ebox file sharing user '; 
 use constant USERGROUP          => 513;
+use constant DEFAULT_SHELL      => '/bin/false';
 # Home path for users and groups
 use constant BASEPATH          => '/home/samba';
@@ -125 +126 @@
 
                sambaAcctFlags       => SMBACCTFLAGS,
+
+               loginShel            => _loginShell(),
               };
 
@@ -161 +164 @@
 
                                      sambaSID             => $sambaSID,
+                                    
 
                                      # gecos                => GECOS
@@ -1309 +1313 @@
 }
 
+sub _loginShell
+{
+        my $shell = EBox::Config::configkey('login_shell');
+
+        if (defined($shell)) {
+                return $shell;
+        } else {
+                return DEFAULT_SHELL;
+        }
+}
 1;