s3-passdb: cleanup some callers of pdb_get_trusteddom_pw().
authorGünther Deschner <gd@samba.org>
Fri, 30 Oct 2009 01:15:45 +0000 (02:15 +0100)
committerGünther Deschner <gd@samba.org>
Tue, 3 Nov 2009 21:10:31 +0000 (22:10 +0100)
Guenther

source3/auth/auth_domain.c
source3/winbindd/winbindd_ads.c

index 084d84ce29f0482d0d52bb26e191ef6561c8cff8..c5273603215b279884bfea2eac79f5891d9193b3 100644 (file)
@@ -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;
        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;
 
        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,
         */
 
        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));
                DEBUG(0, ("check_trustdomain_security: could not fetch trust "
                          "account password for domain %s\n",
                          user_info->domain));
index 119e81d3e2e7f61cd132a35a2777b5b79a0d1ad1..b2716716656ecd760c544d13b859a18290b408b3 100644 (file)
@@ -84,10 +84,8 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
        SAFE_FREE(ads->auth.realm);
 
        if ( IS_DC ) {
        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;
                }
                        ads_destroy( &ads );
                        return NULL;
                }