Changeset 261 for branches/samba-3.2.x/source/smbd/password.c

Timestamp:

Jun 10, 2009, 7:20:29 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

password.c: $ vs : in 3.2 branch

File:

• branches/samba-3.2.x/source/smbd/password.c (modified) (2 diffs)

branches/samba-3.2.x/source/smbd/password.c

@@ -292 +292 @@
                                 getpwnam_alloc(vuser, vuser->user.unix_name);
                         if (passwd) {
+#ifdef __OS2__
+                        /* On OS/2 we use drive letters which have a colon.  This is also the field
+                           separator in master.passwd, so we use a $ instead of a colon for the drive
+                           separator, ie e$/user instead of e:/user.  This code simply exchanges any $
+                           for a : in the user's homedir */
+                        if (passwd->pw_dir[1] == '$')
+                                        passwd->pw_dir[1] = ':';
+#endif
                                 vuser->unix_homedir = passwd->pw_dir;
+                                
                                 /* Ensure that the unix_homedir now
                                  * belongs to vuser, so it goes away
@@ -347 +356 @@
         vuser->homes_snum = -1;
         
-#ifdef __OS2__
-        /* On OS/2 we use drive letters which have a colon.  This is also the
-           field separator in master.passwd, so we use a $ instead of a colon
-           for the drive separator, ie e$/user instead of e:/user.  This code
-           simply exchanges any $ for a : in the user's homedir */
-        if (vuser->unix_homedir[1] == '$')
-                vuser->unix_homedir[1] = ':';
-#endif
-
         if ( (!vuser->guest) && vuser->unix_homedir && *(vuser->unix_homedir)) {
                 int servicenumber = lp_servicenumber(vuser->user.unix_name);