diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-15 16:16:01 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-15 16:16:01 +0200 |
commit | ec63a6f5ad8939cf687c69e58c28b6502724c840 (patch) | |
tree | 8b2e2b3284ee00e2f415f15f0e4ffe699e481190 /source3/rpc_server | |
parent | 3214fb07348f67694bb169909e340a769d79ccd2 (diff) | |
parent | 3b9a03a7c374d6d8e93c729f4307417cbfe2d1a6 (diff) | |
download | samba-ec63a6f5ad8939cf687c69e58c28b6502724c840.tar.gz samba-ec63a6f5ad8939cf687c69e58c28b6502724c840.tar.bz2 samba-ec63a6f5ad8939cf687c69e58c28b6502724c840.zip |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source3/rpc_server')
-rw-r--r-- | source3/rpc_server/srv_netlog_nt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index 4e211cfb81..2dc6cd6393 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/rpc_server/srv_netlog_nt.c @@ -756,7 +756,7 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p, { NTSTATUS status = NT_STATUS_OK; struct netr_SamInfo3 *sam3 = NULL; - union netr_LogonInfo *logon = r->in.logon; + union netr_LogonLevel *logon = r->in.logon; fstring nt_username, nt_domain, nt_workstation; auth_usersupplied_info *user_info = NULL; auth_serversupplied_info *server_info = NULL; @@ -838,7 +838,7 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p, } switch (r->in.logon_level) { - case INTERACTIVE_LOGON_TYPE: + case NetlogonInteractiveInformation: fstrcpy(nt_username, logon->password->identity_info.account_name.string); fstrcpy(nt_domain, @@ -848,7 +848,7 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p, DEBUG(3,("SAM Logon (Interactive). Domain:[%s]. ", lp_workgroup())); break; - case NET_LOGON_TYPE: + case NetlogonNetworkInformation: fstrcpy(nt_username, logon->network->identity_info.account_name.string); fstrcpy(nt_domain, @@ -873,7 +873,7 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p, status = NT_STATUS_OK; switch (r->in.logon_level) { - case NET_LOGON_TYPE: + case NetlogonNetworkInformation: { const char *wksname = nt_workstation; @@ -902,7 +902,7 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p, } break; } - case INTERACTIVE_LOGON_TYPE: + case NetlogonInteractiveInformation: /* 'Interactive' authentication, supplies the password in its MD4 form, encrypted with the session key. We will convert this to challenge/response for the auth subsystem to chew |