r13639: Never overwrite the acct_flags in rpccli_netlogon_sam_network_logon().

Guenther
(This used to be commit c201e51de387d3d49880ed519eb9d825df92f5af)

diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index 3f0b7f07aaa3737afe42c9529dd530fa7dc16c4d..e6fb77f24fa036b6fbd4f617125841d917a45034 100644 (file)
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/nsswitch/winbindd_pam.c
@@ -743,17 +743,13 @@ NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
                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;

diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 77985191031305d04c868160e59ee881a19686de..33f1d1d25babdc892091e839f7282c544c027480 100644 (file)
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -884,7 +884,6 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
                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);
        }