r23072: In winbindd_ads.c:lookup_groupmem, replace the bottleneck
[sfrench/samba-autobuild/.git] / source / nsswitch / winbindd_ads.c
index 0f4dee4f4adb4731c758ca021a04137d25b9621f..b069793d6bd07e0372cb14642524c7220b440319 100644 (file)
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
    Winbind ADS backend functions
@@ -30,6 +30,8 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
+extern struct winbindd_methods reconnect_methods;
+
 /*
   return our ads connections structure for a domain. We keep the connection
   open to make things faster
@@ -38,23 +40,33 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
 {
        ADS_STRUCT *ads;
        ADS_STATUS status;
+       fstring dc_name;
+       struct in_addr dc_ip;   
+
+       DEBUG(10,("ads_cached_connection\n"));
 
-       if (domain->private) {
-               ads = (ADS_STRUCT *)domain->private;
+       if (domain->private_data) {
+
+               time_t expire;
+               time_t now = time(NULL);
 
                /* check for a valid structure */
+               ads = (ADS_STRUCT *)domain->private_data;
+
+               expire = MIN(ads->auth.tgt_expire, ads->auth.tgs_expire);
+
+               DEBUG(7, ("Current tickets expire in %d seconds (at %d, time is now %d)\n",
+                         (uint32)expire-(uint32)now, (uint32) expire, (uint32) now));
 
-               DEBUG(7, ("Current tickets expire at %d, time is now %d\n",
-                         (uint32) ads->auth.expire, (uint32) time(NULL)));
-               if ( ads->config.realm && (ads->auth.expire > time(NULL))) {
+               if ( ads->config.realm && (expire > now)) {
                        return ads;
-               }
-               else {
+               } else {
                        /* we own this ADS_STRUCT so make sure it goes away */
+                       DEBUG(7,("Deleting expired krb5 credential cache\n"));
                        ads->is_mine = True;
                        ads_destroy( &ads );
                        ads_kdestroy("MEMORY:winbind_ccache");
-                       domain->private = NULL;
+                       domain->private_data = NULL;
                }       
        }
 
@@ -68,15 +80,50 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
        }
 
        /* the machine acct password might have change - fetch it every time */
-       SAFE_FREE(ads->auth.password);
-       ads->auth.password = secrets_fetch_machine_password(lp_workgroup(), NULL, NULL);
 
+       SAFE_FREE(ads->auth.password);
        SAFE_FREE(ads->auth.realm);
-       ads->auth.realm = SMB_STRDUP(lp_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 ) ) {
+                       ads_destroy( &ads );
+                       return NULL;
+               }
+               ads->auth.realm = SMB_STRDUP( ads->server.realm );
+               strupper_m( ads->auth.realm );
+       }
+       else {
+               struct winbindd_domain *our_domain = domain;
+
+               ads->auth.password = secrets_fetch_machine_password(lp_workgroup(), NULL, NULL);
+
+               /* always give preference to the alt_name in our 
+                  primary domain if possible */
+
+               if ( !domain->primary )
+                       our_domain = find_our_domain();
+
+               if ( our_domain->alt_name[0] != '\0' ) {
+                       ads->auth.realm = SMB_STRDUP( our_domain->alt_name );
+                       strupper_m( ads->auth.realm );
+               }
+               else
+                       ads->auth.realm = SMB_STRDUP( lp_realm() );
+       }
+
+       ads->auth.renewable = WINBINDD_PAM_AUTH_KRB5_RENEW_TIME;
+
+       /* Setup the server affinity cache.  We don't reaally care
+          about the name.  Just setup affinity and the KRB5_CONFIG 
+          file. */
+
+       get_dc_name( ads->server.workgroup, ads->server.realm, dc_name, &dc_ip );
+       
        status = ads_connect(ads);
        if (!ADS_ERR_OK(status) || !ads->config.realm) {
-               extern struct winbindd_methods msrpc_methods, cache_methods;
                DEBUG(1,("ads_connect for domain %s failed: %s\n", 
                         domain->name, ads_errstr(status)));
                ads_destroy(&ads);
@@ -85,12 +132,9 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
                    server, fall back to MSRPC */
                if (status.error_type == ENUM_ADS_ERROR_SYSTEM &&
                    status.err.rc == ECONNREFUSED) {
+                       /* 'reconnect_methods' is the MS-RPC backend. */
                        DEBUG(1,("Trying MSRPC methods\n"));
-                       if (domain->methods == &cache_methods) {
-                               domain->backend = &msrpc_methods;
-                       } else {
-                               domain->methods = &msrpc_methods;
-                       }
+                       domain->backend = &reconnect_methods;
                }
                return NULL;
        }
@@ -101,7 +145,7 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
 
        ads->is_mine = False;
 
-       domain->private = (void *)ads;
+       domain->private_data = (void *)ads;
        return ads;
 }
 
