sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00
Code

fixing smbpasswd to link to smbd to obtain domain sid

Browse Source 
(This used to be commit bfb75e58ced1082d3bb7d6b3f3367d50a0ca26ea)
This commit is contained in:
Luke Leighton 1998-12-01 19:34:58 +00:00
parent 04e382fb16
commit b3c1baeb80
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/include/proto.h
View File

@ -261,7 +261,7 @@ char *rep_inet_ntoa(struct in_addr ip);
void get_sam_domain_name(void);
BOOL get_member_domain_sid(void);
BOOL get_domain_sids(DOM_SID *sid3, DOM_SID *sid5);
BOOL get_domain_sids(DOM_SID *sid3, DOM_SID *sid5, char *servers);
void generate_wellknown_sids(void);
BOOL generate_sam_sid(char *domain_name);
BOOL map_domain_name_to_sid(DOM_SID *sid, char **nt_domain);
@ -458,7 +458,7 @@ void pwdb_set_must_change_time(char *p, int max_len, time_t t);
void pwdb_set_last_set_time(char *p, int max_len, time_t t);
void pwdb_sethexpwd(char *p, const char *pwd, uint16 acct_ctrl);
BOOL pwdb_gethexpwd(const char *p, char *pwd);
BOOL pwdb_initialise(BOOL server);
BOOL pwdb_initialise(BOOL is_server);
/*The following definitions come from lib/util_sid.c */

6
source3/lib/sids.c
View File

@ -172,13 +172,13 @@ BOOL get_member_domain_sid(void)
}
}
return get_domain_sids(NULL, &global_member_sid);
return get_domain_sids(NULL, &global_member_sid, lp_passwordserver());
}
/****************************************************************************
obtain the sid from the PDC. do some verification along the way...
****************************************************************************/
BOOL get_domain_sids(DOM_SID *sid3, DOM_SID *sid5)
BOOL get_domain_sids(DOM_SID *sid3, DOM_SID *sid5, char *servers)
{
POLICY_HND pol;
fstring srv_name;
@ -193,7 +193,7 @@ BOOL get_domain_sids(DOM_SID *sid3, DOM_SID *sid5)
return False;
}
if (!cli_connect_serverlist(&cli, lp_passwordserver()))
if (!cli_connect_serverlist(&cli, servers))
{
DEBUG(0,("get_member_domain_sid: unable to initialise client connection.\n"));
return False;

5
source3/lib/util_pwdb.c
View File

@ -31,6 +31,9 @@ extern DOM_SID global_member_sid;
extern fstring global_myworkgroup;
extern DOM_SID global_sid_S_1_5_20;
extern pstring global_myname;
/*
* A list of the rids of well known BUILTIN and Domain users
* and groups.
@ -443,7 +446,7 @@ BOOL pwdb_initialise(BOOL is_server)
}
else
{
if (!get_domain_sids(&global_member_sid, &global_sam_sid))
if (!get_domain_sids(&global_member_sid, &global_sam_sid, global_myname))
{
return False;
}