This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.(This used to...
[jra/samba/.git] / source3 / nsswitch / winbindd_ads.c
index 6b53bd96a6a0d85db468b24fecc5093062c404ec..f6fc3a8d6c9cf006ab2adba91e4d94351efd55d9 100644 (file)
@@ -1,5 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
+   Unix SMB/CIFS implementation.
 
    Winbind ADS backend functions
 
 
 #ifdef HAVE_ADS
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_WINBIND
+
+/* the realm of our primary LDAP server */
+static char *primary_realm;
+
+
+/*
+  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_STATUS status;
+
+       if (domain->private) {
+               return (ADS_STRUCT *)domain->private;
+       }
+
+       /* we don't want this to affect the users ccache */
+       setenv("KRB5CCNAME", "MEMORY:winbind_ccache", 1);
+
+       ads = ads_init(domain->alt_name, domain->name, 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->auth.password);
+       ads->auth.password = secrets_fetch_machine_password();
+
+       if (primary_realm) {
+               SAFE_FREE(ads->auth.realm);
+               ads->auth.realm = strdup(primary_realm);
+       }
+
+       status = ads_connect(ads);
+       if (!ADS_ERR_OK(status) || !ads->config.realm) {
+               extern struct winbindd_methods msrpc_methods;
+               DEBUG(1,("ads_connect for domain %s failed: %s\n", 
+                        domain->name, ads_errstr(status)));
+               ads_destroy(&ads);
+
+               /* if we get ECONNREFUSED then it might be a NT4
+                   server, fall back to MSRPC */
+               if (status.error_type == ADS_ERROR_SYSTEM &&
+                   status.err.rc == ECONNREFUSED) {
+                       DEBUG(1,("Trying MSRPC methods\n"));
+                       domain->methods = &msrpc_methods;
+               }
+               return NULL;
+       }
+
+       /* remember our primary realm for trusted domain support */
+       if (!primary_realm) {
+               primary_realm = strdup(ads->config.realm);
+       }
+
+       domain->private = (void *)ads;
+       return ads;
+}
+
 /* useful utility */
 static void sid_from_rid(struct winbindd_domain *domain, uint32 rid, DOM_SID *sid)
 {
@@ -31,66 +95,48 @@ static void sid_from_rid(struct winbindd_domain *domain, uint32 rid, DOM_SID *si
        sid_append_rid(sid, rid);
 }
 
-/* turn a sAMAccountType into a SID_NAME_USE */
-static enum SID_NAME_USE ads_atype_map(uint32 atype)
-{
-       switch (atype & 0xF0000000) {
-       case ATYPE_GROUP:
-               return SID_NAME_DOM_GRP;
-       case ATYPE_USER:
-               return SID_NAME_USER;
-       default:
-               DEBUG(1,("hmm, need to map account type 0x%x\n", atype));
-       }
-       return SID_NAME_UNKNOWN;
-}
 
 /* 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;
-       const char *attrs[] = {"sAMAccountName", "name", "objectSid", "primaryGroupID", 
-                              "userAccountControl", NULL};
-       int rc, i, count;
-       void *res;
-       void *msg;
-
-       DEBUG(3,("ads: query_user_list\n"));
+       ADS_STRUCT *ads = NULL;
+       const char *attrs[] = {"userPrincipalName",
+                              "sAMAccountName",
+                              "name", "objectSid", "primaryGroupID", 
+                              "sAMAccountType", NULL};
+       int i, count;
+       ADS_STATUS rc;
+       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);
-       if (rc) {
+       rc = ads_search_retry(ads, &res, "(objectCategory=user)", attrs);
+       if (!ADS_ERR_OK(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;
+       (*info) = talloc_zero(mem_ctx, count * sizeof(**info));
+       if (!*info) {
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
 
        i = 0;
 
@@ -98,13 +144,15 @@ 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");
+               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)) {
                        DEBUG(1,("No sid for %s !?\n", name));
@@ -115,7 +163,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
                        continue;
                }
 
-               if (!sid_peek_rid(&sid, &rid)) {
+               if (!sid_peek_check_rid(&domain->sid, &sid, &rid)) {
                        DEBUG(1,("No rid for %s !?\n", name));
                        continue;
                }
@@ -128,60 +176,63 @@ 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;
-       const char *attrs[] = {"sAMAccountName", "name", "objectSid", 
+       ADS_STRUCT *ads = NULL;
+       const char *attrs[] = {"userPrincipalName", "sAMAccountName",
+                              "name", "objectSid", 
                               "sAMAccountType", NULL};
-       int rc, i, count;
-       void *res;
-       void *msg;
+       int i, count;
+       ADS_STATUS rc;
+       void *res = NULL;
+       void *msg = NULL;
+       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+       uint32 group_flags;
+
+       *num_entries = 0;
 
        DEBUG(3,("ads: enum_dom_groups\n"));
 
-       if ((*start_ndx) != 0) {
-               DEBUG(1,("ads backend start_ndx not implemented\n"));
-               return NT_STATUS_NOT_IMPLEMENTED;
-       }
+       ads = ads_cached_connection(domain);
+       if (!ads) goto done;
 
-       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;
-       }
-
-       rc = ads_search(ads, &res, "(objectclass=group)", attrs);
-       if (rc) {
-               DEBUG(1,("query_user_list ads_search: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
+       rc = ads_search_retry(ads, &res, "(objectCategory=group)", attrs);
+       if (!ADS_ERR_OK(rc)) {
+               DEBUG(1,("enum_dom_groups ads_search: %s\n", ads_errstr(rc)));
+               goto done;
        }
 
        count = ads_count_replies(ads, res);
        if (count == 0) {
-               DEBUG(1,("query_user_list: No users found\n"));
-               return NT_STATUS_UNSUCCESSFUL;
+               DEBUG(1,("enum_dom_groups: No groups found\n"));
+               goto done;
        }
 
-       (*info) = talloc(mem_ctx, count * sizeof(**info));
-       if (!*info) return NT_STATUS_NO_MEMORY;
+       (*info) = talloc_zero(mem_ctx, count * sizeof(**info));
+       if (!*info) {
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
 
        i = 0;
+       
+       group_flags = ATYPE_GLOBAL_GROUP;
+       if ( domain->native_mode )
+               group_flags |= ATYPE_LOCAL_GROUP;
 
        for (msg = ads_first_entry(ads, res); msg; msg = ads_next_entry(ads, msg)) {
                char *name, *gecos;
@@ -189,18 +240,17 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
                uint32 rid;
                uint32 account_type;
 
-               if (!ads_pull_uint32(ads, msg, "sAMAccountType", 
-                                    &account_type) ||
-                   !(account_type & ATYPE_GROUP)) continue;
-
-               name = ads_pull_string(ads, mem_ctx, msg, "sAMAccountName");
+               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)) {
                        DEBUG(1,("No sid for %s !?\n", name));
                        continue;
                }
 
-               if (!sid_peek_rid(&sid, &rid)) {
+               if (!sid_peek_check_rid(&domain->sid, &sid, &rid)) {
                        DEBUG(1,("No rid for %s !?\n", name));
                        continue;
                }
@@ -213,11 +263,36 @@ 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;
 }
 
+/* list all domain local groups */
+static NTSTATUS enum_local_groups(struct winbindd_domain *domain,
+                               TALLOC_CTX *mem_ctx,
+                               uint32 *num_entries, 
+                               struct acct_info **info)
+{
+       /*
+        * This is a stub function only as we returned the domain 
+        * ocal groups in enum_dom_groups() if the domain->native field
+        * was true.  This is a simple performance optimization when
+        * using LDAP.
+        *
+        * if we ever need to enumerate domain local groups separately, 
+        * then this the optimization in enum_dom_groups() will need 
+        * to be split out
+        */
+       *num_entries = 0;
+       
+       return NT_STATUS_OK;
+}
 
 /* convert a single name to a sid in a domain */
 static NTSTATUS name_to_sid(struct winbindd_domain *domain,
@@ -226,61 +301,14 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
                            enum SID_NAME_USE *type)
 {
        ADS_STRUCT *ads;
-       const char *attrs[] = {"objectSid", "sAMAccountType", NULL};
-       int rc, count;
-       void *res;
-       char *exp;
-       uint32 t;
-       fstring name2, dom2;
-       
-       /* sigh. Need to fix interface to give us a raw name */
-       if (!parse_domain_user(name, dom2, name2))
-               return NT_STATUS_UNSUCCESSFUL;
 
        DEBUG(3,("ads: name_to_sid\n"));
 
-       ads = ads_init(NULL, NULL, NULL);
-       if (!ads) {
-               DEBUG(1,("ads_init failed\n"));
+       ads = ads_cached_connection(domain);
+       if (!ads) 
                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;
-       }
-
-       asprintf(&exp, "(sAMAccountName=%s)", name2);
-       rc = ads_search(ads, &res, exp, attrs);
-       free(exp);
-       if (rc) {
-               DEBUG(1,("name_to_sid ads_search: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       count = ads_count_replies(ads, res);
-       if (count != 1) {
-               DEBUG(1,("name_to_sid: %s not found\n", name));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       if (!ads_pull_sid(ads, res, "objectSid", sid)) {
-               DEBUG(1,("No sid for %s !?\n", name));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       if (!ads_pull_uint32(ads, res, "sAMAccountType", &t)) {
-               DEBUG(1,("No sAMAccountType for %s !?\n", name));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       *type = ads_atype_map(t);
-
-       ads_destroy(&ads);
-
-
-       return NT_STATUS_OK;
+       return ads_name_to_sid(ads, name, sid, type);
 }
 
 /* convert a sid to a user or group name */
@@ -290,133 +318,146 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
                            char **name,
                            enum SID_NAME_USE *type)
 {
-       ADS_STRUCT *ads;
-       const char *attrs[] = {"sAMAccountName", "sAMAccountType", NULL};
-       int rc;
-       void *msg;
+       ADS_STRUCT *ads = NULL;
+       DEBUG(3,("ads: sid_to_name\n"));
+       ads = ads_cached_connection(domain);
+       if (!ads) 
+               return NT_STATUS_UNSUCCESSFUL;
+
+       return ads_sid_to_name(ads, mem_ctx, sid, name, type);
+}
+
+
+/* convert a DN to a name, rid 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, uint32 *rid)
+{
        char *exp;
-       char *sidstr;
+       void *res = NULL;
+       const char *attrs[] = {"userPrincipalName", "sAMAccountName",
+                              "objectSid", "sAMAccountType", NULL};
+       ADS_STATUS rc;
        uint32 atype;
-       char *s;
-
-       DEBUG(3,("ads: sid_to_name\n"));
+       DOM_SID sid;
+       char *escaped_dn = escape_ldap_string_alloc(dn);
 
-       ads = ads_init(NULL, NULL, NULL);
-       if (!ads) {
-               DEBUG(1,("ads_init failed\n"));
-               return NT_STATUS_UNSUCCESSFUL;
+       if (!escaped_dn) {
+               return False;
        }
 
-       rc = ads_connect(ads);
-       if (rc) {
-               DEBUG(1,("sid_to_name ads_connect: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
+       asprintf(&exp, "(distinguishedName=%s)", dn);
+       rc = ads_search_retry(ads, &res, exp, attrs);
+       SAFE_FREE(exp);
+       SAFE_FREE(escaped_dn);
+
+       if (!ADS_ERR_OK(rc)) {
+               goto failed;
        }
 
-       sidstr = ads_sid_binstring(sid);
-       asprintf(&exp, "(objectSid=%s)", sidstr);
-       rc = ads_search(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;
+       (*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_uint32(ads, msg, "sAMAccountType", &atype)) {
-               return NT_STATUS_UNSUCCESSFUL;
+       if (!ads_pull_sid(ads, res, "objectSid", &sid) || 
+           !sid_peek_rid(&sid, rid)) {
+               goto failed;
        }
 
-       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);
+       if (res) ads_msgfree(ads, res);
+       return True;
 
-       return NT_STATUS_OK;
+failed:
+       if (res) ads_msgfree(ads, res);
+       return False;
 }
 
-
 /* Lookup user information from a rid */
 static NTSTATUS query_user(struct winbindd_domain *domain, 
                           TALLOC_CTX *mem_ctx, 
                           uint32 user_rid, 
                           WINBIND_USERINFO *info)
 {
-       ADS_STRUCT *ads;
-       const char *attrs[] = {"sAMAccountName", "name", "objectSid", "primaryGroupID", 
-                              "userAccountControl", NULL};
-       int rc, count;
-       void *msg;
+       ADS_STRUCT *ads = NULL;
+       const char *attrs[] = {"userPrincipalName", 
+                              "sAMAccountName",
+                              "name", "objectSid", 
+                              "primaryGroupID", NULL};
+       ADS_STATUS rc;
+       int count;
+       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;
-       }
+       ads = ads_cached_connection(domain);
+       if (!ads) goto done;
 
-       rc = ads_connect(ads);
-       if (rc) {
-               DEBUG(1,("query_user ads_connect: %s\n", ads_errstr(rc)));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       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) {
+       if (!ADS_ERR_OK(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->acct_name = ads_pull_username(ads, mem_ctx, msg);
        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)) {
+       if (!sid_peek_check_rid(&domain->sid,&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;
+       ADS_STATUS rc;
+       int count;
+       void *msg = NULL;
        char *exp;
        char *user_dn;
        DOM_SID *sids;
@@ -424,6 +465,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,57 +475,56 @@ 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) {
+       if (!ADS_ERR_OK(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 (rc) {
+       if (msg) ads_msgfree(ads, msg);
+
+       rc = ads_search_retry_dn(ads, &msg, user_dn, attrs2);
+       if (!ADS_ERR_OK(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;
-       (*user_gids) = (uint32 *)talloc(mem_ctx, sizeof(uint32) * count);
+       (*user_gids) = (uint32 *)talloc_zero(mem_ctx, sizeof(uint32) * count);
        (*user_gids)[(*num_groups)++] = primary_group;
 
        for (i=1;i<count;i++) {
                uint32 rid;
-               if (!sid_peek_rid(&sids[i-1], &rid)) continue;
+               if (!sid_peek_check_rid(&domain->sid, &sids[i-1], &rid)) continue;
                (*user_gids)[*num_groups] = rid;
                (*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;
+}
 
+/*
+  find the members of a group, given a group rid and domain
+ */
 static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
                                TALLOC_CTX *mem_ctx,
                                uint32 group_rid, uint32 *num_names, 
@@ -489,82 +532,188 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
                                uint32 **name_types)
 {
        DOM_SID group_sid;
-       char *sidstr;
-       const char *attrs[] = {"sAMAccountName", "objectSid", "sAMAccountType", NULL};
-       int rc, count;
-       void *res, *msg;
-       ADS_STRUCT *ads;
+       ADS_STATUS rc;
+       int count;
+       void *res=NULL;
+       ADS_STRUCT *ads = NULL;
        char *exp;
+       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+       char *sidstr;
+       const char *attrs[] = {"member", NULL};
+       char **members;
+       int i, num_members;
 
        *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);
-       /* search for all users who have that group sid as primary group or as member */
-       asprintf(&exp, "(&(objectclass=user)(|(primaryGroupID=%d)(memberOf=%s)))",
-                group_rid, sidstr);
-       rc = ads_search(ads, &res, exp, attrs);
-       if (rc) {
+       sidstr = sid_binstring(&group_sid);
+
+       /* search for all members of the group */
+       asprintf(&exp, "(objectSid=%s)",sidstr);
+       rc = ads_search_retry(ads, &res, exp, attrs);
+       free(exp);
+       free(sidstr);
+
+       if (!ADS_ERR_OK(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);
-       (*name_types) = talloc(mem_ctx, sizeof(uint32) * count);
-       (*names) = talloc(mem_ctx, sizeof(char *) * count);
+       members = ads_pull_strings(ads, mem_ctx, res, "member");
+       if (!members) {
+               /* no members? ok ... */
+               status = NT_STATUS_OK;
+               goto done;
+       }
 
-       for (msg = ads_first_entry(ads, res); msg; msg = ads_next_entry(ads, msg)) {
-               uint32 atype, rid;
-               DOM_SID sid;
+       /* 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
+       */
+       for (i=0;members[i];i++) /* noop */ ;
+       num_members = i;
 
-               (*names)[*num_names] = ads_pull_string(ads, mem_ctx, msg, "sAMAccountName");
-               if (!ads_pull_uint32(ads, msg, "sAMAccountType", &atype)) {
-                       continue;
-               }
-               (*name_types)[*num_names] = ads_atype_map(atype);
-               if (!ads_pull_sid(ads, msg, "objectSid", &sid)) {
-                       DEBUG(1,("No sid for %s !?\n", (*names)[*num_names]));
-                       continue;
-               }
-               if (!sid_peek_rid(&sid, &rid)) {
-                       DEBUG(1,("No rid for %s !?\n", (*names)[*num_names]));
-                       continue;
+       (*rid_mem) = talloc_zero(mem_ctx, sizeof(uint32) * num_members);
+       (*name_types) = talloc_zero(mem_ctx, sizeof(uint32) * num_members);
+       (*names) = talloc_zero(mem_ctx, sizeof(char *) * num_members);
+
+       for (i=0;i<num_members;i++) {
+               uint32 name_type, rid;
+               char *name;
+
+               if (dn_lookup(ads, mem_ctx, members[i], &name, &name_type, &rid)) {
+                   (*names)[*num_names] = name;
+                   (*name_types)[*num_names] = name_type;
+                   (*rid_mem)[*num_names] = rid;
+                   (*num_names)++;
                }
-               (*rid_mem)[*num_names] = rid;
-               (*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 NT_STATUS_OK;
+       return status;
+}
+
+
+/* find the sequence number for a domain */
+static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq)
+{
+       ADS_STRUCT *ads = NULL;
+       ADS_STATUS rc;
+
+       *seq = DOM_SEQUENCE_NONE;
+
+       ads = ads_cached_connection(domain);
+       if (!ads) return NT_STATUS_UNSUCCESSFUL;
+
+       rc = ads_USN(ads, seq);
+       if (!ADS_ERR_OK(rc)) {
+               /* its a dead connection */
+               ads_destroy(&ads);
+               domain->private = NULL;
+       }
+       return ads_ntstatus(rc);
+}
+
+/* get a list of trusted domains */
+static NTSTATUS trusted_domains(struct winbindd_domain *domain,
+                               TALLOC_CTX *mem_ctx,
+                               uint32 *num_domains,
+                               char ***names,
+                               char ***alt_names,
+                               DOM_SID **dom_sids)
+{
+       ADS_STRUCT *ads;
+       ADS_STATUS rc;
+
+       *num_domains = 0;
+       *names = NULL;
+
+       ads = ads_cached_connection(domain);
+       if (!ads) return NT_STATUS_UNSUCCESSFUL;
+
+       rc = ads_trusted_domains(ads, mem_ctx, num_domains, names, alt_names, dom_sids);
+
+       return ads_ntstatus(rc);
+}
+
+/* find the domain sid for a domain */
+static NTSTATUS domain_sid(struct winbindd_domain *domain, DOM_SID *sid)
+{
+       ADS_STRUCT *ads;
+       ADS_STATUS rc;
+
+       ads = ads_cached_connection(domain);
+       if (!ads) return NT_STATUS_UNSUCCESSFUL;
+
+       rc = ads_domain_sid(ads, sid);
+
+       if (!ADS_ERR_OK(rc)) {
+               /* its a dead connection */
+               ads_destroy(&ads);
+               domain->private = NULL;
+       }
+
+       return ads_ntstatus(rc);
+}
+
+
+/* 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;
+       char *workgroup;
+
+       ads = ads_cached_connection(domain);
+       if (!ads) return NT_STATUS_UNSUCCESSFUL;
+
+       if (!(ctx = talloc_init("alternate_name"))) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       rc = ads_workgroup_name(ads, ctx, &workgroup);
+
+       if (ADS_ERR_OK(rc)) {
+               fstrcpy(domain->name, workgroup);
+               fstrcpy(domain->alt_name, ads->config.realm);
+               strupper(domain->alt_name);
+               strupper(domain->name);
+       }
+
+       talloc_destroy(ctx);
+
+       return ads_ntstatus(rc);        
 }
 
 /* the ADS backend methods are exposed via this structure */
 struct winbindd_methods ads_methods = {
+       True,
        query_user_list,
        enum_dom_groups,
+       enum_local_groups,
        name_to_sid,
        sid_to_name,
        query_user,
        lookup_usergroups,
-       lookup_groupmem
+       lookup_groupmem,
+       sequence_number,
+       trusted_domains,
+       domain_sid,
+       alternate_name
 };
 
 #endif