- added initial support for trusted domains in winbindd_ads
[kai/samba-autobuild/.git] / source / nsswitch / winbindd_ads.c
index 6b53bd96a6a0d85db468b24fecc5093062c404ec..4ce0894ab3e00b47eb3d50b5112fbdc8d1a4f9d9 100644 (file)
 
 #ifdef HAVE_ADS
 
+/* the realm of our primary LDAP server */
+static char *primary_realm;
+
+
+/*
+  a wrapper around ldap_search_s that retries depending on the error code
+  this is supposed to catch dropped connections and auto-reconnect
+*/
+int ads_do_search_retry(ADS_STRUCT *ads, const char *bind_path, int scope, 
+                       const char *exp,
+                       const char **attrs, void **res)
+{
+       int rc = -1;
+       ADS_RETURN_CODE rc2;
+       int count = 3;
+
+       if (!ads->ld &&
+           time(NULL) - ads->last_attempt < ADS_RECONNECT_TIME) {
+               return LDAP_SERVER_DOWN;
+       }
+
+       while (count--) {
+               rc = ads_do_search(ads, bind_path, scope, exp, attrs, res);
+               if (rc == 0) {
+                       DEBUG(5,("Search for %s gave %d replies\n",
+                                exp, ads_count_replies(ads, *res)));
+                       return rc;
+               }
+
+               if (*res) ads_msgfree(ads, *res);
+               *res = NULL;
+               DEBUG(1,("Reopening ads connection after error %s\n", ads_errstr(rc)));
+               if (ads->ld) {
+                       /* we should unbind here, but that seems to trigger openldap bugs :(
+                          ldap_unbind(ads->ld); 
+                       */
+               }
+               ads->ld = NULL;
+               rc2 = ads_connect(ads);
+               if (rc2.rc) {
+                   DEBUG(1,("ads_search_retry: failed to reconnect:\n"));
+                   if(rc2.error_type) 
+                       ads_display_status("", rc2.rc, rc2.minor_status);
+                   else 
+                       DEBUG(1,("LDAP error: %s\n", ads_errstr(rc2.rc)));
+                   
+                   ads_destroy(&ads);
+                   return rc2.rc;
+               }
+       }
+       DEBUG(1,("ads reopen failed after error %s\n", ads_errstr(rc)));
+       return rc;
+}
+
+
+int ads_search_retry(ADS_STRUCT *ads, void **res, 
+                    const char *exp, 
+                    const char **attrs)
+{
+       return ads_do_search_retry(ads, ads->bind_path, LDAP_SCOPE_SUBTREE,
+                                  exp, attrs, res);
+}
+
+int ads_search_retry_dn(ADS_STRUCT *ads, void **res, 
+                       const char *dn, 
+                       const char **attrs)
+{
+       return ads_do_search_retry(ads, dn, LDAP_SCOPE_BASE,
+                                  "(objectclass=*)", attrs, res);
+}
+
+/*
+  return our ads connections structure for a domain. We keep the connection
+  open to make things faster
+*/
+static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
+{
+       ADS_STRUCT *ads;
+       ADS_RETURN_CODE rc;
+       char *ccache;
+       struct in_addr server_ip;
+
+       if (domain->private) {
+               return (ADS_STRUCT *)domain->private;
+       }
+
+       /* we don't want this to affect the users ccache */
+       ccache = lock_path("winbindd_ccache");
+       SETENV("KRB5CCNAME", ccache, 1);
+       unlink(ccache);
+
+       if (!resolve_name(domain->name, &server_ip, 0x1b)) {
+               DEBUG(1,("Can't find PDC for domain %s\n", domain->name));
+               return NULL;
+       }
+
+       ads = ads_init(primary_realm, inet_ntoa(server_ip), NULL, NULL);
+       if (!ads) {
+               DEBUG(1,("ads_init for domain %s failed\n", domain->name));
+               return NULL;
+       }
+
+       /* the machine acct password might have change - fetch it every time */
+       SAFE_FREE(ads->password);
+       ads->password = secrets_fetch_machine_password();
+
+       rc = ads_connect(ads);
+       if (rc.rc) {
+               DEBUG(1,("ads_connect for domain %s failed:\n", domain->name));
+               if(rc.error_type) 
+                   ads_display_status("", rc.rc, rc.minor_status);
+               else 
+                   DEBUG(1,("LDAP error: %s\n", ads_errstr(rc.rc)));
+                   
+               ads_destroy(&ads);
+               return NULL;
+       }
+
+       /* remember our primary realm for trusted domain support */
+       if (!primary_realm) {
+               primary_realm = strdup(ads->realm);
+       }
+
+       domain->private = (void *)ads;
+       return ads;
+}
+
 /* useful utility */
 static void sid_from_rid(struct winbindd_domain *domain, uint32 rid, DOM_SID *sid)
 {
@@ -48,49 +175,41 @@ static enum SID_NAME_USE ads_atype_map(uint32 atype)
 /* Query display info for a realm. This is the basic user list fn */
 static NTSTATUS query_user_list(struct winbindd_domain *domain,
                               TALLOC_CTX *mem_ctx,
-                              uint32 *start_ndx, uint32 *num_entries, 
+                              uint32 *num_entries, 
                               WINBIND_USERINFO **info)
 {
-       ADS_STRUCT *ads;
+       ADS_STRUCT *ads = NULL;
        const char *attrs[] = {"sAMAccountName", "name", "objectSid", "primaryGroupID", 
-                              "userAccountControl", NULL};
+                              "sAMAccountType", NULL};
        int rc, i, count;
-       void *res;
-       void *msg;
-
-       DEBUG(3,("ads: query_user_list\n"));
+       void *res = NULL;
+       void *msg = NULL;
+       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 
-       if ((*start_ndx) != 0) {
-               DEBUG(1,("ads backend start_ndx not implemented\n"));
-               return NT_STATUS_NOT_IMPLEMENTED;
-       }
+       *num_entries = 0;
 
-       ads = ads_init(NULL, NULL, NULL);
-       if (!ads) {
-               DEBUG(1,("ads_init failed\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       DEBUG(3,("ads: query_user_list\n"));
 
-       rc = ads_connect(ads);
-       if (rc) {
-               DEBUG(1,("query_user_list ads_connect: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       ads = ads_cached_connection(domain);
+       if (!ads) goto done;
 
-       rc = ads_search(ads, &res, "(objectclass=user)", attrs);
+       rc = ads_search_retry(ads, &res, "(objectCategory=user)", attrs);
        if (rc) {
                DEBUG(1,("query_user_list ads_search: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        count = ads_count_replies(ads, res);
        if (count == 0) {
                DEBUG(1,("query_user_list: No users found\n"));
-               return NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        (*info) = talloc(mem_ctx, count * sizeof(**info));
-       if (!*info) return NT_STATUS_NO_MEMORY;
+       if (!*info) {
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
 
        i = 0;
 
@@ -98,11 +217,13 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
                char *name, *gecos;
                DOM_SID sid;
                uint32 rid, group;
-               uint32 account_control;
+               uint32 atype;
 
-               if (!ads_pull_uint32(ads, msg, "userAccountControl", 
-                                    &account_control) ||
-                   !(account_control & UF_NORMAL_ACCOUNT)) continue;
+               if (!ads_pull_uint32(ads, msg, "sAMAccountType", &atype) ||
+                   ads_atype_map(atype) != SID_NAME_USER) {
+                       DEBUG(1,("Not a user account? atype=0x%x\n", atype));
+                       continue;
+               }
 
                name = ads_pull_string(ads, mem_ctx, msg, "sAMAccountName");
                gecos = ads_pull_string(ads, mem_ctx, msg, "name");
@@ -128,58 +249,54 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
        }
 
        (*num_entries) = i;
+       status = NT_STATUS_OK;
 
-       ads_destroy(&ads);
+       DEBUG(3,("ads query_user_list gave %d entries\n", (*num_entries)));
 
-       return NT_STATUS_OK;
+done:
+       if (res) ads_msgfree(ads, res);
+
+       return status;
 }
 
 /* list all domain groups */
 static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
                                TALLOC_CTX *mem_ctx,
-                               uint32 *start_ndx, uint32 *num_entries, 
+                               uint32 *num_entries, 
                                struct acct_info **info)
 {
-       ADS_STRUCT *ads;
+       ADS_STRUCT *ads = NULL;
        const char *attrs[] = {"sAMAccountName", "name", "objectSid", 
                               "sAMAccountType", NULL};
        int rc, i, count;
-       void *res;
-       void *msg;
+       void *res = NULL;
+       void *msg = NULL;
+       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 
-       DEBUG(3,("ads: enum_dom_groups\n"));
+       *num_entries = 0;
 
-       if ((*start_ndx) != 0) {
-               DEBUG(1,("ads backend start_ndx not implemented\n"));
-               return NT_STATUS_NOT_IMPLEMENTED;
-       }
+       DEBUG(3,("ads: enum_dom_groups\n"));
 
-       ads = ads_init(NULL, NULL, NULL);
-       if (!ads) {
-               DEBUG(1,("ads_init failed\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       ads = ads_cached_connection(domain);
+       if (!ads) goto done;
 
-       rc = ads_connect(ads);
-       if (rc) {
-               DEBUG(1,("query_user_list ads_connect: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       rc = ads_search(ads, &res, "(objectclass=group)", attrs);
+       rc = ads_search_retry(ads, &res, "(objectCategory=group)", attrs);
        if (rc) {
                DEBUG(1,("query_user_list ads_search: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        count = ads_count_replies(ads, res);
        if (count == 0) {
                DEBUG(1,("query_user_list: No users found\n"));
-               return NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        (*info) = talloc(mem_ctx, count * sizeof(**info));
-       if (!*info) return NT_STATUS_NO_MEMORY;
+       if (!*info) {
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
 
        i = 0;
 
@@ -213,9 +330,14 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
 
        (*num_entries) = i;
 
-       ads_destroy(&ads);
+       status = NT_STATUS_OK;
 
-       return NT_STATUS_OK;
+       DEBUG(3,("ads enum_dom_groups gave %d entries\n", (*num_entries)));
+
+done:
+       if (res) ads_msgfree(ads, res);
+
+       return status;
 }
 
 
@@ -225,62 +347,61 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
                            DOM_SID *sid,
                            enum SID_NAME_USE *type)
 {
-       ADS_STRUCT *ads;
+       ADS_STRUCT *ads = NULL;
        const char *attrs[] = {"objectSid", "sAMAccountType", NULL};
        int rc, count;
-       void *res;
+       void *res = NULL;
        char *exp;
        uint32 t;
-       fstring name2, dom2;
-       
+       fstring name2, dom2, fullname2;
+       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+
        /* sigh. Need to fix interface to give us a raw name */
-       if (!parse_domain_user(name, dom2, name2))
-               return NT_STATUS_UNSUCCESSFUL;
+       fstrcpy(fullname2, name);
+       fstring_sub(fullname2, "\\", lp_winbind_separator());
+       if (!parse_domain_user(fullname2, dom2, name2)) {
+               goto done;
+       }
 
        DEBUG(3,("ads: name_to_sid\n"));
 
-       ads = ads_init(NULL, NULL, NULL);
-       if (!ads) {
-               DEBUG(1,("ads_init failed\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       rc = ads_connect(ads);
-       if (rc) {
-               DEBUG(1,("name_to_sid ads_connect: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       ads = ads_cached_connection(domain);
+       if (!ads) goto done;
 
        asprintf(&exp, "(sAMAccountName=%s)", name2);
-       rc = ads_search(ads, &res, exp, attrs);
+       rc = ads_search_retry(ads, &res, exp, attrs);
        free(exp);
        if (rc) {
                DEBUG(1,("name_to_sid ads_search: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        count = ads_count_replies(ads, res);
        if (count != 1) {
                DEBUG(1,("name_to_sid: %s not found\n", name));
-               return NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        if (!ads_pull_sid(ads, res, "objectSid", sid)) {
                DEBUG(1,("No sid for %s !?\n", name));
-               return NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        if (!ads_pull_uint32(ads, res, "sAMAccountType", &t)) {
                DEBUG(1,("No sAMAccountType for %s !?\n", name));
-               return NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        *type = ads_atype_map(t);
 
-       ads_destroy(&ads);
+       status = NT_STATUS_OK;
 
+       DEBUG(3,("ads name_to_sid mapped %s\n", name));
 
-       return NT_STATUS_OK;
+done:
+       if (res) ads_msgfree(ads, res);
+
+       return status;
 }
 
 /* convert a sid to a user or group name */
@@ -290,48 +411,47 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
                            char **name,
                            enum SID_NAME_USE *type)
 {
-       ADS_STRUCT *ads;
+       ADS_STRUCT *ads = NULL;
        const char *attrs[] = {"sAMAccountName", "sAMAccountType", NULL};
        int rc;
-       void *msg;
+       void *msg = NULL;
        char *exp;
        char *sidstr;
        uint32 atype;
        char *s;
+       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 
        DEBUG(3,("ads: sid_to_name\n"));
 
-       ads = ads_init(NULL, NULL, NULL);
-       if (!ads) {
-               DEBUG(1,("ads_init failed\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       rc = ads_connect(ads);
-       if (rc) {
-               DEBUG(1,("sid_to_name ads_connect: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       ads = ads_cached_connection(domain);
+       if (!ads) goto done;
 
-       sidstr = ads_sid_binstring(sid);
+       sidstr = sid_binstring(sid);
        asprintf(&exp, "(objectSid=%s)", sidstr);
-       rc = ads_search(ads, &msg, exp, attrs);
+       rc = ads_search_retry(ads, &msg, exp, attrs);
        free(exp);
        free(sidstr);
        if (rc) {
                DEBUG(1,("sid_to_name ads_search: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        if (!ads_pull_uint32(ads, msg, "sAMAccountType", &atype)) {
-               return NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        s = ads_pull_string(ads, mem_ctx, msg, "sAMAccountName");
        *name = talloc_asprintf(mem_ctx, "%s%s%s", domain->name, lp_winbind_separator(), s);
        *type = ads_atype_map(atype);
 
-       return NT_STATUS_OK;
+       status = NT_STATUS_OK;
+
+       DEBUG(3,("ads sid_to_name mapped %s\n", *name));
+
+done:
+       if (msg) ads_msgfree(ads, msg);
+
+       return status;
 }
 
 
@@ -341,82 +461,76 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
                           uint32 user_rid, 
                           WINBIND_USERINFO *info)
 {
-       ADS_STRUCT *ads;
-       const char *attrs[] = {"sAMAccountName", "name", "objectSid", "primaryGroupID", 
-                              "userAccountControl", NULL};
+       ADS_STRUCT *ads = NULL;
+       const char *attrs[] = {"sAMAccountName", "name", "objectSid", 
+                              "primaryGroupID", NULL};
        int rc, count;
-       void *msg;
+       void *msg = NULL;
        char *exp;
        DOM_SID sid;
        char *sidstr;
+       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 
        DEBUG(3,("ads: query_user\n"));
 
        sid_from_rid(domain, user_rid, &sid);
 
-       ads = ads_init(NULL, NULL, NULL);
-       if (!ads) {
-               DEBUG(1,("ads_init failed\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       rc = ads_connect(ads);
-       if (rc) {
-               DEBUG(1,("query_user ads_connect: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       ads = ads_cached_connection(domain);
+       if (!ads) goto done;
 
-       sidstr = ads_sid_binstring(&sid);
+       sidstr = sid_binstring(&sid);
        asprintf(&exp, "(objectSid=%s)", sidstr);
-       rc = ads_search(ads, &msg, exp, attrs);
+       rc = ads_search_retry(ads, &msg, exp, attrs);
        free(exp);
        free(sidstr);
        if (rc) {
                DEBUG(1,("query_user(rid=%d) ads_search: %s\n", user_rid, ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        count = ads_count_replies(ads, msg);
        if (count != 1) {
                DEBUG(1,("query_user(rid=%d): Not found\n", user_rid));
-               return NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        info->acct_name = ads_pull_string(ads, mem_ctx, msg, "sAMAccountName");
        info->full_name = ads_pull_string(ads, mem_ctx, msg, "name");
        if (!ads_pull_sid(ads, msg, "objectSid", &sid)) {
                DEBUG(1,("No sid for %d !?\n", user_rid));
-               goto error;
+               goto done;
        }
        if (!ads_pull_uint32(ads, msg, "primaryGroupID", &info->group_rid)) {
                DEBUG(1,("No primary group for %d !?\n", user_rid));
-               goto error;
+               goto done;
        }
        
        if (!sid_peek_rid(&sid, &info->user_rid)) {
                DEBUG(1,("No rid for %d !?\n", user_rid));
-               goto error;
+               goto done;
        }
 
-       ads_destroy(&ads);
+       status = NT_STATUS_OK;
 
-       return NT_STATUS_OK;
-error:
-       ads_destroy(&ads);
-       return NT_STATUS_UNSUCCESSFUL;
+       DEBUG(3,("ads query_user gave %s\n", info->acct_name));
+done:
+       if (msg) ads_msgfree(ads, msg);
+
+       return status;
 }
 
+
 /* Lookup groups a user is a member of. */
 static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
                                  TALLOC_CTX *mem_ctx,
                                  uint32 user_rid, 
                                  uint32 *num_groups, uint32 **user_gids)
 {
-       ADS_STRUCT *ads;
+       ADS_STRUCT *ads = NULL;
        const char *attrs[] = {"distinguishedName", NULL};
        const char *attrs2[] = {"tokenGroups", "primaryGroupID", NULL};
        int rc, count;
-       void *msg;
+       void *msg = NULL;
        char *exp;
        char *user_dn;
        DOM_SID *sids;
@@ -424,6 +538,9 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
        uint32 primary_group;
        DOM_SID sid;
        char *sidstr;
+       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+
+       *num_groups = 0;
 
        DEBUG(3,("ads: lookup_usergroups\n"));
 
@@ -431,39 +548,32 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
 
        sid_from_rid(domain, user_rid, &sid);
 
-       ads = ads_init(NULL, NULL, NULL);
-       if (!ads) {
-               DEBUG(1,("ads_init failed\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       rc = ads_connect(ads);
-       if (rc) {
-               DEBUG(1,("lookup_usergroups ads_connect: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       ads = ads_cached_connection(domain);
+       if (!ads) goto done;
 
-       sidstr = ads_sid_binstring(&sid);
+       sidstr = sid_binstring(&sid);
        asprintf(&exp, "(objectSid=%s)", sidstr);
-       rc = ads_search(ads, &msg, exp, attrs);
+       rc = ads_search_retry(ads, &msg, exp, attrs);
        free(exp);
        free(sidstr);
        if (rc) {
                DEBUG(1,("lookup_usergroups(rid=%d) ads_search: %s\n", user_rid, ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        user_dn = ads_pull_string(ads, mem_ctx, msg, "distinguishedName");
 
-       rc = ads_search_dn(ads, &msg, user_dn, attrs2);
+       if (msg) ads_msgfree(ads, msg);
+
+       rc = ads_search_retry_dn(ads, &msg, user_dn, attrs2);
        if (rc) {
                DEBUG(1,("lookup_usergroups(rid=%d) ads_search tokenGroups: %s\n", user_rid, ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        if (!ads_pull_uint32(ads, msg, "primaryGroupID", &primary_group)) {
-               DEBUG(1,("No primary group for rid=%d !?\n", user_rid));
-               return NT_STATUS_UNSUCCESSFUL;
+               DEBUG(1,("%s: No primary group for rid=%d !?\n", domain->name, user_rid));
+               goto done;
        }
 
        count = ads_pull_sids(ads, mem_ctx, msg, "tokenGroups", &sids) + 1;
@@ -477,8 +587,12 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
                (*num_groups)++;
        }
 
-       ads_destroy(&ads);
-       return NT_STATUS_OK;
+       status = NT_STATUS_OK;
+       DEBUG(3,("ads lookup_usergroups for rid=%d\n", user_rid));
+done:
+       if (msg) ads_msgfree(ads, msg);
+
+       return status;
 }
 
 
@@ -492,38 +606,33 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
        char *sidstr;
        const char *attrs[] = {"sAMAccountName", "objectSid", "sAMAccountType", NULL};
        int rc, count;
-       void *res, *msg;
-       ADS_STRUCT *ads;
+       void *res=NULL, *msg=NULL;
+       ADS_STRUCT *ads = NULL;
        char *exp;
+       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 
        *num_names = 0;
 
-       ads = ads_init(NULL, NULL, NULL);
-       if (!ads) {
-               DEBUG(1,("ads_init failed\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       rc = ads_connect(ads);
-       if (rc) {
-               DEBUG(1,("query_user_list ads_connect: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       ads = ads_cached_connection(domain);
+       if (!ads) goto done;
 
        sid_from_rid(domain, group_rid, &group_sid);
-       sidstr = ads_sid_binstring(&group_sid);
+       sidstr = sid_binstring(&group_sid);
        /* search for all users who have that group sid as primary group or as member */
-       asprintf(&exp, "(&(objectclass=user)(|(primaryGroupID=%d)(memberOf=%s)))",
+       asprintf(&exp, "(&(objectCategory=user)(|(primaryGroupID=%d)(memberOf=%s)))",
                 group_rid, sidstr);
-       rc = ads_search(ads, &res, exp, attrs);
+       rc = ads_search_retry(ads, &res, exp, attrs);
+       free(exp);
+       free(sidstr);
        if (rc) {
                DEBUG(1,("query_user_list ads_search: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        count = ads_count_replies(ads, res);
        if (count == 0) {
-               return NT_STATUS_OK;
+               status = NT_STATUS_OK;
+               goto done;
        }
 
        (*rid_mem) = talloc(mem_ctx, sizeof(uint32) * count);
@@ -551,20 +660,90 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
                (*num_names)++;
        }       
 
-       ads_destroy(&ads);
+       status = NT_STATUS_OK;
+       DEBUG(3,("ads lookup_groupmem for rid=%d\n", group_rid));
+done:
+       if (res) ads_msgfree(ads, res);
+
+       return status;
+}
+
+/* find the sequence number for a domain */
+static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq)
+{
+       ADS_STRUCT *ads = NULL;
+
+       *seq = DOM_SEQUENCE_NONE;
+
+       ads = ads_cached_connection(domain);
+       if (!ads) return NT_STATUS_UNSUCCESSFUL;
+
+       if (!ads_USN(ads, seq)) {
+               return NT_STATUS_UNSUCCESSFUL;
+       }
 
        return NT_STATUS_OK;
 }
 
+/* get a list of trusted domains */
+static NTSTATUS trusted_domains(struct winbindd_domain *domain,
+                               TALLOC_CTX *mem_ctx,
+                               uint32 *num_domains,
+                               char ***names,
+                               DOM_SID **dom_sids)
+{
+       ADS_STRUCT *ads = NULL;
+
+       *num_domains = 0;
+       *names = NULL;
+
+       ads = ads_cached_connection(domain);
+       if (!ads) return NT_STATUS_UNSUCCESSFUL;
+
+       if (!ads_trusted_domains(ads, mem_ctx, num_domains, names, dom_sids)) {
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       return NT_STATUS_OK;
+}
+
+/* find the domain sid for a domain */
+static NTSTATUS domain_sid(struct winbindd_domain *domain, DOM_SID *sid)
+{
+       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+       const char *attrs[] = {"objectSid", NULL};
+       ADS_STRUCT *ads = NULL;
+       void *res;
+       int rc;
+
+       ads = ads_cached_connection(domain);
+       if (!ads) goto done;
+
+       rc = ads_do_search(ads, ads->bind_path, LDAP_SCOPE_BASE, "(objectclass=*)", 
+                          attrs, &res);
+       if (rc) goto done;
+       if (ads_pull_sid(ads, res, "objectSid", sid)) {
+               status = NT_STATUS_OK;
+       }
+       ads_msgfree(ads, res);
+
+done:
+       return status;
+}
+
 /* the ADS backend methods are exposed via this structure */
 struct winbindd_methods ads_methods = {
+       True,
        query_user_list,
        enum_dom_groups,
        name_to_sid,
        sid_to_name,
        query_user,
        lookup_usergroups,
-       lookup_groupmem
+       lookup_groupmem,
+       sequence_number,
+       trusted_domains,
+       domain_sid
 };
 
 #endif