sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-14 19:24:43 +03:00
Code

responses to UDP samquery go back to SERVER<00> not DOMAIN<1c>, the

Browse Source 
request name.

modified createuser rpcclient command to examine name being added.  if it
ends in a $, assume that a workstation trust account is being added.
(This used to be commit 4aea261cb0e5f34255ff83271eb5cadb0eb78bc9)
This commit is contained in:
Luke Leighton 1999-11-18 23:15:45 +00:00
parent 4245278ca3
commit da517a3ff4
4 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/nmbd/nmbd_packets.c
View File

@ -1864,7 +1864,7 @@ BOOL send_mailslot(BOOL unique, char *mailslot,char *buf,int len,
/* DIRECT GROUP or UNIQUE datagram. */ /* DIRECT GROUP or UNIQUE datagram. */
dgram->header.msg_type = unique ? 0x10 : 0x11; dgram->header.msg_type = unique ? 0x10 : 0x11;
dgram->header.flags.node_type = M_NODE; dgram->header.flags.node_type = M_NODE | 0x40;
dgram->header.flags.first = True; dgram->header.flags.first = True;
dgram->header.flags.more = False; dgram->header.flags.more = False;
dgram->header.dgm_id = name_trn_id; dgram->header.dgm_id = name_trn_id;

16
source3/nmbd/nmbd_processlogon.c
View File

@ -166,10 +166,10 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
send_mailslot(True, getdc, send_mailslot(True, getdc,
outbuf,PTR_DIFF(q,outbuf), outbuf,PTR_DIFF(q,outbuf),
dgram->dest_name.name, my_name,
dgram->dest_name.name_type, 0x0,
dgram->source_name.name, dgram->source_name.name,
dgram->source_name.name_type, dgram->source_name.name_type,
p->ip, *iface_ip(p->ip), p->port); p->ip, *iface_ip(p->ip), p->port);
return; return;
} }
@ -258,10 +258,10 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
send_mailslot(True, getdc, send_mailslot(True, getdc,
outbuf,PTR_DIFF(q,outbuf), outbuf,PTR_DIFF(q,outbuf),
dgram->dest_name.name, my_name,
dgram->dest_name.name_type, 0x0,
dgram->source_name.name, dgram->source_name.name,
dgram->source_name.name_type, dgram->source_name.name_type,
p->ip, *iface_ip(p->ip), p->port); p->ip, *iface_ip(p->ip), p->port);
break; break;
} }

8
source3/rpc_server/srv_samr.c
View File

@ -2750,8 +2750,9 @@ static void samr_reply_create_user(SAMR_Q_CREATE_USER *q_u,
SAMR_R_CREATE_USER r_u; SAMR_R_CREATE_USER r_u;
POLICY_HND pol; POLICY_HND pol;
uint32 status = 0x0; uint32 status = 0x0;
uint32 user_rid = 0xffffffff; uint32 user_rid = 0x0;
BOOL pol_open = False; BOOL pol_open = False;
uint32 unk_0 = 0x30;
/* find the machine account: tell the caller if it exists. /* find the machine account: tell the caller if it exists.
lkclXXXX i have *no* idea if this is a problem or not lkclXXXX i have *no* idea if this is a problem or not
@ -2786,7 +2787,7 @@ static void samr_reply_create_user(SAMR_Q_CREATE_USER *q_u,
pstring msg_str; pstring msg_str;
if (!local_password_change(user_name, True, if (!local_password_change(user_name, True,
q_u->acb_info | ACB_DISABLED, 0xffff, q_u->acb_info | ACB_DISABLED | ACB_PWNOTREQ, 0xffff,
NULL, NULL,
err_str, sizeof(err_str), err_str, sizeof(err_str),
msg_str, sizeof(msg_str))) msg_str, sizeof(msg_str)))
@ -2805,6 +2806,7 @@ static void samr_reply_create_user(SAMR_Q_CREATE_USER *q_u,
else else
{ {
user_rid = sam_pass->user_rid; user_rid = sam_pass->user_rid;
unk_0 = 0x000703ff;
} }
} }
} }
@ -2823,7 +2825,7 @@ static void samr_reply_create_user(SAMR_Q_CREATE_USER *q_u,
DEBUG(5,("samr_create_user: %d\n", __LINE__)); DEBUG(5,("samr_create_user: %d\n", __LINE__));
make_samr_r_create_user(&r_u, &pol, 0x000703ff, user_rid, status); make_samr_r_create_user(&r_u, &pol, unk_0, user_rid, status);
/* store the response in the SMB stream */ /* store the response in the SMB stream */
samr_io_r_create_user("", &r_u, rdata, 0); samr_io_r_create_user("", &r_u, rdata, 0);

12
source3/rpcclient/cmd_samr.c
View File

@ -1605,6 +1605,7 @@ void cmd_sam_create_dom_user(struct client_info *info)
uint32 user_rid; uint32 user_rid;
POLICY_HND sam_pol; POLICY_HND sam_pol;
POLICY_HND pol_dom; POLICY_HND pol_dom;
uint16 acb_info;
sid_copy(&sid1, &info->dom.level5_sid); sid_copy(&sid1, &info->dom.level5_sid);
sid_to_string(sid, &sid1); sid_to_string(sid, &sid1);
@ -1631,7 +1632,14 @@ void cmd_sam_create_dom_user(struct client_info *info)
acct_desc[0] = 0; acct_desc[0] = 0;
} }
if (acct_name[strlen(acct_name)-1] == '$')
{
acb_info = ACB_WSTRUST;
}
else
{
acb_info = ACB_NORMAL;
}
report(out_hnd, "SAM Create Domain User\n"); report(out_hnd, "SAM Create Domain User\n");
report(out_hnd, "Domain: %s Name: %s Description: %s\n", report(out_hnd, "Domain: %s Name: %s Description: %s\n",
domain, acct_name, acct_desc); domain, acct_name, acct_desc);
@ -1652,7 +1660,7 @@ void cmd_sam_create_dom_user(struct client_info *info)
/* create a domain user */ /* create a domain user */
res1 = res ? create_samr_domain_user(smb_cli, fnum, res1 = res ? create_samr_domain_user(smb_cli, fnum,
&pol_dom, &pol_dom,
acct_name, ACB_NORMAL, &user_rid) : False; acct_name, acb_info, &user_rid) : False;
res = res ? samr_close(smb_cli, fnum, res = res ? samr_close(smb_cli, fnum,
&pol_dom) : False; &pol_dom) : False;