diff options
| author | Günther Deschner <gd@samba.org> | 2006-02-22 20:40:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:10:20 -0500 |
| commit | fd5ecef41ce3dd6acff1ed0fc17529fa8459a66f (patch) | |
| tree | d8148fc85fb12a30d921856bfe7c18c338e2b6f7 | |
| parent | 2a0ad559ad9cfdddfff347e2542ee50594435eee (diff) | |
| download | samba-fd5ecef41ce3dd6acff1ed0fc17529fa8459a66f.tar.gz samba-fd5ecef41ce3dd6acff1ed0fc17529fa8459a66f.tar.bz2 samba-fd5ecef41ce3dd6acff1ed0fc17529fa8459a66f.zip | |
r13639: Never overwrite the acct_flags in rpccli_netlogon_sam_network_logon().
Guenther
(This used to be commit c201e51de387d3d49880ed519eb9d825df92f5af)
| -rw-r--r-- | source3/nsswitch/winbindd_pam.c | 8 | ||||
| -rw-r--r-- | source3/rpc_client/cli_netlogon.c | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c index 3f0b7f07aa..e6fb77f24f 100644 --- 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 7798519103..33f1d1d25b 100644 --- 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); } |