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

Timestamp:

Jul 26, 2009, 5:19:16 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

smbusers.exe: Change password now also respects minimum password length policy

File:

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

branches/guitools-1.0/smbusers/smbusers.VRX

@@ -3793 +3793 @@
             end
             else do
-                pwdfile = TempDir'newpwd'
-                call lineout pwdfile, VRGet("EF_upPassword","value")
-                call lineout pwdfile, VRGet("EF_upPassword","value")
-                ok = stream(pwdfile,"c","close")
-                say samba.!smbpasswdexe' -a 'Username.CurUserNr' -s <'pwdfile' 2>'samba.!error
-                address cmd samba.!smbpasswdexe' -a 'Username.CurUserNr' -s <'pwdfile' 2>'samba.!error' 1>'samba.!msg
-                smbpasswdrc = rc
-                if rc <> 0 then call _SambaShowError
-                else call _SambaShowMsg
-                ok = SysFileDelete(pwdfile)
-                if SwatAuth then do
-                    /* we always remove the old swat */
-                    say '  'samba.!htpasswdexe' -D "'swatusers'" 'Username.CurUserNr
-                    address cmd samba.!htpasswdexe' -D "'swatusers'" 'Username.CurUserNr /* ' 2>'samba.!error' 1>'samba.!msg
-                    if rc <> 0 then call _SambaShowError; else call _SambaShowMsg  */             
-
-                    if VRGet("CB_upSWAT_Allowed","Set") then do
-                        if VRFileExists(swatusers) then cFlag = ""; else cFlag="c"
-                            say '  'samba.!htpasswdexe' -b'cFLag' "'swatusers'" 'Username.CurUserNr' **********'
-                        address cmd samba.!htpasswdexe' -b'cFlag' "'swatusers'" 'Username.CurUserNr' 'VRGet("EF_upPassword","value")' 2>'samba.!error' 1>'samba.!msg
-                        if rc <> 0 then call _SambaShowError
-                        else call _SambaShowMsg
+                if length(VRGet("EF_password","Value")) < MinPWLength then do
+                    Msg.type  = "E"
+                    Msg.Text  = NLVGetMessage( 117 )
+                    call _ShowMsg
+                    return
+                end
+                else do
+                    pwdfile = TempDir'newpwd'
+                    call lineout pwdfile, VRGet("EF_upPassword","value")
+                    call lineout pwdfile, VRGet("EF_upPassword","value")
+                    ok = stream(pwdfile,"c","close")
+                    say samba.!smbpasswdexe' -a 'Username.CurUserNr' -s <'pwdfile' 2>'samba.!error
+                    address cmd samba.!smbpasswdexe' -a 'Username.CurUserNr' -s <'pwdfile' 2>'samba.!error' 1>'samba.!msg
+                    smbpasswdrc = rc
+                    if rc <> 0 then call _SambaShowError
+                    else call _SambaShowMsg
+                    ok = SysFileDelete(pwdfile)
+                    if SwatAuth then do
+                        /* we always remove the old swat */
+                        say '  'samba.!htpasswdexe' -D "'swatusers'" 'Username.CurUserNr
+                        address cmd samba.!htpasswdexe' -D "'swatusers'" 'Username.CurUserNr /* ' 2>'samba.!error' 1>'samba.!msg
+                        if rc <> 0 then call _SambaShowError; else call _SambaShowMsg  */             
+
+                        if VRGet("CB_upSWAT_Allowed","Set") then do
+                            if VRFileExists(swatusers) then cFlag = ""; else cFlag="c"
+                                say '  'samba.!htpasswdexe' -b'cFLag' "'swatusers'" 'Username.CurUserNr' **********'
+                            address cmd samba.!htpasswdexe' -b'cFlag' "'swatusers'" 'Username.CurUserNr' 'VRGet("EF_upPassword","value")' 2>'samba.!error' 1>'samba.!msg
+                            if rc <> 0 then call _SambaShowError
+                            else call _SambaShowMsg
+                        end
                     end
                 end
@@ -4001 +4009 @@
     SyncedPrimGID = 0
     SyncedFullName = 0
+
+    MinPWLength = _PolicyGet("min password length")
+
     call _UserPropertiesGet Username.CurUserNr
     newcommand = ""