@@ -113,20 +157,23 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
                               WINBIND_USERINFO **info)
 {
        ADS_STRUCT *ads = NULL;
-       const char *attrs[] = {"userPrincipalName",
-                              "sAMAccountName",
-                              "name", "objectSid", "primaryGroupID", 
-                              "sAMAccountType", NULL};
+       const char *attrs[] = { "*", NULL };
        int i, count;
        ADS_STATUS rc;
-       void *res = NULL;
-       void *msg = NULL;
+       LDAPMessage *res = NULL;
+       LDAPMessage *msg = NULL;
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 
        *num_entries = 0;
 
        DEBUG(3,("ads: query_user_list\n"));
 
+       if ( !winbindd_can_contact_domain( domain ) ) {
+               DEBUG(10,("query_user_list: No incoming trust for domain %s\n",
+                         domain->name));               
+               return NT_STATUS_OK;
+       }
+
        ads = ads_cached_connection(domain);
        
        if (!ads) {
@@ -134,7 +181,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
                goto done;
        }
 
-       rc = ads_search_retry(ads, &res, "(objectClass=user)", attrs);
+       rc = ads_search_retry(ads, &res, "(objectCategory=user)", attrs);
        if (!ADS_ERR_OK(rc) || !res) {
                DEBUG(1,("query_user_list ads_search: %s\n", ads_errstr(rc)));
                goto done;
@@ -155,9 +202,13 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
        i = 0;
 
        for (msg = ads_first_entry(ads, res); msg; msg = ads_next_entry(ads, msg)) {
-               char *name, *gecos;
+               char *name, *gecos = NULL;
+               char *homedir = NULL;
+               char *shell = NULL;
                uint32 group;
                uint32 atype;
+               DOM_SID user_sid;
+               gid_t primary_gid = (gid_t)-1;
 
                if (!ads_pull_uint32(ads, msg, "sAMAccountType", &atype) ||
                    ads_atype_map(atype) != SID_NAME_USER) {
@@ -166,7 +217,17 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
                }
 
                name = ads_pull_username(ads, mem_ctx, msg);
-               gecos = ads_pull_string(ads, mem_ctx, msg, "name");
+
+               if ( ads_pull_sid( ads, msg, "objectSid", &user_sid ) ) {
+                       status = nss_get_info_cached( domain, &user_sid, mem_ctx, 
+                                              ads, msg, &homedir, &shell, &gecos,
+                                              &primary_gid );
+               }
+
+               if (gecos == NULL) {
+                       gecos = ads_pull_string(ads, mem_ctx, msg, "name");
+               }
+       
                if (!ads_pull_sid(ads, msg, "objectSid",
                                  &(*info)[i].user_sid)) {
                        DEBUG(1,("No sid for %s !?\n", name));
@@ -179,6 +240,9 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 
                (*info)[i].acct_name = name;
                (*info)[i].full_name = gecos;
+               (*info)[i].homedir = homedir;
+               (*info)[i].shell = shell;
+               (*info)[i].primary_gid = primary_gid;
                sid_compose(&(*info)[i].group_sid, &domain->sid, group);
                i++;
        }
@@ -203,19 +267,57 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
 {
        ADS_STRUCT *ads = NULL;
        const char *attrs[] = {"userPrincipalName", "sAMAccountName",
-                              "name", "objectSid", 
-                              "sAMAccountType", NULL};
+                              "name", "objectSid", NULL};
        int i, count;
        ADS_STATUS rc;
-       void *res = NULL;
-       void *msg = NULL;
+       LDAPMessage *res = NULL;
+       LDAPMessage *msg = NULL;
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-       uint32 group_flags;
+       const char *filter;
+       BOOL enum_dom_local_groups = False;
 
        *num_entries = 0;
 
        DEBUG(3,("ads: enum_dom_groups\n"));
 
+       if ( !winbindd_can_contact_domain( domain ) ) {
+               DEBUG(10,("enum_dom_groups: No incoming trust for domain %s\n",
+                         domain->name));               
+               return NT_STATUS_OK;
+       }
+
+       /* only grab domain local groups for our domain */
+       if ( domain->active_directory && strequal(lp_realm(), domain->alt_name)  ) {
+               enum_dom_local_groups = True;
+       }
+
+       /* Workaround ADS LDAP bug present in MS W2K3 SP0 and W2K SP4 w/o
+        * rollup-fixes:
+        *
+        * According to Section 5.1(4) of RFC 2251 if a value of a type is it's
+        * default value, it MUST be absent. In case of extensible matching the
+        * "dnattr" boolean defaults to FALSE and so it must be only be present
+        * when set to TRUE. 
+        *
+        * When it is set to FALSE and the OpenLDAP lib (correctly) encodes a
+        * filter using bitwise matching rule then the buggy AD fails to decode
+        * the extensible match. As a workaround set it to TRUE and thereby add
+        * the dnAttributes "dn" field to cope with those older AD versions.
+        * It should not harm and won't put any additional load on the AD since
+        * none of the dn components have a bitmask-attribute.
+        *
+        * Thanks to Ralf Haferkamp for input and testing - Guenther */
+
+       filter = talloc_asprintf(mem_ctx, "(&(objectCategory=group)(&(groupType:dn:%s:=%d)(!(groupType:dn:%s:=%d))))", 
+                                ADS_LDAP_MATCHING_RULE_BIT_AND, GROUP_TYPE_SECURITY_ENABLED,
+                                ADS_LDAP_MATCHING_RULE_BIT_AND, 
+                                enum_dom_local_groups ? GROUP_TYPE_BUILTIN_LOCAL_GROUP : GROUP_TYPE_RESOURCE_GROUP);
+
+       if (filter == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
+
        ads = ads_cached_connection(domain);
 
        if (!ads) {
@@ -223,7 +325,7 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
                goto done;
        }
 
-       rc = ads_search_retry(ads, &res, "(objectCategory=group)", attrs);
+       rc = ads_search_retry(ads, &res, filter, attrs);
        if (!ADS_ERR_OK(rc) || !res) {
                DEBUG(1,("enum_dom_groups ads_search: %s\n", ads_errstr(rc)));
                goto done;
@@ -243,21 +345,11 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
 
        i = 0;
        
-       group_flags = ATYPE_GLOBAL_GROUP;
-
-       /* only grab domain local groups for our domain */
-       if ( domain->native_mode && strequal(lp_realm(), domain->alt_name)  )
-               group_flags |= ATYPE_LOCAL_GROUP;
-
        for (msg = ads_first_entry(ads, res); msg; msg = ads_next_entry(ads, msg)) {
                char *name, *gecos;
                DOM_SID sid;
                uint32 rid;
-               uint32 account_type;
 
-               if (!ads_pull_uint32(ads, msg, "sAMAccountType", &account_type) || !(account_type & group_flags) ) 
-                       continue; 
-                       
                name = ads_pull_username(ads, mem_ctx, msg);
                gecos = ads_pull_string(ads, mem_ctx, msg, "name");
                if (!ads_pull_sid(ads, msg, "objectSid", &sid)) {
@@ -310,49 +402,10 @@ static NTSTATUS enum_local_groups(struct winbindd_domain *domain,
        return NT_STATUS_OK;
 }
 
-/* convert a DN to a name, SID and name type 
-   this might become a major speed bottleneck if groups have
-   lots of users, in which case we could cache the results
-*/
-static BOOL dn_lookup(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
-                     const char *dn,
-                     char **name, uint32 *name_type, DOM_SID *sid)
-{
-       void *res = NULL;
-       const char *attrs[] = {"userPrincipalName", "sAMAccountName",
-                              "objectSid", "sAMAccountType", NULL};
-       ADS_STATUS rc;
-       uint32 atype;
-       DEBUG(3,("ads: dn_lookup\n"));
-
-       rc = ads_search_retry_dn(ads, &res, dn, attrs);
-
-       if (!ADS_ERR_OK(rc) || !res) {
-               goto failed;
-       }
-
-       (*name) = ads_pull_username(ads, mem_ctx, res);
-
-       if (!ads_pull_uint32(ads, res, "sAMAccountType", &atype)) {
-               goto failed;
-       }
-       (*name_type) = ads_atype_map(atype);
-
-       if (!ads_pull_sid(ads, res, "objectSid", sid)) {
-               goto failed;
-       }
-
-       if (res) 
-               ads_msgfree(ads, res);
-
-       return True;
-
-failed:
-       if (res) 
-               ads_msgfree(ads, res);
-
-       return False;
-}
+/* If you are looking for "dn_lookup": Yes, it used to be here!
+ * It has gone now since it was a major speed bottleneck in
+ * lookup_groupmem (its only use). It has been replaced by
+ * an rpc lookup sids call... R.I.P. */
 
 /* Lookup user information from a rid */
 static NTSTATUS query_user(struct winbindd_domain *domain, 
@@ -361,23 +414,72 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
                           WINBIND_USERINFO *info)
 {
        ADS_STRUCT *ads = NULL;
-       const char *attrs[] = {"userPrincipalName", 
-                              "sAMAccountName",
-                              "name", 
-                              "primaryGroupID", NULL};
+       const char *attrs[] = { "*", NULL };
        ADS_STATUS rc;
        int count;
-       void *msg = NULL;
+       LDAPMessage *msg = NULL;
        char *ldap_exp;
        char *sidstr;
        uint32 group_rid;
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+       NET_USER_INFO_3 *user;
 
        DEBUG(3,("ads: query_user\n"));
 
-       ads = ads_cached_connection(domain);
-       
-       if (!ads) {
+       info->homedir = NULL;
+       info->shell = NULL;
+       info->primary_gid = (gid_t)-1;
+
+       /* try netsamlogon cache first */
+                       
+       if ( (user = netsamlogon_cache_get( mem_ctx, sid )) != NULL ) 
+       {
+                               
+               DEBUG(5,("query_user: Cache lookup succeeded for %s\n", 
+                       sid_string_static(sid)));
+
+               sid_compose(&info->user_sid, &domain->sid, user->user_rid);
+               sid_compose(&info->group_sid, &domain->sid, user->group_rid);
+                               
+               info->acct_name = unistr2_tdup(mem_ctx, &user->uni_user_name);
+               info->full_name = unistr2_tdup(mem_ctx, &user->uni_full_name);
+               
+               nss_get_info_cached( domain, sid, mem_ctx, NULL, NULL, 
+                             &info->homedir, &info->shell, &info->full_name, 
+                             &info->primary_gid );     
+
+               TALLOC_FREE(user);
+                               
+               return NT_STATUS_OK;
+       }
+
+       if ( !winbindd_can_contact_domain(domain)) {
+               DEBUG(8,("query_user: No incoming trust from domain %s\n",
+                        domain->name));
+
+               /* We still need to generate some basic information
+                  about the user even if we cannot contact the 
+                  domain.  Most of this stuff we can deduce. */
+
+               sid_copy( &info->user_sid, sid );
+
+               /* Assume "Domain Users" for the primary group */
+
+               sid_compose(&info->group_sid, &domain->sid, DOMAIN_GROUP_RID_USERS );
+
+               /* Try to fill in what the nss_info backend can do */
+
+               nss_get_info_cached( domain, sid, mem_ctx, NULL, NULL, 
+                             &info->homedir, &info->shell, &info->full_name, 
+                             &info->primary_gid );
+
+               status = NT_STATUS_OK;
+               goto done;
+       }
+
+       /* no cache...do the query */
+
+       if ( (ads = ads_cached_connection(domain)) == NULL ) {
                domain->last_status = NT_STATUS_SERVER_DISABLED;
                goto done;
        }
@@ -401,7 +503,14 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
        }
 
        info->acct_name = ads_pull_username(ads, mem_ctx, msg);
-       info->full_name = ads_pull_string(ads, mem_ctx, msg, "name");
+
+       nss_get_info_cached( domain, sid, mem_ctx, ads, msg, 
+                     &info->homedir, &info->shell, &info->full_name, 
+                     &info->primary_gid );     
+
+       if (info->full_name == NULL) {
+               info->full_name = ads_pull_string(ads, mem_ctx, msg, "name");
+       }
 
        if (!ads_pull_uint32(ads, msg, "primaryGroupID", &group_rid)) {
                DEBUG(1,("No primary group for %s !?\n",
@@ -424,23 +533,30 @@ done:
 
 /* Lookup groups a user is a member of - alternate method, for when
    tokenGroups are not available. */
-static NTSTATUS lookup_usergroups_alt(struct winbindd_domain *domain,
-                                     TALLOC_CTX *mem_ctx,
-                                     const char *user_dn, 
-                                     DOM_SID *primary_group,
-                                     uint32 *num_groups, DOM_SID **user_sids)
+static NTSTATUS lookup_usergroups_member(struct winbindd_domain *domain,
+                                        TALLOC_CTX *mem_ctx,
+                                        const char *user_dn, 
+                                        DOM_SID *primary_group,
+                                        size_t *p_num_groups, DOM_SID **user_sids)
 {
        ADS_STATUS rc;
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
        int count;
-       void *res = NULL;
-       void *msg = NULL;
+       LDAPMessage *res = NULL;
+       LDAPMessage *msg = NULL;
        char *ldap_exp;
        ADS_STRUCT *ads;
        const char *group_attrs[] = {"objectSid", NULL};
        char *escaped_dn;
+       size_t num_groups = 0;
+
+       DEBUG(3,("ads: lookup_usergroups_member\n"));
 
-       DEBUG(3,("ads: lookup_usergroups_alt\n"));
+       if ( !winbindd_can_contact_domain( domain ) ) {
+               DEBUG(10,("lookup_usergroups_members: No incoming trust for domain %s\n",
+                         domain->name));               
+               return NT_STATUS_OK;
+       }
 
        ads = ads_cached_connection(domain);
 
@@ -454,10 +570,7 @@ static NTSTATUS lookup_usergroups_alt(struct winbindd_domain *domain,
                goto done;
        }
 
-       /* buggy server, no tokenGroups.  Instead lookup what groups this user
-          is a member of by DN search on member*/
-
-       if (!(ldap_exp = talloc_asprintf(mem_ctx, "(&(member=%s)(objectClass=group))", escaped_dn))) {
+       if (!(ldap_exp = talloc_asprintf(mem_ctx, "(&(member=%s)(objectCategory=group))", escaped_dn))) {
                DEBUG(1,("lookup_usergroups(dn=%s) asprintf failed!\n", user_dn));
                SAFE_FREE(escaped_dn);
                status = NT_STATUS_NO_MEMORY;
@@ -474,33 +587,44 @@ static NTSTATUS lookup_usergroups_alt(struct winbindd_domain *domain,
        }
        
        count = ads_count_replies(ads, res);
-       if (count == 0) {
-               DEBUG(5,("lookup_usergroups: No supp groups found\n"));
-               
-               status = ads_ntstatus(rc);
-               goto done;
-       }
        
        *user_sids = NULL;
-       *num_groups = 0;
+       num_groups = 0;
 
-       add_sid_to_array(mem_ctx, primary_group, user_sids, num_groups);
+       /* always add the primary group to the sid array */
+       if (!add_sid_to_array(mem_ctx, primary_group, user_sids, &num_groups)) {
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
 
-       for (msg = ads_first_entry(ads, res); msg;
-            msg = ads_next_entry(ads, msg)) {
-               DOM_SID group_sid;
+       if (count > 0) {
+               for (msg = ads_first_entry(ads, res); msg;
+                    msg = ads_next_entry(ads, msg)) {
+                       DOM_SID group_sid;
                
-               if (!ads_pull_sid(ads, msg, "objectSid", &group_sid)) {
-                       DEBUG(1,("No sid for this group ?!?\n"));
-                       continue;
+                       if (!ads_pull_sid(ads, msg, "objectSid", &group_sid)) {
+                               DEBUG(1,("No sid for this group ?!?\n"));
+                               continue;
+                       }
+       
+                       /* ignore Builtin groups from ADS - Guenther */
+                       if (sid_check_is_in_builtin(&group_sid)) {
+                               continue;
+                       }
+                              
+                       if (!add_sid_to_array(mem_ctx, &group_sid, user_sids,
+                                        &num_groups)) {
+                               status = NT_STATUS_NO_MEMORY;
+                               goto done;
+                       }
                }
 
-               add_sid_to_array(mem_ctx, &group_sid, user_sids, num_groups);
        }
 
+       *p_num_groups = num_groups;
        status = (user_sids != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
 
-       DEBUG(3,("ads lookup_usergroups (alt) for dn=%s\n", user_dn));
+       DEBUG(3,("ads lookup_usergroups (member) succeeded for dn=%s\n", user_dn));
 done:
        if (res) 
                ads_msgfree(ads, res);
@@ -508,27 +632,147 @@ done:
        return status;
 }
 
+/* Lookup groups a user is a member of - alternate method, for when
+   tokenGroups are not available. */
+static NTSTATUS lookup_usergroups_memberof(struct winbindd_domain *domain,
+                                          TALLOC_CTX *mem_ctx,
+                                          const char *user_dn, 
+                                          DOM_SID *primary_group,
+                                          size_t *p_num_groups, DOM_SID **user_sids)
+{
+       ADS_STATUS rc;
+       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+       ADS_STRUCT *ads;
+       const char *attrs[] = {"memberOf", NULL};
+       size_t num_groups = 0;
+       DOM_SID *group_sids = NULL;
+       int i;
+       char **strings;
+       size_t num_strings = 0;
+
+
+       DEBUG(3,("ads: lookup_usergroups_memberof\n"));
+
+       if ( !winbindd_can_contact_domain( domain ) ) {
+               DEBUG(10,("lookup_usergroups_memberof: No incoming trust for domain %s\n",
+                         domain->name));               
+               return NT_STATUS_OK;
+       }
+
+       ads = ads_cached_connection(domain);
+
+       if (!ads) {
+               domain->last_status = NT_STATUS_SERVER_DISABLED;
+               goto done;
+       }
+
+       rc = ads_search_retry_extended_dn_ranged(ads, mem_ctx, user_dn, attrs, 
+                                                ADS_EXTENDED_DN_HEX_STRING, 
+                                                &strings, &num_strings);
+
+       if (!ADS_ERR_OK(rc)) {
+               DEBUG(1,("lookup_usergroups_memberof ads_search member=%s: %s\n", 
+                       user_dn, ads_errstr(rc)));
+               return ads_ntstatus(rc);
+       }
+       
+       *user_sids = NULL;
+       num_groups = 0;
+
+       /* always add the primary group to the sid array */
+       if (!add_sid_to_array(mem_ctx, primary_group, user_sids, &num_groups)) {
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
+
+       group_sids = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, num_strings + 1);
+       if (!group_sids) {
+               TALLOC_FREE(strings);
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
+
+       for (i=0; i<num_strings; i++) {
+
+               if (!ads_get_sid_from_extended_dn(mem_ctx, strings[i], 
+                                                 ADS_EXTENDED_DN_HEX_STRING, 
+                                                 &(group_sids)[i])) {
+                       TALLOC_FREE(group_sids);
+                       TALLOC_FREE(strings);
+                       status = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+       }
+
+       if (i == 0) {
+               DEBUG(1,("No memberOf for this user?!?\n"));
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
+
+       for (i=0; i<num_strings; i++) {
+
+               /* ignore Builtin groups from ADS - Guenther */
+               if (sid_check_is_in_builtin(&group_sids[i])) {
+                       continue;
+               }
+                      
+               if (!add_sid_to_array(mem_ctx, &group_sids[i], user_sids,
+                                &num_groups)) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+       
+       }
+
+       *p_num_groups = num_groups;
+       status = (*user_sids != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
+
+       DEBUG(3,("ads lookup_usergroups (memberof) succeeded for dn=%s\n", user_dn));
+done:
+       TALLOC_FREE(group_sids);
+
+       return status;
+}
+
+
 /* Lookup groups a user is a member of. */
 static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
                                  TALLOC_CTX *mem_ctx,
                                  const DOM_SID *sid, 
-                                 uint32 *num_groups, DOM_SID **user_sids)
+                                 uint32 *p_num_groups, DOM_SID **user_sids)
 {
        ADS_STRUCT *ads = NULL;
        const char *attrs[] = {"tokenGroups", "primaryGroupID", NULL};
        ADS_STATUS rc;
        int count;
        LDAPMessage *msg = NULL;
-       char *user_dn;
+       char *user_dn = NULL;
        DOM_SID *sids;
        int i;
        DOM_SID primary_group;
        uint32 primary_group_rid;
        fstring sid_string;
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+       size_t num_groups = 0;
 
        DEBUG(3,("ads: lookup_usergroups\n"));
-       *num_groups = 0;
+       *p_num_groups = 0;
+
+       status = lookup_usergroups_cached(domain, mem_ctx, sid, 
+                                         p_num_groups, user_sids);
+       if (NT_STATUS_IS_OK(status)) {
+               return NT_STATUS_OK;
+       }
+
+       if ( !winbindd_can_contact_domain( domain ) ) {
+               DEBUG(10,("lookup_usergroups: No incoming trust for domain %s\n",
+                         domain->name));
+
+               /* Tell the cache manager not to remember this one */
+
+               return NT_STATUS_SYNCHRONIZATION_REQUIRED;
+       }
 
        ads = ads_cached_connection(domain);
        
@@ -538,13 +782,8 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
                goto done;
        }
 
-       rc = ads_sid_to_dn(ads, mem_ctx, sid, &user_dn);
-       if (!ADS_ERR_OK(rc)) {
-               status = ads_ntstatus(rc);
-               goto done;
-       }
+       rc = ads_search_retry_sid(ads, &msg, sid, attrs);
 
-       rc = ads_search_retry_dn(ads, (void**)&msg, user_dn, attrs);
        if (!ADS_ERR_OK(rc)) {
                status = ads_ntstatus(rc);
                DEBUG(1,("lookup_usergroups(sid=%s) ads_search tokenGroups: %s\n", 
@@ -552,6 +791,15 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
                goto done;
        }
        
+       count = ads_count_replies(ads, msg);
+       if (count != 1) {
+               status = NT_STATUS_UNSUCCESSFUL;
+               DEBUG(1,("lookup_usergroups(sid=%s) ads_search tokenGroups: "
+                        "invalid number of results (count=%d)\n", 
+                        sid_to_string(sid_string, sid), count));
+               goto done;
+       }
+
        if (!msg) {
                DEBUG(1,("lookup_usergroups(sid=%s) ads_search tokenGroups: NULL msg\n", 
                         sid_to_string(sid_string, sid)));
@@ -559,6 +807,12 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
                goto done;
        }
 
+       user_dn = ads_get_dn(ads, msg);
+       if (user_dn == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
+
        if (!ads_pull_uint32(ads, msg, "primaryGroupID", &primary_group_rid)) {
                DEBUG(1,("%s: No primary group for sid=%s !?\n", 
                         domain->name, sid_to_string(sid_string, sid)));
@@ -570,31 +824,67 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 
        count = ads_pull_sids(ads, mem_ctx, msg, "tokenGroups", &sids);
 
-       if (msg) 
-               ads_msgfree(ads, msg);
-
        /* there must always be at least one group in the token, 
           unless we are talking to a buggy Win2k server */
+
+       /* actually this only happens when the machine account has no read
+        * permissions on the tokenGroup attribute - gd */
+
        if (count == 0) {
-               return lookup_usergroups_alt(domain, mem_ctx, user_dn, 
-                                            &primary_group,
-                                            num_groups, user_sids);
+
+               /* no tokenGroups */
+               
+               /* lookup what groups this user is a member of by DN search on
+                * "memberOf" */
+
+               status = lookup_usergroups_memberof(domain, mem_ctx, user_dn,
+                                                   &primary_group,
+                                                   &num_groups, user_sids);
+               *p_num_groups = (uint32)num_groups;
+               if (NT_STATUS_IS_OK(status)) {
+                       goto done;
+               }
+
+               /* lookup what groups this user is a member of by DN search on
+                * "member" */
+
+               status = lookup_usergroups_member(domain, mem_ctx, user_dn, 
+                                                 &primary_group,
+                                                 &num_groups, user_sids);
+               *p_num_groups = (uint32)num_groups;
+               goto done;
        }
 
        *user_sids = NULL;
-       *num_groups = 0;
+       num_groups = 0;
 
-       add_sid_to_array(mem_ctx, &primary_group, user_sids, num_groups);
+       if (!add_sid_to_array(mem_ctx, &primary_group, user_sids, &num_groups)) {
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
        
-       for (i=0;i<count;i++)
-               add_sid_to_array_unique(mem_ctx, &sids[i],
-                                       user_sids, num_groups);
+       for (i=0;i<count;i++) {
 
-       status = (user_sids != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
+               /* ignore Builtin groups from ADS - Guenther */
+               if (sid_check_is_in_builtin(&sids[i])) {
+                       continue;
+               }
+                              
+               if (!add_sid_to_array_unique(mem_ctx, &sids[i],
+                                       user_sids, &num_groups)) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+       }
 
-       DEBUG(3,("ads lookup_usergroups for sid=%s\n",
+       *p_num_groups = (uint32)num_groups;
+       status = (*user_sids != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
+
+       DEBUG(3,("ads lookup_usergroups (tokenGroups) succeeded for sid=%s\n",
                 sid_to_string(sid_string, sid)));
 done:
+       ads_memfree(ads, user_dn);
+       ads_msgfree(ads, msg);
        return status;
 }
 
@@ -608,26 +898,31 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
                                uint32 **name_types)
 {
        ADS_STATUS rc;
-       int count;
-       void *res=NULL;
+       LDAPMessage *res=NULL;
        ADS_STRUCT *ads = NULL;
        char *ldap_exp;
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
        char *sidstr;
-       char **members;
-       int i, num_members;
-       fstring sid_string;
-       BOOL more_values;
-       const char **attrs;
-       uint32 first_usn;
-       uint32 current_usn;
-       int num_retries = 0;
+       char **members = NULL;
+       int i;
+       size_t num_members = 0;
+       ads_control args;
+       char **domains = NULL;     /* only needed for rpccli_lsa_lookup_sids */
+        struct rpc_pipe_client *cli;
+        POLICY_HND lsa_policy;
+
 
        DEBUG(10,("ads: lookup_groupmem %s sid=%s\n", domain->name, 
                  sid_string_static(group_sid)));
 
        *num_names = 0;
 
+       if ( !winbindd_can_contact_domain( domain ) ) {
+               DEBUG(10,("lookup_groupmem: No incoming trust for domain %s\n",
+                         domain->name));               
+               return NT_STATUS_OK;
+       }
+
        ads = ads_cached_connection(domain);
        
        if (!ads) {
@@ -635,7 +930,10 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
                goto done;
        }
 
-       sidstr = sid_binstring(group_sid);
+       if ((sidstr = sid_binstring(group_sid)) == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
 
        /* search for all members of the group */
        if (!(ldap_exp = talloc_asprintf(mem_ctx, "(objectSid=%s)",sidstr))) {
@@ -646,94 +944,91 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
        }
        SAFE_FREE(sidstr);
 
-       members = NULL;
-       num_members = 0;
-
-       attrs = TALLOC_ARRAY(mem_ctx, const char *, 3);
-       attrs[1] = talloc_strdup(mem_ctx, "usnChanged");
-       attrs[2] = NULL;
-               
-       do {
-               if (num_members == 0) 
-                       attrs[0] = talloc_strdup(mem_ctx, "member");
-
-               DEBUG(10, ("Searching for attrs[0] = %s, attrs[1] = %s\n", attrs[0], attrs[1]));
-
-               rc = ads_search_retry(ads, &res, ldap_exp, attrs);
-
-               if (!ADS_ERR_OK(rc) || !res) {
-                       DEBUG(1,("ads: lookup_groupmem ads_search: %s\n",
-                                ads_errstr(rc)));
-                       status = ads_ntstatus(rc);
-                       goto done;
-               }
+       args.control = ADS_EXTENDED_DN_OID;
+       args.val = ADS_EXTENDED_DN_HEX_STRING;
+       args.critical = True;
 
-               count = ads_count_replies(ads, res);
-               if (count == 0)
-                       break;
+       rc = ads_ranged_search(ads, mem_ctx, LDAP_SCOPE_SUBTREE, ads->config.bind_path, 
+                              ldap_exp, &args, "member", &members, &num_members);
 
-               if (num_members == 0) {
-                       if (!ads_pull_uint32(ads, res, "usnChanged", &first_usn)) {
-                               DEBUG(1, ("ads: lookup_groupmem could not pull usnChanged!\n"));
-                               goto done;
-                       }
-               }
+       if (!ADS_ERR_OK(rc)) {
+               DEBUG(0,("ads_ranged_search failed with: %s\n", ads_errstr(rc)));
+               status = NT_STATUS_UNSUCCESSFUL;
+               goto done;
+       } 
+       
+       (*sid_mem) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, num_members);
+       if ((num_members != 0) && 
+           ((members == NULL) || (*sid_mem == NULL))) { 
+               DEBUG(1, ("talloc failed\n"));
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
 
-               if (!ads_pull_uint32(ads, res, "usnChanged", &current_usn)) {
-                       DEBUG(1, ("ads: lookup_groupmem could not pull usnChanged!\n"));
-                       goto done;
+       for (i=0; i<num_members; i++) {
+               if (!ads_get_sid_from_extended_dn(mem_ctx, members[i], args.val, &(*sid_mem)[i])) {
+                       goto done;
                }
-
-               if (first_usn != current_usn) {
-                       DEBUG(5, ("ads: lookup_groupmem USN on this record changed"
-                                 " - restarting search\n"));
-                       if (num_retries < 5) {
-                               num_retries++;
-                               num_members = 0;
+       }
+       
+       DEBUG(10, ("ads lookup_groupmem: got %d sids via extended dn call\n", num_members));
+       
+       /* now that we have a list of sids, we need to get the
+        * lists of names and name_types belonging to these sids.
+        * even though conceptually not quite clean,  we use the 
+        * RPC call lsa_lookup_sids for this since it can handle a 
+        * list of sids. ldap calls can just resolve one sid at a time. */
+       
+       status = cm_connect_lsa(domain, mem_ctx, &cli, &lsa_policy);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
+       
+       status = rpccli_lsa_lookup_sids_all(cli, mem_ctx, &lsa_policy,
+                                           num_members, *sid_mem, &domains, 
+                                           names, name_types);
+       
+       if (NT_STATUS_IS_OK(status)) {
+               *num_names = num_members;
+       }
+       else if (NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
+               /* We need to remove gaps from the arrays... 
+                * Do this by simply moving entries down in the
+                * arrays once a gap is encountered instead of
+                * allocating (and reallocating...) new arrays and
+                * copying complete entries over. */
+               *num_names = 0;
+               for (i=0; i < num_members; i++) {
+                       if (((*names)[i] == NULL) || ((*name_types)[i] == SID_NAME_UNKNOWN)) 
+                       {
+                               /* unresolved sid: gap! */
                                continue;
-                       } else {
-                               DEBUG(5, ("ads: lookup_groupmem USN on this record changed"
-                                         " - restarted search too many times, aborting!\n"));
-                               status = NT_STATUS_UNSUCCESSFUL;
-                               goto done;
                        }
+                       if (i != *num_names) {
+                               /* if we have already had a gap, copy down: */
+                               (*names)[*num_names] = (*names)[i];
+                               (*name_types)[*num_names] = (*name_types)[i];
+                               (*sid_mem)[*num_names] = (*sid_mem)[i];
+                       }
+                       (*num_names)++;
                }
-
-               members = ads_pull_strings_range(ads, mem_ctx, res,
-                                                "member",
-                                                members,
-                                                &attrs[0],
-                                                &num_members,
-                                                &more_values);
-
-               if ((members == NULL) || (num_members == 0))
-                       break;
-
-       } while (more_values);
-               
-       /* now we need to turn a list of members into rids, names and name types 
-          the problem is that the members are in the form of distinguised names
-       */
-
-       (*sid_mem) = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, num_members);
-       (*name_types) = TALLOC_ZERO_ARRAY(mem_ctx, uint32, num_members);
-       (*names) = TALLOC_ZERO_ARRAY(mem_ctx, char *, num_members);
-
-       for (i=0;i<num_members;i++) {
-               uint32 name_type;
-               char *name;
-               DOM_SID sid;
-
-               if (dn_lookup(ads, mem_ctx, members[i], &name, &name_type, &sid)) {
-                   (*names)[*num_names] = name;
-                   (*name_types)[*num_names] = name_type;
-                   sid_copy(&(*sid_mem)[*num_names], &sid);
-                   (*num_names)++;
-               }
-       }       
-
+       }
+       else if (NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
+               DEBUG(10, ("lookup_groupmem: lsa_lookup_sids could "
+                          "not map any SIDs at all.\n"));
+               goto done;
+       }
+       else if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("lookup_groupmem: Error looking up %d "
+                          "sids via rpc_lsa_lookup_sids: %s\n",
+                          num_members, nt_errstr(status)));
+               goto done;
+       }
+       
        status = NT_STATUS_OK;
-       DEBUG(3,("ads lookup_groupmem for sid=%s\n", sid_to_string(sid_string, group_sid)));
+       DEBUG(3,("ads lookup_groupmem for sid=%s succeeded\n",
+                sid_string_static(group_sid)));
+
 done:
 
        if (res) 
@@ -750,6 +1045,13 @@ static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq)
 
        DEBUG(3,("ads: fetch sequence_number for %s\n", domain->name));
 
+       if ( !winbindd_can_contact_domain( domain ) ) {
+               DEBUG(10,("sequence: No incoming trust for domain %s\n",
+                         domain->name));
+               *seq = time(NULL);              
+               return NT_STATUS_OK;
+       }
+
        *seq = DOM_SEQUENCE_NONE;
 
        ads = ads_cached_connection(domain);
@@ -763,11 +1065,15 @@ static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq)
        
        if (!ADS_ERR_OK(rc)) {
        
-               /* its a dead connection ; don't destroy it 
-                  through since ads_USN() has already done 
-                  that indirectly */
-                  
-               domain->private = NULL;
+               /* its a dead connection, destroy it */
+
+               if (domain->private_data) {
+                       ads = (ADS_STRUCT *)domain->private_data;
+                       ads->is_mine = True;
+                       ads_destroy(&ads);
+                       ads_kdestroy("MEMORY:winbind_ccache");
+                       domain->private_data = NULL;
+               }
        }
        return ads_ntstatus(rc);
 }
@@ -784,10 +1090,11 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
        struct ds_domain_trust  *domains = NULL;
        int                     count = 0;
        int                     i;
-                               /* i think we only need our forest and downlevel trusted domains */
-       uint32                  flags = DS_DOMAIN_IN_FOREST | DS_DOMAIN_DIRECT_OUTBOUND;
+       uint32                  flags;  
        struct rpc_pipe_client *cli;
-
+       uint32                 fr_flags = (DS_DOMAIN_IN_FOREST | DS_DOMAIN_TREE_ROOT);  
+       int ret_count;
+       
        DEBUG(3,("ads: trusted_domains\n"));
 
        *num_domains = 0;
@@ -795,13 +1102,21 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
        *names       = NULL;
        *dom_sids    = NULL;
 
+       /* If this is our primary domain or a root in our forest,
+          query for all trusts.  If not, then just look for domain
+          trusts in the target forest */
+
+       if ( domain->primary ||
+               ((domain->domain_flags&fr_flags) == fr_flags) ) 
        {
-               unsigned char *session_key;
-               DOM_CRED *creds;
+               flags = DS_DOMAIN_DIRECT_OUTBOUND | 
+                       DS_DOMAIN_DIRECT_INBOUND | 
+                       DS_DOMAIN_IN_FOREST;
+       } else {
+               flags = DS_DOMAIN_IN_FOREST;
+       }       
 
-               result = cm_connect_netlogon(domain, mem_ctx, &cli,
-                                            &session_key, &creds);
-       }
+       result = cm_connect_netlogon(domain, &cli);
 
        if (!NT_STATUS_IS_OK(result)) {
                DEBUG(5, ("trusted_domains: Could not open a connection to %s "
@@ -810,14 +1125,15 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
                return NT_STATUS_UNSUCCESSFUL;
        }
        
-       if ( NT_STATUS_IS_OK(result) )
+       if ( NT_STATUS_IS_OK(result) ) {
                result = rpccli_ds_enum_domain_trusts(cli, mem_ctx,
                                                      cli->cli->desthost, 
                                                      flags, &domains,
                                                      (unsigned int *)&count);
+       }
        
        if ( NT_STATUS_IS_OK(result) && count) {
-       
+
                /* Allocate memory for trusted domain names and sids */
 
                if ( !(*names = TALLOC_ARRAY(mem_ctx, char *, count)) ) {
@@ -837,53 +1153,73 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
 
                /* Copy across names and sids */
 
-               for (i = 0; i < count; i++) {
-                       (*names)[i] = domains[i].netbios_domain;
-                       (*alt_names)[i] = domains[i].dns_domain;
-
-                       sid_copy(&(*dom_sids)[i], &domains[i].sid);
-               }
-
-               *num_domains = count;   
-       }
-
-       return result;
-}
-
-/* find alternate names list for the domain - for ADS this is the
-   netbios name */
-static NTSTATUS alternate_name(struct winbindd_domain *domain)
-{
-       ADS_STRUCT *ads;
-       ADS_STATUS rc;
-       TALLOC_CTX *ctx;
-       const char *workgroup;
 
-       DEBUG(3,("ads: alternate_name\n"));
+               ret_count = 0;          
+               for (i = 0; i < count; i++) {
+                       struct winbindd_domain d;
+                       
+                       /* drop external trusts if this is not our primary 
+                          domain.  This means that the returned number of 
+                          domains may be less that the ones actually trusted
+                          by the DC. */
+
+                       if ( (domains[i].trust_attributes == DS_DOMAIN_TRUST_ATTRIB_QUARANTINED_DOMAIN) && 
+                            !domain->primary ) 
+                       {
+                               DEBUG(10,("trusted_domains: Skipping external trusted domain "
+                                         "%s because it is outside of our primary domain\n",
+                                         domains[i].netbios_domain));                          
+                               continue;                               
+                       }
+                       
+                       (*names)[ret_count] = domains[i].netbios_domain;
+                       (*alt_names)[ret_count] = domains[i].dns_domain;
+                       sid_copy(&(*dom_sids)[ret_count], &domains[i].sid);
+
+                       /* add to the trusted domain cache */
+
+                       fstrcpy( d.name,  domains[i].netbios_domain );
+                       fstrcpy( d.alt_name, domains[i].dns_domain );                   
+                       sid_copy( &d.sid, &domains[i].sid );
+
+                       /* This gets a little tricky.  If we are
+                          following a transitive forest trust, then
+                          innerit the flags, type, and attrins from
+                          the domain we queried to make sure we don't
+                          record the view of the trust from the wrong
+                          side.  Always view it from the side of our
+                          primary domain.   --jerry */
+                       if ( domain->primary ||
+                            ((domain->domain_flags&fr_flags) == fr_flags) ) 
+                       {
+                               DEBUG(10,("trusted_domains(ads):  Storing trust "
+                                         "flags for domain %s\n", d.alt_name));
+
+                               /* Look this up in cache to make sure
+                                  we have the current trust flags and
+                                  attributes */
+
+                               d.domain_flags = domains[i].flags;
+                               d.domain_type = domains[i].trust_type;
+                               d.domain_trust_attribs = domains[i].trust_attributes;
+                       } else {
+                               DEBUG(10,("trusted_domains(ads):  Inheriting trust "
+                                         "flags for domain %s\n", d.alt_name));                                
+                               d.domain_flags = domain->domain_flags;                          
+                               d.domain_type  = domain->domain_type;
+                               d.domain_trust_attribs = domain->domain_trust_attribs;
+                       }
 
-       ads = ads_cached_connection(domain);
-       
-       if (!ads) {
-               domain->last_status = NT_STATUS_SERVER_DISABLED;
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+                       wcache_tdc_add_domain( &d );
 
-       if (!(ctx = talloc_init("alternate_name"))) {
-               return NT_STATUS_NO_MEMORY;
-       }
+                       ret_count++;
 
-       rc = ads_workgroup_name(ads, ctx, &workgroup);
+               }
 
-       if (ADS_ERR_OK(rc)) {
-               fstrcpy(domain->name, workgroup);
-               fstrcpy(domain->alt_name, ads->config.realm);
-               strupper_m(domain->alt_name);
-               strupper_m(domain->name);
+               *num_domains = ret_count;       
        }
 
-       talloc_destroy(ctx);
-
-       return ads_ntstatus(rc);        
+       return result;
 }
 
 /* the ADS backend methods are exposed via this structure */
@@ -894,13 +1230,15 @@ struct winbindd_methods ads_methods = {
        enum_local_groups,
        msrpc_name_to_sid,
        msrpc_sid_to_name,
+       msrpc_rids_to_names,
        query_user,
        lookup_usergroups,
        msrpc_lookup_useraliases,
        lookup_groupmem,
        sequence_number,
+       msrpc_lockout_policy,
+       msrpc_password_policy,
        trusted_domains,
-       alternate_name
 };
 
 #endif