Changeset 492

Timestamp:

Oct 25, 2010, 4:56:54 PM (15 years ago)

Author:

Herwig Bauernfeind

Message:

usermod.cmd Ver. 2.3.0

File:

• branches/scripts/user/usermod.cmd (modified) (9 diffs)

branches/scripts/user/usermod.cmd

@@ -1 +1 @@
 /* UserMod script for Samba Server for eCS (OS/2) */
-   Version = '2.2.1'
-/* Copyright (C) netlabs.org 2007-2009
+   Version = '2.3.0'
+/* Copyright (C) netlabs.org, Herwig Bauernfeind 2007-2010
 
    This program is free software; you can redistribute it and/or modify
@@ -62 +62 @@
 UserExists = _UserIsValid(User)
 select 
+    when mode = "F" & user <> "" then do
+        say 'Must not specify user when fixing home directories!'
+        exit 247
+    end
     when mode = "P" & \UserExists then do
         say 'User "'User'" is invalid - cannot set primary GID!'
@@ -90 +94 @@
         exit 254
     end
-    when mode = "?" | mode = "H" | arg(1) = "/?" | (User = "" & mode <> "") then do
+    when mode = "?" | mode = "H" | arg(1) = "/?" | (User = "" & mode <> "" & mode <>"F") then do
         if (User = "" & mode <> "" & mode <> "?" & mode <> "H") then say "Ambiguos commandline. Check syntax!"
         say 
@@ -97 +101 @@
         say 'Rename a kLIBC user:    usermod -r "oldusername" "newusername"'
         say 'Set user''s primary GID: usermod -p "username" "group"'
+        say 'Fix home directories:   usermod -f'
         say
         say 'usermod without parameters just rewrites kLIBC password database'
@@ -109 +114 @@
     when mode = "R" then call _UserRename
     when mode = "P" then call _SetPrimaryGID
+    when mode = "F" then call _FixHomes
     otherwise nop
 end
@@ -378 +384 @@
 _UserAdd: /* add a user to master.passwd STEMS and group STEMS */
     /* Minimum UID that a user can obtain */
-call beep 880, 50
     MinUID = 100
     if translate(User) = "ROOT"   then MinUID = 0
@@ -403 +408 @@
     pwchange.I   = '0'     /* dummy value */
     deact.I      = '0'     /* dummy value */
-    if \MachineAccount then do
+    if \MachineAccount then do /* Human users */
         if uid.I = 0 then do
             if Group512 <> 0 then gid.I = 512; else gid.I = 0
@@ -411 +416 @@
                 then gid.I = 513; else gid.I = NextUID /* GID must be UID for guest account */
         end
-        gecos.I      = User                /* not really appropriate, but better than a dummy value */
-        home.I       = '/nonexistent'      /* a suitable default for OS/2 should be added here */
-        shell.I      = '/usr/sbin/nologin' /* dummy value */
-    end
-    else do
+        gecos.I      = User                 /* not really appropriate, but better than a dummy value */
+        home.I       = _Home(User)          /* make sure %HOME%\User is created */
+        shell.I      = '/usr/sbin/nologin'  /* dummy value */
+    end
+    else do /* Machine accounts */
         if Group515 <> 0 then gid.I = 515; else gid.I = NextUID /* Should be group ID (GID) !!! */
         gecos.I      = 'Machine account'
@@ -499 +504 @@
     end
 return
+
+_Home: procedure
+    user = arg(1)
+    curhome = value("HOME",,"OS2ENVIRONMENT")
+    if curhome = "" then do
+        curhome = SysBootDrive()||'\HOME'
+        ok = SysMkDir(Curhome)
+        say
+        say 'WARNING! %HOME% not set properly, assuming "'curhome'"'
+        say 'Add SET HOME='curhome'\default to your CONFIG.SYS.'
+        curhome = curhome||'\'
+    end
+    home = filespec("D",curhome)||filespec("P",curHome)||user
+    ok = SysMkDir(home)
+    home = translate(home,'$/',':\')
+return home
+
+_FixHomes: 
+    say 'Checking home for 'username.0' users.'
+    maxulen = 0
+    maxhlen = 0
+    do I = 1 to username.0
+        ulen = length(username.I)
+        if ulen > maxulen then maxulen = ulen
+        hlen = length(home.I)
+        if hlen > maxhlen then maxhlen = hlen
+    end
+
+    do I = 1 to username.0
+        if pos('$',username.I) = 0 then do /* do not touch machine accounts */
+            os2home = translate(left(home.I,2),':','$')||translate(substr(home.I,3),'\','/')
+            call charout ,'User: 'left(username.I,maxulen)' Home: 'left(os2home,maxhlen)' Status: '
+            if VRFileExists(os2home) = 0 then do
+                oldhome = home.I
+                home.I = _Home(Username.I)
+                os2home = translate(left(home.I,2),':','$')||translate(substr(home.I,3),'\','/')
+                if VRFileExists(os2home) = 0 then do
+                    say 'Could not fix home - reverting...'
+                    home.I = oldhome
+                end
+                else say 'Fixed.'
+            end
+            else say 'OK.'
+        end
+        else do
+            say 'User: 'left(username.I,maxulen)' Home: 'left(home.I,maxhlen)' Status: Machine account.'
+        end
+    end
+    say 'Ready, rewriting database now.'
+return