Changeset 1020 for trunk/guitools/sscc

Timestamp:

May 12, 2017, 4:03:38 PM (8 years ago)

Author:

Herwig Bauernfeind

Message:

GUITools: SSCC: Clean up password mess

Location:

trunk/guitools/sscc

Files:

• sscc.vrp (modified) (1 diff)
• sscc.vrx (modified) (16 diffs)
• sscc.vry (modified) ( previous)

trunk/guitools/sscc/sscc.vrp

@@ -4 +4 @@
 MacroPath: VRM:U:\Develop\Samba\trunk\guitools\sscc
 EXEPath: 
-RunParameters: 
+RunParameters: /install
 RunDirectory: U:\Develop\Samba\trunk\guitools\sscc
 VRXWindow: __VREMainWindow,1,2867,4577,5767,8000
-VRXWindow: __VRESectionListWindow,1,3156,14791,10431,4686
+VRXWindow: __VRESectionListWindow,1,1482,13924,10431,4686
 VRXWindow: __VREToolsWindow,0,4011,10744,6992,1669
 VRXWindow: __VREWindListWindow,1,2072,13539,4710,3150

trunk/guitools/sscc/sscc.vrx

@@ -95 +95 @@
 #append ..\shared\inittempdir.vrs
 #append ..\shared\sambainit.vrs
+#append ..\shared\masterpasswd.vrs
 */
 return
@@ -525 +526 @@
 return
 
-/*:VRX         _MasterPasswdCreate
-*/
-_MasterPasswdCreate: 
-    call lineout samba.!masterpasswd, '# Created by 'VRParseFileName(OurINI,'N')' Ver. 'word(VRGet("Main","Hinttext"),2) 
-    call lineout samba.!masterpasswd, '# syntax:'
-    call lineout samba.!masterpasswd, '# username:passwd:UID:GID:login-class:chg pw x sec:deact x sec:GECOS:home:shell'
-    call lineout samba.!masterpasswd, 'root:*:0:512::0:0:root:/nonexistent:/usr/sbin/nologin'
-    call lineout samba.!masterpasswd, 'guest:*:65534:65534::0:0:guest:/nonexistent:/usr/sbin/nologin'
-    ok = stream(samba.!masterpasswd,'c','close')
-return
-
-/*:VRX         _MasterPasswdFindUser
-*/
-_MasterPasswdFindUser: procedure expose username.
-    IF options.!debug == 1 THEN say '_MasterpasswdFindUser("'arg(1)'") started'
-    FindUser = arg(1)
-    Idx = 0
-    do I = 1 to username.0
-        if translate(username.I) = translate(FindUser) then do
-            Idx = I
-            leave
-        end
-    end
-    IF options.!debug == 1 THEN say '_MasterpasswdFindUser("'FindUser'") done, returning 'Idx
-return idx
-/*:VRX         _MasterPasswdRead
-*/
-_MasterPasswdRead: 
-    IF options.!debug == 1 THEN say '_MasterpasswdRead() started'
-    /* Read complete master.passwd */
-    I = 0
-
-    do until lines(samba.!masterpasswd) = 0
-        userline = strip(linein(samba.!masterpasswd))
-    
-        /* Skip comments */
-        if left(userline,1) = "#" then iterate
-        if left(userline,1) = ";" then iterate  
-
-        /* parse fields into stem variables */
-        I = I + 1
-        parse var userline username.I':'password.I':'uid.I':'gid.I':'LoginClass.I':'pwchange.I':'deact.I':'gecos.I':'home.I':'shell.I
-
-        Status.I =""    
-        do J = 1 to I - 1
-            if translate(Username.J) = translate(Username.I) then do
-                status.I = "DUPLICATE"
-                leave
-            end
-        end
-    end
-    ok = stream(samba.!masterpasswd,'c','close')
-    drop userline
-
-    /* set "stem roots" properly */
-    username.0  = I
-    password.0  = I
-    uid.0       = I
-    gid.0       = I
-    loginclass.0= I
-    pwchange.0  = I
-    deact.0     = I
-    gecos.0     = I
-    home.0      = I
-    shell.0     = I
-
-    /* also smbpasswd stems */
-    lmhash. = ''
-    nthash. = ''
-    flags.  = ''
-    lct.    = ''
-    lmhash.0 = I
-    nthash.0 = I 
-    flags.0  = I 
-    lct.0    = I 
-
-    /* smbusermap stem */
-    MapTo. = ''
-    MapTo.0 = I
-
-    /* our private stem */
-    status.0 = I
-    IF options.!debug == 1 THEN say '_MasterpasswdRead() done, read 'username.0' users'
-return
-
-/*:VRX         _MasterPasswdWrite
-*/
-_MasterpasswdWrite: 
-    IF options.!debug == 1 THEN say "_MasterpasswdWrite() started"
-    newmasterpasswd = TempDir'master.passwd'
-
-    ok = SysFileDelete(newmasterpasswd)
-
-    call lineout newmasterpasswd, '# Created by 'VRParseFileName(OurINI,'N')' Ver. 'word(VRGet("Main","Hinttext"),2) 
-    call lineout newmasterpasswd, '# syntax:'
-    call lineout newmasterpasswd, '# username:passwd:UID:GID:login-class:chg pw x sec:deact x sec:GECOS:home:shell'
-
-    do I = 1 to username.0
-        select 
-            when Status.I = "DUPLICATE" & settings.!FixErrors = 1 then iterate
-            when Status.I = "UID MISMATCH" then do
-                call lineout newmasterpasswd, username.I':'password.I':'word(uid.I,1)':'gid.I':'loginclass.I':'pwchange.I':'deact.I':'gecos.I':'home.I':'shell.I
-            end
-            when Status.I = "UNIX MISSING" & settings.!FixErrors then do
-                call lineout newmasterpasswd, username.I':'password.I':'uid.I':'gid.I':'loginclass.I':'pwchange.I':'deact.I':'gecos.I':'home.I':'shell.I
-            end
-            otherwise call lineout newmasterpasswd, username.I':'password.I':'uid.I':'gid.I':'loginclass.I':'pwchange.I':'deact.I':'gecos.I':'home.I':'shell.I
-        end
-    end
-    ok = stream(newmasterpasswd,'c','close')
-    ok = VRCopyFile( samba.!masterpasswd, samba.!masterpasswd'.bak' )
-    ok = VRCopyFile( newmasterpasswd, samba.!masterpasswd )
-    ok = SysFileDelete(newmasterpasswd)
-    IF options.!debug == 1 THEN say "_MasterpasswdWrite() done"
-return
-
 /*:VRX         _MsgYesNo
 */
