Changeset 569 for branches/guitools-1.0/smbusers/smbusers.VRX

Timestamp:

Mar 30, 2011, 11:41:45 AM (15 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: SMBUSERS: master.passwd password support

File:

• branches/guitools-1.0/smbusers/smbusers.VRX (modified) (13 diffs)

branches/guitools-1.0/smbusers/smbusers.VRX

@@ -375 +375 @@
 */
 _GroupRecWriteBackToStems: 
+    IF options.!debug == 1 THEN say '_GroupRecWriteBackToStems() started'
     Cur = VRMethod("CN_Groups","GetFieldData", GRH, GNrFH)
     Groupname.Cur = VRMethod("CN_Groups","GetFieldData", GRH, GroupnameFH) 
@@ -380 +381 @@
     GUsers.Cur    = VRMethod("CN_Groups","GetFieldData", GRH, GusersFH)
     if Gusers.Cur = "," then Gusers.Cur = ""
+    IF options.!debug == 1 THEN say '_GroupRecWriteBackToStems() done'
 return
 
@@ -392 +394 @@
     call lineout newgroup, '# groupname:password:GID:user[,user,...,]'
     do I = 1 to groupname.0
-        say "GUsers."I"="Gusers.I
+        /* say "GUsers."I"="Gusers.I */
         if settings.!FixErrors then do
             if Gusers.I = "," then Gusers.I = ""
@@ -534 +536 @@
     if settings.!SyncPrimGID = "" then settings.!SyncPrimGID = 0
 
+    settings.!WriteMasterPwd = VRGetIni( "Settings", "WriteMasterPwd", OurINI)
+    if settings.!WriteMasterPwd = "" then settings.!WriteMasterPwd = 0
+
     options.!debug = VRGetIni( "Options", "Debug", OurINI)
     if options.!debug = "" then options.!debug = 0
@@ -565 +570 @@
     ok = VRSetIni( "Settings", "SyncFullName",  settings.!SyncFullName,  OurINI, 'NoClose' )
     ok = VRSetIni( "Settings", "SyncPrimGID" ,  settings.!SyncPrimGID ,  OurINI, 'NoClose' )
+    ok = VRSetIni( "Settings", "WriteMasterPwd",settings.!WriteMasterPwd,OurINI, 'NoClose' )
+
     ok = VRSetIni( "Options",  "Debug",         options.!debug,          OurINI, 'NoClose' )     
 
@@ -845 +852 @@
     CALL NLVSetText 'CB_SyncFullName', 'Caption', 26
     CALL NLVSetText 'CB_SyncPrimGID',  'Caption', 27
-
+    CALL NLVSetText 'CB_WriteMasterPwd','Caption', 190
     
 return
@@ -915 +922 @@
     do until lines(samba.!error) = 0
         PolLine = linein(samba.!error)
-say polline
+        /* say polline */
         select 
             when pos(":",PolLine) > 0 then iterate
@@ -1617 +1624 @@
 */
 _UserRecWriteBackToStems:
-    if \VRIsValidObject( RH )  then return
-    Cur = VRMethod("CN_Users","GetFieldData", RH, NrFH)
-    Username.Cur = VRMethod("CN_Users","GetFieldData", RH, UsernameFH) 
-    UID.Cur      = VRMethod("CN_Users","GetFieldData", RH, UIDFH)
-    GID.Cur      = VRMethod("CN_Users","GetFieldData", RH, GIDFH)
-    GECOS.Cur    = VRMethod("CN_Users","GetFieldData", RH, GECOSFH)
-    Home.Cur     = _PathStrkLIBC(VRMethod("CN_Users","GetFieldData", RH, HomeFH))
-    Shell.Cur    = VRMethod("CN_Users","GetFieldData", RH, ShellFH)
-    MapTo.Cur    = VRMethod("CN_Users","GetFieldData", RH, MapToFH)
-
-    if Settings.!SyncFullName = 1 & flags.Cur <> "" then do
-        call PB_Save_Click
-        say samba.!pdbeditexe' --user='Username.Cur' --modify --fullname="'GECOS.Cur'" 'DebugLevel' 2>'samba.!error
-        address cmd samba.!pdbeditexe' --user='Username.Cur' --modify --fullname="'GECOS.Cur'" 'DebugLevel' 2>'samba.!error
-        if RC <> 0 then call _SambaShowError /* ; else call _SambaShowMsg */
-    end
-    /* These are not editable/visible xpwFH, password.i,xlcFH,LoginClass.I,xcpwFH, pwchange.I,xDeactFH, deact.I, Status.I ) */
-
-    /* smbpasswd fields */
-    /* we do not allow editing these
-       FLagsFH, flags.I, LMHashFH, LMHash.I,NTHashFH, NTHash.I, LCTFH, LCT.I)
-     */
+    IF options.!debug == 1 THEN say '_UserRecWriteBackToStems() started'
+    
+    if VRMethod( "CN_Users", "ValidateRecord", RH ) then do
+        Cur = VRMethod("CN_Users","GetFieldData", RH, NrFH)
+        Username.Cur = VRMethod("CN_Users","GetFieldData", RH, UsernameFH) 
+        UID.Cur      = VRMethod("CN_Users","GetFieldData", RH, UIDFH)
+        GID.Cur      = VRMethod("CN_Users","GetFieldData", RH, GIDFH)
+        GECOS.Cur    = VRMethod("CN_Users","GetFieldData", RH, GECOSFH)
+        Home.Cur     = _PathStrkLIBC(VRMethod("CN_Users","GetFieldData", RH, HomeFH))
+        Shell.Cur    = VRMethod("CN_Users","GetFieldData", RH, ShellFH)
+        MapTo.Cur    = VRMethod("CN_Users","GetFieldData", RH, MapToFH)
+
+        if Settings.!SyncFullName = 1 & flags.Cur <> "" then do
+            say "  Sync is enabled, therefore we must save now!"
+            call PB_Save_Click
+            say samba.!pdbeditexe' --user='Username.Cur' --modify --fullname="'GECOS.Cur'" 'DebugLevel' 1>NUL 2>'samba.!error
+            address cmd samba.!pdbeditexe' --user='Username.Cur' --modify --fullname="'GECOS.Cur'" 'DebugLevel' 1>NUL 2>'samba.!error
+            if RC <> 0 then call _SambaShowError /* ; else call _SambaShowMsg */
+        end
+        /* These are not editable/visible xpwFH, password.i,xlcFH,LoginClass.I,xcpwFH, pwchange.I,xDeactFH, deact.I, Status.I ) */
+
+        /* smbpasswd fields */
+        /* we do not allow editing these
+           FLagsFH, flags.I, LMHashFH, LMHash.I,NTHashFH, NTHash.I, LCTFH, LCT.I)
+         */
+    end
+    else say RH' is no valid record!'
+    IF options.!debug == 1 THEN say '_UserRecWriteBackToStems() done'
 return
 
@@ -2077 +2090 @@
 return
 
+/*:VRX         CB_WriteMasterPwd_Click
+*/
+CB_WriteMasterPwd_Click: 
+    settings.!WriteMasterPwd = VRGet("CB_WriteMasterPwd","set")
+return
+
 /*:VRX         CN_Groups_ContextMenu
 */
@@ -2164 +2183 @@
     call beep 880, 20
     RH = VRInfo("Record")
+    say "RH="RH
 
     /* write back all editable field to the stems */
@@ -3442 +3462 @@
     UID.nx      = substr(VRGet("DT_UID","Caption"),6)
     GID.nx      = VRGet("DDCB_GID","Value")
-    password.nx = "*"
+
+    if settings.!WriteMasterPwd = 1 then do
+        call rxFuncAdd "Crypt", "RxCrypt", "RxCrypt"
+        itoa64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+        salt   = ""
+        do i = 1 to 8
+           salt = salt || substr( itoa64, random( 0, 63 ) + 1, 1 )
+        end
+        password.nx = Crypt(VRGet("EF_password","Value"), salt )
+    end
+    else password.nx = "*"
     loginclass.NX = ''                  /* dummy value */
     pwchange.NX   = '0'                 /* dummy value */
@@ -3732 +3762 @@
 */
 PB_Save_Click: 
+    IF options.!debug == 1 THEN say 'PB_Save_Click() started'
     call _MasterpasswdWrite
     call _GroupWrite
     call _PasswordDBRewrite
     call _SmbUserMapWrite
+    IF options.!debug == 1 THEN say 'PB_Save_Click() done'
 return
 
@@ -3803 +3835 @@
                         end
                     end
+                    if settings.!WriteMasterPwd = 1 then do
+                        call rxFuncAdd "Crypt", "RxCrypt", "RxCrypt"
+                        itoa64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+                        salt   = ""
+                        do i = 1 to 8
+                           salt = salt || substr( itoa64, random( 0, 63 ) + 1, 1 )
+                        end
+                        password.CurUserNr = Crypt(VRGet("EF_upPassword","Value"), salt )
+                        call _UserRecWriteBackToStems
+                        call PB_Save_Click
+                    end
                 end
             end