summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-10-30 02:15:45 +0100
committerGünther Deschner <gd@samba.org>2009-11-03 22:10:31 +0100
commit463b1eb2b55ae85cfc9539c936375a989cde1076 (patch)
tree7668bfd060eaa9d37cfb80639b24ae44c5aaace5 /source3
parent31ce8eeb44d5060cfe85f42dc6ef092121b84a68 (diff)
downloadsamba-463b1eb2b55ae85cfc9539c936375a989cde1076.tar.gz
samba-463b1eb2b55ae85cfc9539c936375a989cde1076.tar.bz2
samba-463b1eb2b55ae85cfc9539c936375a989cde1076.zip
s3-passdb: cleanup some callers of pdb_get_trusteddom_pw().
Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/auth/auth_domain.c4
-rw-r--r--source3/winbindd/winbindd_ads.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 084d84ce29..c527360321 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -447,8 +447,6 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte
NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
unsigned char trust_md4_password[16];
char *trust_password;
- time_t last_change_time;
- DOM_SID sid;
fstring dc_name;
struct sockaddr_storage dc_ss;
@@ -481,7 +479,7 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte
*/
if (!pdb_get_trusteddom_pw(user_info->domain, &trust_password,
- &sid, &last_change_time)) {
+ NULL, NULL)) {
DEBUG(0, ("check_trustdomain_security: could not fetch trust "
"account password for domain %s\n",
user_info->domain));
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index 119e81d3e2..b271671665 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -84,10 +84,8 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
SAFE_FREE(ads->auth.realm);
if ( IS_DC ) {
- DOM_SID sid;
- time_t last_set_time;
- if ( !pdb_get_trusteddom_pw( domain->name, &ads->auth.password, &sid, &last_set_time ) ) {
+ if ( !pdb_get_trusteddom_pw( domain->name, &ads->auth.password, NULL, NULL ) ) {
ads_destroy( &ads );
return NULL;
}