summaryrefslogtreecommitdiff
path: root/source3/rpc_server
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-02-02 05:10:26 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-02-02 05:10:26 +0000
commit28e3e4843194e2559714adc03e05c43f9328aeda (patch)
treebe306c18ac8ff4b14d2880bd2761ae1962a031c3 /source3/rpc_server
parentac2eeb7a8f49d389e024af82184b86e79bfd8976 (diff)
downloadsamba-28e3e4843194e2559714adc03e05c43f9328aeda.tar.gz
samba-28e3e4843194e2559714adc03e05c43f9328aeda.tar.bz2
samba-28e3e4843194e2559714adc03e05c43f9328aeda.zip
Send the user's session key in the SAMLOGON reply, so that a member server can
use smb signing. Andrew Bartlett (This used to be commit 574e8a8ab7c94ecd9113df42e395e83632980675)
Diffstat (limited to 'source3/rpc_server')
-rw-r--r--source3/rpc_server/srv_netlog_nt.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index c3d48a6527..6182da53d9 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -666,7 +666,9 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
pstring my_name;
fstring user_sid_string;
fstring group_sid_string;
-
+ uchar user_sess_key[16];
+ uchar netlogon_sess_key[16];
+
sampw = server_info->sam_account;
/* set up pointer indicating user/password failed to be found */
@@ -697,6 +699,12 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
return status;
}
+ ZERO_STRUCT(netlogon_sess_key);
+ memcpy(netlogon_sess_key, p->dc.sess_key, 8);
+ memcpy(user_sess_key, server_info->session_key, sizeof(user_sess_key));
+ SamOEMhash(user_sess_key, netlogon_sess_key, 16);
+ ZERO_STRUCT(netlogon_sess_key);
+
init_net_user_info3(p->mem_ctx, usr_info,
user_rid,
group_rid,
@@ -719,13 +727,14 @@ NTSTATUS _net_sam_logon(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *
num_gids, /* uint32 num_groups */
gids , /* DOM_GID *gids */
0x20 , /* uint32 user_flgs (?) */
- NULL, /* uchar sess_key[16] */
+ user_sess_key,
my_name , /* char *logon_srv */
pdb_get_domain(sampw),
&domain_sid, /* DOM_SID *dom_sid */
/* Should be users domain sid, not servers - for trusted domains */
NULL); /* char *other_sids */
+ ZERO_STRUCT(user_sess_key);
}
free_server_info(&server_info);
return status;