svn commit: samba r4877 - branches/SAMBA_3_0/source/utils trunk/source/utils

[gd at samba.org]

Author: gd
Date: 2005-01-20 21:42:05 +0000 (Thu, 20 Jan 2005)
New Revision: 4877

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4877

Log:
When vampiring account policy AP_LOCK_ACCOUNT_DURATION honour "Lockout
Duration: Forever".

Guenther

Modified:
   branches/SAMBA_3_0/source/utils/net_rpc_samsync.c
   trunk/source/utils/net_rpc_samsync.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_rpc_samsync.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_rpc_samsync.c	2005-01-20 18:31:12 UTC (rev 4876)
+++ branches/SAMBA_3_0/source/utils/net_rpc_samsync.c	2005-01-20 21:42:05 UTC (rev 4877)
@@ -1021,7 +1021,10 @@
 	if (!account_policy_set(AP_RESET_COUNT_TIME, (uint32)u_lockoutreset/60))
 		return nt_status;
 
-	if (!account_policy_set(AP_LOCK_ACCOUNT_DURATION, (uint32)u_lockouttime/60))
+	if (u_lockouttime != -1)
+		u_lockouttime /= 60;
+
+	if (!account_policy_set(AP_LOCK_ACCOUNT_DURATION, (uint32)u_lockouttime))
 		return nt_status;
 
 	if (!account_policy_set(AP_USER_MUST_LOGON_TO_CHG_PASS, delta->logon_chgpass))

Modified: trunk/source/utils/net_rpc_samsync.c
===================================================================
--- trunk/source/utils/net_rpc_samsync.c	2005-01-20 18:31:12 UTC (rev 4876)
+++ trunk/source/utils/net_rpc_samsync.c	2005-01-20 21:42:05 UTC (rev 4877)
@@ -1028,7 +1028,10 @@
 	if (!account_policy_set(AP_RESET_COUNT_TIME, (uint32)u_lockoutreset/60))
 		return nt_status;
 
-	if (!account_policy_set(AP_LOCK_ACCOUNT_DURATION, (uint32)u_lockouttime/60))
+	if (u_lockouttime != -1)
+		u_lockouttime /= 60;
+
+	if (!account_policy_set(AP_LOCK_ACCOUNT_DURATION, (uint32)u_lockouttime))
 		return nt_status;
 
 	if (!account_policy_set(AP_USER_MUST_LOGON_TO_CHG_PASS, delta->logon_chgpass))