Changeset 706

Timestamp:

Jul 9, 2012, 11:30:49 AM (13 years ago)

Author:

Herwig Bauernfeind

Message:

usermod 2.3.5, groupmod 2.2.3: Fix: Also convert old *nix machine accounts to upper case

Location:

branches/scripts

Files:

• group/groupmod.cmd (modified) (2 diffs)
• user/usermod.cmd (modified) (2 diffs)

branches/scripts/group/groupmod.cmd

@@ -1 +1 @@
 /* GroupMod script for Samba Server for eCS (OS/2) */
-   Version = '2.2.2'
+   Version = '2.2.3'
 /* Copyright (C) netlabs.org 2007-2012
 
@@ -312 +312 @@
 
 _GroupJoin: /* Add a new user to the groups user STEM */
+    /* Translate machine account to upper case - Samba 3.3 needs this */
+    if right(User,1) = "$" then User = translate(User)
     do I = 1 to groupname.0
         if translate(groupname.I) = translate(group) then do

branches/scripts/user/usermod.cmd

@@ -1 +1 @@
 /* UserMod script for Samba Server for eCS (OS/2) */
-   Version = '2.3.4'
+   Version = '2.3.5'
 /* Copyright (C) netlabs.org, Herwig Bauernfeind 2007-2012
 
@@ -266 +266 @@
         /* parse fields into stem variables */
         J = J + 1
-        parse var userline username.J':'password.J':'uid.J':'gid.J':'LoginClass.J':'pwchange.J':'deact.J':'gecos.J':'home.J':'shell.J
-        Status.J =""    
+        parse var userline username.J':'password.J':'uid.J':'gid.J':'LoginClass.J':'pwchange.J':'deact.J':'gecos.J':'home.J':'shell.J
+        /* translate any machine account to upper case - Samba 3.3 seems to need this */
+        if right(username.J,1) = "$" then username.J = translate(username.J)
+        Status.J =""
         do K = 1 to J - 1
             if translate(Username.K) = translate(Username.J) then do