diff options
| author | Jim McDonough <jmcd@samba.org> | 2005-08-11 19:45:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:00:28 -0500 |
| commit | d6403e7280530ed66aa9f5d97ca225afb7130484 (patch) | |
| tree | ae7ea50eecf8ce229de85e4921436d5a4631d7b0 | |
| parent | 3662fb6d3ae14750520c6567a6d488f1b7a377d6 (diff) | |
| download | samba-d6403e7280530ed66aa9f5d97ca225afb7130484.tar.gz samba-d6403e7280530ed66aa9f5d97ca225afb7130484.tar.bz2 samba-d6403e7280530ed66aa9f5d97ca225afb7130484.zip | |
r9242: Fix my fix for #2953. I'd moved too much code until after we verify the user,
causing netlogon to return an invalid response for failed interactive logons.
(This used to be commit 4deb918b682fb51d8712cfdafc6210275dd10fc4)
| -rw-r--r-- | source3/rpc_server/srv_netlog_nt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index 0af8b14fe2..388d649c3c 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/rpc_server/srv_netlog_nt.c @@ -606,6 +606,9 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON * if (!(p->dc.authenticated && deal_with_creds(p->dc.sess_key, &p->dc.clnt_cred, &q_u->sam_id.client.cred, &srv_cred))) return NT_STATUS_INVALID_HANDLE; + r_u->buffer_creds = 1; /* yes, we have valid server credentials */ + memcpy(&r_u->srv_creds, &srv_cred, sizeof(r_u->srv_creds)); + /* find the username */ switch (q_u->sam_id.logon_level) { @@ -723,9 +726,6 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON * reseed_client_creds(&p->dc.clnt_cred, &q_u->sam_id.client.cred); memcpy(&p->dc.srv_cred, &p->dc.clnt_cred, sizeof(p->dc.clnt_cred)); - r_u->buffer_creds = 1; /* yes, we have valid server credentials */ - memcpy(&r_u->srv_creds, &srv_cred, sizeof(r_u->srv_creds)); - if (server_info->guest) { /* We don't like guest domain logons... */ DEBUG(5,("_net_sam_logon: Attempted domain logon as GUEST denied.\n")); |