diff options
| -rw-r--r-- | source3/include/proto.h | 4 | ||||
| -rw-r--r-- | source3/lib/sids.c | 3 | ||||
| -rw-r--r-- | source3/lib/util_pwdb.c | 13 | ||||
| -rw-r--r-- | source3/rpc_client/cli_lsarpc.c | 3 |
4 files changed, 6 insertions, 17 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 5cc40b929c..a18b498ba5 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1037,6 +1037,7 @@ void exit_server(char *reason); BOOL receive_next_smb(char *inbuf, int bufsize, int timeout); void process_smb(char *inbuf, char *outbuf); +BOOL get_user_creds(struct user_creds *usr); void lsarpcd_process(void); /*The following definitions come from mem_man/mem_man.c */ @@ -1944,8 +1945,7 @@ BOOL net_sam_sync(const char* srv_name, const char* myhostname, /*The following definitions come from rpc_client/cli_lsarpc.c */ -BOOL get_domain_sids(const char *myname, - DOM_SID *sid3, DOM_SID *sid5, char *domain); +BOOL get_domain_sids(const char *domain, DOM_SID *sid3, DOM_SID *sid5); BOOL get_trust_sid_and_domain(const char* myname, char *server, DOM_SID *sid, char *domain, size_t len); diff --git a/source3/lib/sids.c b/source3/lib/sids.c index efbd03fbf3..712eef8a0d 100644 --- a/source3/lib/sids.c +++ b/source3/lib/sids.c @@ -199,8 +199,7 @@ BOOL get_member_domain_sid(void) } } - return get_domain_sids(global_myname, NULL, - &global_member_sid, lp_workgroup()); + return get_domain_sids(lp_workgroup(), NULL, &global_member_sid); } diff --git a/source3/lib/util_pwdb.c b/source3/lib/util_pwdb.c index 006a68b2c1..d4058b8099 100644 --- a/source3/lib/util_pwdb.c +++ b/source3/lib/util_pwdb.c @@ -625,17 +625,8 @@ BOOL pwdb_initialise(BOOL is_server) } else { - char *srvs; - if (lp_server_role() == ROLE_DOMAIN_PDC) - { - srvs = global_myname; - } - else - { - srvs = lp_passwordserver(); - } - if (!get_domain_sids(global_myname, &global_member_sid, - &global_sam_sid, srvs)) + if (!get_domain_sids(lp_workgroup(), &global_member_sid, + &global_sam_sid)) { return False; } diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c index 1cf584a29b..b039bde159 100644 --- a/source3/rpc_client/cli_lsarpc.c +++ b/source3/rpc_client/cli_lsarpc.c @@ -34,8 +34,7 @@ extern int DEBUGLEVEL; /**************************************************************************** obtain the sid from the PDC. do some verification along the way... ****************************************************************************/ -BOOL get_domain_sids(const char *myname, - DOM_SID *sid3, DOM_SID *sid5, char *domain) +BOOL get_domain_sids(const char *domain, DOM_SID *sid3, DOM_SID *sid5) { POLICY_HND pol; fstring srv_name; |