1
0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00

Add support for variable-length session keys in our client code.

This means that we now support 'net rpc join' with KRB5 (des based)
logins.  Now, you need to hack 'net' to do that, but the principal is
important...

When we add kerberos to 'net rpc', it should be possible to still do
user management and the like over RPC.

(server-side support to follow shortly)

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
-
parent f3bbc87b0d
commit 9ecf9408d9
5 changed files with 62 additions and 22 deletions

View File

@ -6302,8 +6302,8 @@ NTSTATUS make_samr_userinfo_ctr_usr21(TALLOC_CTX *ctx, SAM_USERINFO_CTR * ctr,
inits a SAM_USERINFO_CTR structure.
********************************************************************/
void init_samr_userinfo_ctr(SAM_USERINFO_CTR * ctr, DATA_BLOB sess_key,
uint16 switch_value, void *info)
static void init_samr_userinfo_ctr(SAM_USERINFO_CTR * ctr, DATA_BLOB *sess_key,
uint16 switch_value, void *info)
{
DEBUG(5, ("init_samr_userinfo_ctr\n"));
@ -6312,13 +6312,13 @@ void init_samr_userinfo_ctr(SAM_USERINFO_CTR * ctr, DATA_BLOB sess_key,
switch (switch_value) {
case 0x18:
SamOEMhash(ctr->info.id24->pass, sess_key.data, 516);
dump_data(100, (char *)sess_key.data, 16);
SamOEMhashBlob(ctr->info.id24->pass, 516, sess_key);
dump_data(100, (char *)sess_key->data, sess_key->length);
dump_data(100, (char *)ctr->info.id24->pass, 516);
break;
case 0x17:
SamOEMhash(ctr->info.id23->pass, sess_key.data, 516);
dump_data(100, (char *)sess_key.data, 16);
SamOEMhashBlob(ctr->info.id23->pass, 516, sess_key);
dump_data(100, (char *)sess_key->data, sess_key->length);
dump_data(100, (char *)ctr->info.id23->pass, 516);
break;
default:
@ -6503,7 +6503,7 @@ inits a SAMR_Q_SET_USERINFO structure.
********************************************************************/
void init_samr_q_set_userinfo(SAMR_Q_SET_USERINFO * q_u,
POLICY_HND *hnd, DATA_BLOB sess_key,
POLICY_HND *hnd, DATA_BLOB *sess_key,
uint16 switch_value, void *info)
{
DEBUG(5, ("init_samr_q_set_userinfo\n"));
@ -6577,7 +6577,7 @@ inits a SAMR_Q_SET_USERINFO2 structure.
********************************************************************/
void init_samr_q_set_userinfo2(SAMR_Q_SET_USERINFO2 * q_u,
POLICY_HND *hnd, DATA_BLOB sess_key,
POLICY_HND *hnd, DATA_BLOB *sess_key,
uint16 switch_value, SAM_USERINFO_CTR * ctr)
{
DEBUG(5, ("init_samr_q_set_userinfo2\n"));
@ -6591,9 +6591,9 @@ void init_samr_q_set_userinfo2(SAMR_Q_SET_USERINFO2 * q_u,
switch (switch_value) {
case 0x12:
SamOEMhash(ctr->info.id12->lm_pwd, sess_key.data, 16);
SamOEMhash(ctr->info.id12->nt_pwd, sess_key.data, 16);
dump_data(100, (char *)sess_key.data, 16);
SamOEMhashBlob(ctr->info.id12->lm_pwd, 16, sess_key);
SamOEMhashBlob(ctr->info.id12->nt_pwd, 16, sess_key);
dump_data(100, (char *)sess_key->data, sess_key->length);
dump_data(100, (char *)ctr->info.id12->lm_pwd, 16);
dump_data(100, (char *)ctr->info.id12->nt_pwd, 16);
break;