@@ -660 +545 @@
 /*:VRX         _MyIniEnum
 */
-_MyIniEnum: procedure expose sections. Voc. Val.
+_MyIniEnum: procedure expose sections. Voc. Val. options.
+    call _debugLog "_MyIniEnum() started."
     CurSection = arg(1)
     do I = 1 to sections.0
@@ -676 +562 @@
         end
     end
+    call _debugLog "_MyIniEnum() done."
 return
 
 /*:VRX         _MyIniEnumSections
 */
-_MyIniEnumSections: procedure expose sections.
-    say '_MyIniEnumSections() started'
+_MyIniEnumSections: procedure expose sections. options.
+    call _DebugLog '_MyIniEnumSections() started'
     smbconf = arg(1)
     sections. = ""
@@ -714 +601 @@
     sections.I.0 = J
     ok = stream(smbconf,'c','close')
-    say '_MyIniEnumSections() done.'
+    call _DebugLog  '_MyIniEnumSections() done.'
 return
 
@@ -896 +783 @@
 /*:VRX         _SambaRootPWCheck
 */
-_SambaRootPWCheck: 
+_SambaRootPWCheck:
+    call _debugLog "_SambaRootPWCheck() started "
     if VRGet("EF_RootPassword","Value") ="" then do
         Msg.type  = "E"
         Msg.Text  = NLVGetMessage(57, "root")
         call _ShowMsg
+        call _debugLog "_SambaRootPWCheck() done, RC = 0 "
         return 0
     end
@@ -907 +796 @@
         Msg.Text  = NLVGetMessage(58,"root")
         call _ShowMsg
+        call _debugLog "_SambaRootPWCheck() done, RC = 0 "
         return 0
     end
@@ -914 +804 @@
         Msg.Text  = NLVGetMessage(59, "root")
         call _ShowMsg
+        call _debugLog "_SambaRootPWCheck() done, RC = 0 "
         return 0
     end
+    call _debugLog "_SambaRootPWCheck() done, RC = 1 "
 return 1
 
@@ -921 +813 @@
 */
 _SambaRootPWSet: 
-    IF options.!debug == 1 THEN say "_SambaRootPWSet() started"
-
+    call _DebugLog "_SambaRootPWSet() started"
     /* Write root password to a temp file */
     pwdfile = TempDir'newpwd'
@@ -928 +819 @@
     call lineout pwdfile, VRGet("EF_RootPassword","value")
     ok = stream(pwdfile,"c","close")
-
     /* update Master.passwd and (s)pwd.db */
     call _MasterPasswdRead
     nx = _MasterPasswdFindUser("root")
-
     call rxFuncAdd "Crypt", "RxCrypt", "RxCrypt"
-
     itoa64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
     salt   = ""
@@ -956 +844 @@
     /* Remove the temp password file */
     ok = SysFileDelete(pwdfile)
-
-
 
     /* Deal with swat */
@@ -973 +859 @@
         else call _SambaShowMsg */
     end
-    IF options.!debug == 1 THEN say "_SambaRootPWSet() done"
+    call _DebugLog THEN say "_SambaRootPWSet() done"
 return
 /*:VRX         _SambaShowError
@@ -1442 +1328 @@
 */
 _SmbConfDefault_ShareDrives: 
+    call _debugLog "_SmbConfDefault_ShareDrives() started."
     DriveList = SysDriveMap('C:','Local')
 
     do I = 1 to words(DriveList)
         CurDrive = word(DriveList,I)
-say CurDrive
+        say "  CurDrive="Curdrive
         Filesys = SysFilesystemType(Curdrive)
         DriveInfo=SysDriveInfo(CurDrive)
@@ -1474 +1361 @@
     end
     ok = stream(smbconf, 'c','close')  
+    call _debugLog "_SmbConfDefault_ShareDrives() done."
 return
 
@@ -3031 +2919 @@
 */
 PB_Install_Default_Click:
+    ok = VRREdirectStdIO("ON")
     if VRGet("EF_Workgroup_Initial","Value") = "" then return
 
@@ -3048 +2937 @@
         call _SambaRootPWSet
     end
+
     call _SambaGuestCreate