summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2001-10-31 12:07:59 +0000
committerAndrew Bartlett <abartlet@samba.org>2001-10-31 12:07:59 +0000
commitbe93100240c4d81e9465015e82d5b71a5e4bf193 (patch)
tree9861c0b2f05076a9e2f70f4797f1cc218fe67757
parentabaedd04f273697ab297a0cbbac743f85ea95836 (diff)
downloadsamba-be93100240c4d81e9465015e82d5b71a5e4bf193.tar.gz
samba-be93100240c4d81e9465015e82d5b71a5e4bf193.tar.bz2
samba-be93100240c4d81e9465015e82d5b71a5e4bf193.zip
Fix up domain logons. Tested with NT4.
(This used to be commit c8b2718adfe114b74a155116c5e74f014d6df887)
-rw-r--r--source3/auth/auth_util.c2
-rw-r--r--source3/rpc_server/srv_netlog_nt.c9
-rw-r--r--source3/smbd/auth_util.c2
3 files changed, 6 insertions, 7 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 297c482af5..85f01605ab 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -368,8 +368,8 @@ BOOL make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
ret = make_user_info_map(user_info,
smb_name, client_domain,
wksta_name, sec_blob,
- local_nt_blob,
local_lm_blob,
+ local_nt_blob,
plaintext_blob,
ntlmssp_flags, True);
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index 26054117fb..042279c568 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -495,13 +495,12 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
NET_USER_INFO_3 *usr_info = NULL;
NET_ID_INFO_CTR *ctr = q_u->sam_id.ctr;
DOM_CRED srv_cred;
- SAM_ACCOUNT *sampass = NULL;
UNISTR2 *uni_samlogon_user = NULL;
UNISTR2 *uni_samlogon_domain = NULL;
UNISTR2 *uni_samlogon_workstation = NULL;
fstring nt_username, nt_domain, nt_workstation;
- auth_usersupplied_info *user_info;
- auth_serversupplied_info *server_info;
+ auth_usersupplied_info *user_info = NULL;
+ auth_serversupplied_info *server_info = NULL;
usr_info = (NET_USER_INFO_3 *)talloc(p->mem_ctx, sizeof(NET_USER_INFO_3));
if (!usr_info)
@@ -585,7 +584,7 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
nt_username, nt_domain,
nt_workstation,
ctr->auth.id1.lm_owf.data, 16,
- ctr->auth.id1.lm_owf.data, 16,
+ ctr->auth.id1.nt_owf.data, 16,
p->dc.sess_key);
break;
}
@@ -649,7 +648,7 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
sam_logon_in_ssb = False;
- init_net_user_info3(p->mem_ctx, usr_info, sampass,
+ init_net_user_info3(p->mem_ctx, usr_info, server_info->sam_account,
0, /* logon_count */
0, /* bad_pw_count */
num_gids, /* uint32 num_groups */
diff --git a/source3/smbd/auth_util.c b/source3/smbd/auth_util.c
index 297c482af5..85f01605ab 100644
--- a/source3/smbd/auth_util.c
+++ b/source3/smbd/auth_util.c
@@ -368,8 +368,8 @@ BOOL make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
ret = make_user_info_map(user_info,
smb_name, client_domain,
wksta_name, sec_blob,
- local_nt_blob,
local_lm_blob,
+ local_nt_blob,
plaintext_blob,
ntlmssp_flags, True);