svn commit: samba r13639 - branches/SAMBA_3_0/source/nsswitch branches/SAMBA_3_0/source/rpc_client trunk/source/nsswitch trunk/source/rpc_client

[gd at samba.org]

Author: gd
Date: 2006-02-22 20:40:24 +0000 (Wed, 22 Feb 2006)
New Revision: 13639

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

Log:
Never overwrite the acct_flags in rpccli_netlogon_sam_network_logon().

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
   branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c
   trunk/source/nsswitch/winbindd_pam.c
   trunk/source/rpc_client/cli_netlogon.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c	2006-02-22 19:58:13 UTC (rev 13638)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c	2006-02-22 20:40:24 UTC (rev 13639)
@@ -743,17 +743,13 @@
 		if (my_info3->acct_flags & ACB_DOMTRUST) {
 			return NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT;
 		}
-#if 0
-		/* The info3 acct_flags in NT4's samlogon reply don't have 
-		 * ACB_NORMAL set. Disable this paranoia check until we
-		 * can research this more - Guenther */
-		
+
 		if (!(my_info3->acct_flags & ACB_NORMAL)) {
 			DEBUG(10,("winbindd_dual_pam_auth_cached: whats wrong with that one?: 0x%08x\n", 
 				my_info3->acct_flags));
 			return NT_STATUS_LOGON_FAILURE;
 		}
-#endif	
+
 		kickoff_time = nt_time_to_unix(&my_info3->kickoff_time);
 		if (kickoff_time != 0 && time(NULL) > kickoff_time) {
 			return NT_STATUS_ACCOUNT_EXPIRED;

Modified: branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c	2006-02-22 19:58:13 UTC (rev 13638)
+++ branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c	2006-02-22 20:40:24 UTC (rev 13639)
@@ -884,7 +884,6 @@
 		memset(info3->lm_sess_key, '\0', 8);
 	}
 
-	memset(&info3->acct_flags, '\0', 4);
 	for (i=0; i < 7; i++) {
 		memset(&info3->unknown[i], '\0', 4);
 	}

Modified: trunk/source/nsswitch/winbindd_pam.c
===================================================================
--- trunk/source/nsswitch/winbindd_pam.c	2006-02-22 19:58:13 UTC (rev 13638)
+++ trunk/source/nsswitch/winbindd_pam.c	2006-02-22 20:40:24 UTC (rev 13639)
@@ -743,17 +743,13 @@
 		if (my_info3->acct_flags & ACB_DOMTRUST) {
 			return NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT;
 		}
-#if 0
-		/* The info3 acct_flags in NT4's samlogon reply don't have 
-		 * ACB_NORMAL set. Disable this paranoia check until we
-		 * can research this more - Guenther */
-		
+
 		if (!(my_info3->acct_flags & ACB_NORMAL)) {
 			DEBUG(10,("winbindd_dual_pam_auth_cached: whats wrong with that one?: 0x%08x\n", 
 				my_info3->acct_flags));
 			return NT_STATUS_LOGON_FAILURE;
 		}
-#endif	
+
 		kickoff_time = nt_time_to_unix(&my_info3->kickoff_time);
 		if (kickoff_time != 0 && time(NULL) > kickoff_time) {
 			return NT_STATUS_ACCOUNT_EXPIRED;

Modified: trunk/source/rpc_client/cli_netlogon.c
===================================================================
--- trunk/source/rpc_client/cli_netlogon.c	2006-02-22 19:58:13 UTC (rev 13638)
+++ trunk/source/rpc_client/cli_netlogon.c	2006-02-22 20:40:24 UTC (rev 13639)
@@ -884,7 +884,6 @@
 		memset(info3->lm_sess_key, '\0', 8);
 	}
 
-	memset(&info3->acct_flags, '\0', 4);
 	for (i=0; i < 7; i++) {
 		memset(&info3->unknown[i], '\0', 4);
 	}