Put back the changes that Simo reverted and fix a speling mistak.
[tprouty/samba.git] / source / nsswitch / winbindd_ads.c
index 9420c75f58a06ddcf064661d511214e1eed1dacb..5d0f924d8f810bb92793a993219976ee361344a8 100644 (file)
@@ -1,9 +1,10 @@
 /* 
-   Unix SMB/Netbios implementation.
+   Unix SMB/CIFS implementation.
 
    Winbind ADS backend functions
 
    Copyright (C) Andrew Tridgell 2001
+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2003
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,6 +25,8 @@
 
 #ifdef HAVE_ADS
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_WINBIND
 
 /*
   return our ads connections structure for a domain. We keep the connection
 static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
 {
        ADS_STRUCT *ads;
-       int rc;
+       ADS_STATUS status;
 
        if (domain->private) {
                return (ADS_STRUCT *)domain->private;
        }
 
-       ads = ads_init(NULL, NULL, NULL);
+       /* 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;
        }
 
-       rc = ads_connect(ads);
-       if (rc) {
-               DEBUG(1,("ads_connect for domain %s failed: %s\n", domain->name, ads_errstr(rc)));
+       /* 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.realm);
+       ads->auth.realm = strdup(lp_realm());
+
+       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);
+
+               /* 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"));
+                       if (domain->methods == &cache_methods) {
+                               domain->backend = &msrpc_methods;
+                       } else {
+                               domain->methods = &msrpc_methods;
+                       }
+               }
                return NULL;
        }
 
@@ -55,54 +82,37 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
        return ads;
 }
 
-/* useful utility */
-static void sid_from_rid(struct winbindd_domain *domain, uint32 rid, DOM_SID *sid)
-{
-       sid_copy(sid, &domain->sid);
-       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 = NULL;
-       const char *attrs[] = {"sAMAccountName", "name", "objectSid", "primaryGroupID", 
-                              "userAccountControl", NULL};
-       int rc, i, count;
+       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;
 
+       *num_entries = 0;
+
        DEBUG(3,("ads: query_user_list\n"));
 
-       if ((*start_ndx) != 0) {
-               DEBUG(1,("ads backend start_ndx not implemented!\n"));
-               status = NT_STATUS_NOT_IMPLEMENTED;
+       ads = ads_cached_connection(domain);
+       
+       if (!ads) {
+               domain->last_status = NT_STATUS_SERVER_DISABLED;
                goto done;
        }
 
-       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) || !res) {
                DEBUG(1,("query_user_list ads_search: %s\n", ads_errstr(rc)));
                goto done;
        }
@@ -113,7 +123,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
                goto done;
        }
 
-       (*info) = talloc(mem_ctx, count * sizeof(**info));
+       (*info) = talloc_zero(mem_ctx, count * sizeof(**info));
        if (!*info) {
                status = NT_STATUS_NO_MEMORY;
                goto done;
@@ -124,14 +134,18 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
        for (msg = ads_first_entry(ads, res); msg; msg = ads_next_entry(ads, msg)) {
                char *name, *gecos;
                DOM_SID sid;
-               uint32 rid, group;
-               uint32 account_control;
-
-               if (!ads_pull_uint32(ads, msg, "userAccountControl", 
-                                    &account_control) ||
-                   !(account_control & UF_NORMAL_ACCOUNT)) continue;
+               DOM_SID *sid2;
+               DOM_SID *group_sid;
+               uint32 group;
+               uint32 atype;
+
+               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));
@@ -142,24 +156,31 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
                        continue;
                }
 
-               if (!sid_peek_rid(&sid, &rid)) {
-                       DEBUG(1,("No rid for %s !?\n", name));
-                       continue;
+               sid2 = talloc(mem_ctx, sizeof(*sid2));
+               if (!sid2) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto done;
                }
 
+               sid_copy(sid2, &sid);
+
+               group_sid = rid_to_talloced_sid(domain, mem_ctx, group);
+
                (*info)[i].acct_name = name;
                (*info)[i].full_name = gecos;
-               (*info)[i].user_rid = rid;
-               (*info)[i].group_rid = group;
+               (*info)[i].user_sid = sid2;
+               (*info)[i].group_sid = group_sid;
                i++;
        }
 
        (*num_entries) = i;
        status = NT_STATUS_OK;
 
+       DEBUG(3,("ads query_user_list gave %d entries\n", (*num_entries)));
+
 done:
-       if (res) ads_msgfree(ads, res);
-       if (msg) ads_msgfree(ads, msg);
+       if (res) 
+               ads_msgfree(ads, res);
 
        return status;
 }
@@ -167,47 +188,56 @@ done:
 /* 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 = NULL;
-       const char *attrs[] = {"sAMAccountName", "name", "objectSid", 
+       const char *attrs[] = {"userPrincipalName", "sAMAccountName",
+                              "name", "objectSid", 
                               "sAMAccountType", NULL};
-       int rc, i, count;
+       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"));
-               status = NT_STATUS_NOT_IMPLEMENTED;
+       ads = ads_cached_connection(domain);
+
+       if (!ads) {
+               domain->last_status = NT_STATUS_SERVER_DISABLED;
                goto done;
        }
 
-       ads = ads_cached_connection(domain);
-       if (!ads) goto done;
-
-       rc = ads_search(ads, &res, "(objectclass=group)", attrs);
-       if (rc) {
-               DEBUG(1,("query_user_list ads_search: %s\n", ads_errstr(rc)));
+       rc = ads_search_retry(ads, &res, "(objectCategory=group)", attrs);
+       if (!ADS_ERR_OK(rc) || !res) {
+               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"));
+               DEBUG(1,("enum_dom_groups: No groups found\n"));
                goto done;
        }
 
-       (*info) = talloc(mem_ctx, count * sizeof(**info));
+       (*info) = talloc_zero(mem_ctx, count * sizeof(**info));
        if (!*info) {
                status = NT_STATUS_NO_MEMORY;
                goto done;
        }
 
        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;
@@ -215,18 +245,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;
                }
@@ -241,71 +270,55 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
 
        status = NT_STATUS_OK;
 
+       DEBUG(3,("ads enum_dom_groups gave %d entries\n", (*num_entries)));
+
 done:
-       if (res) ads_msgfree(ads, res);
-       if (msg) ads_msgfree(ads, msg);
+       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 
+        * local 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,
+                           TALLOC_CTX *mem_ctx,
                            const char *name,
                            DOM_SID *sid,
                            enum SID_NAME_USE *type)
 {
-       ADS_STRUCT *ads = NULL;
-       const char *attrs[] = {"objectSid", "sAMAccountType", NULL};
-       int rc, count;
-       void *res = NULL;
-       char *exp;
-       uint32 t;
-       fstring name2, dom2;
-       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-
-       /* sigh. Need to fix interface to give us a raw name */
-       if (!parse_domain_user(name, dom2, name2)) {
-               goto done;
-       }
+       ADS_STRUCT *ads;
 
        DEBUG(3,("ads: name_to_sid\n"));
 
        ads = ads_cached_connection(domain);
-       if (!ads) goto done;
-
-       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)));
-               goto done;
-       }
-
-       count = ads_count_replies(ads, res);
-       if (count != 1) {
-               DEBUG(1,("name_to_sid: %s not found\n", name));
-               goto done;
-       }
-
-       if (!ads_pull_sid(ads, res, "objectSid", sid)) {
-               DEBUG(1,("No sid for %s !?\n", name));
-               goto done;
-       }
-
-       if (!ads_pull_uint32(ads, res, "sAMAccountType", &t)) {
-               DEBUG(1,("No sAMAccountType for %s !?\n", name));
-               goto done;
+       
+       if (!ads) {
+               domain->last_status = NT_STATUS_SERVER_DISABLED;
+               return NT_STATUS_UNSUCCESSFUL;
        }
 
-       *type = ads_atype_map(t);
-
-       status = NT_STATUS_OK;
-
-done:
-       if (res) ads_msgfree(ads, res);
-
-       return status;
+       return ads_name_to_sid(ads, name, sid, type);
 }
 
 /* convert a sid to a user or group name */
@@ -316,210 +329,391 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
                            enum SID_NAME_USE *type)
 {
        ADS_STRUCT *ads = NULL;
-       const char *attrs[] = {"sAMAccountName", "sAMAccountType", NULL};
-       int rc;
-       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_cached_connection(domain);
-       if (!ads) goto done;
+       
+       if (!ads) {
+               domain->last_status = NT_STATUS_SERVER_DISABLED;
+               return NT_STATUS_UNSUCCESSFUL;
+       }
 
-       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)));
-               goto done;
+       return ads_sid_to_name(ads, mem_ctx, sid, name, type);
+}
+
+
+/* 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)
+{
+       char *ldap_exp;
+       void *res = NULL;
+       const char *attrs[] = {"userPrincipalName", "sAMAccountName",
+                              "objectSid", "sAMAccountType", NULL};
+       ADS_STATUS rc;
+       uint32 atype;
+       char *escaped_dn = escape_ldap_string_alloc(dn);
+
+       DEBUG(3,("ads: dn_lookup\n"));
+
+       if (!escaped_dn) {
+               return False;
        }
 
-       if (!ads_pull_uint32(ads, msg, "sAMAccountType", &atype)) {
-               goto done;
+       asprintf(&ldap_exp, "(distinguishedName=%s)", escaped_dn);
+       rc = ads_search_retry(ads, &res, ldap_exp, attrs);
+       SAFE_FREE(ldap_exp);
+       SAFE_FREE(escaped_dn);
+
+       if (!ADS_ERR_OK(rc) || !res) {
+               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);
+       (*name) = ads_pull_username(ads, mem_ctx, res);
 
-       status = NT_STATUS_OK;
-done:
-       if (msg) ads_msgfree(ads, msg);
+       if (!ads_pull_uint32(ads, res, "sAMAccountType", &atype)) {
+               goto failed;
+       }
+       (*name_type) = ads_atype_map(atype);
 
-       return status;
-}
+       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;
+}
 
 /* Lookup user information from a rid */
 static NTSTATUS query_user(struct winbindd_domain *domain, 
                           TALLOC_CTX *mem_ctx, 
-                          uint32 user_rid, 
+                          DOM_SID *sid, 
                           WINBIND_USERINFO *info)
 {
        ADS_STRUCT *ads = NULL;
-       const char *attrs[] = {"sAMAccountName", "name", "objectSid", "primaryGroupID", 
-                              "userAccountControl", NULL};
-       int rc, count;
+       const char *attrs[] = {"userPrincipalName", 
+                              "sAMAccountName",
+                              "name", 
+                              "primaryGroupID", NULL};
+       ADS_STATUS rc;
+       int count;
        void *msg = NULL;
-       char *exp;
-       DOM_SID sid;
+       char *ldap_exp;
        char *sidstr;
+       uint32 group_rid;
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+       DOM_SID *sid2;
+       fstring sid_string;
 
        DEBUG(3,("ads: query_user\n"));
 
-       sid_from_rid(domain, user_rid, &sid);
-
        ads = ads_cached_connection(domain);
-       if (!ads) goto done;
+       
+       if (!ads) {
+               domain->last_status = NT_STATUS_SERVER_DISABLED;
+               goto done;
+       }
 
-       sidstr = ads_sid_binstring(&sid);
-       asprintf(&exp, "(objectSid=%s)", sidstr);
-       rc = ads_search(ads, &msg, exp, attrs);
-       free(exp);
+       sidstr = sid_binstring(sid);
+       asprintf(&ldap_exp, "(objectSid=%s)", sidstr);
+       rc = ads_search_retry(ads, &msg, ldap_exp, attrs);
+       free(ldap_exp);
        free(sidstr);
-       if (rc) {
-               DEBUG(1,("query_user(rid=%d) ads_search: %s\n", user_rid, ads_errstr(rc)));
+       if (!ADS_ERR_OK(rc) || !msg) {
+               DEBUG(1,("query_user(sid=%s) ads_search: %s\n", sid_to_string(sid_string, sid), ads_errstr(rc)));
                goto done;
        }
 
        count = ads_count_replies(ads, msg);
        if (count != 1) {
-               DEBUG(1,("query_user(rid=%d): Not found\n", user_rid));
+               DEBUG(1,("query_user(sid=%s): Not found\n", sid_to_string(sid_string, sid)));
                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));
+
+       if (!ads_pull_uint32(ads, msg, "primaryGroupID", &group_rid)) {
+               DEBUG(1,("No primary group for %s !?\n", sid_to_string(sid_string, sid)));
                goto done;
        }
-       if (!ads_pull_uint32(ads, msg, "primaryGroupID", &info->group_rid)) {
-               DEBUG(1,("No primary group for %d !?\n", user_rid));
+       
+       sid2 = talloc(mem_ctx, sizeof(*sid2));
+       if (!sid2) {
+               status = NT_STATUS_NO_MEMORY;
                goto done;
        }
+       sid_copy(sid2, sid);
        
-       if (!sid_peek_rid(&sid, &info->user_rid)) {
-               DEBUG(1,("No rid for %d !?\n", user_rid));
+       info->user_sid = sid2;
+
+       info->group_sid = rid_to_talloced_sid(domain, mem_ctx, group_rid);
+
+       status = NT_STATUS_OK;
+
+       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 - 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_gids)
+{
+       ADS_STATUS rc;
+       NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+       int count;
+       void *res = NULL;
+       void *msg = NULL;
+       char *ldap_exp;
+       ADS_STRUCT *ads;
+       const char *group_attrs[] = {"objectSid", NULL};
+
+       DEBUG(3,("ads: lookup_usergroups_alt\n"));
+
+       ads = ads_cached_connection(domain);
+
+       if (!ads) {
+               domain->last_status = NT_STATUS_SERVER_DISABLED;
                goto done;
        }
 
+       /* buggy server, no tokenGroups.  Instead lookup what groups this user
+          is a member of by DN search on member*/
+       if (asprintf(&ldap_exp, "(&(member=%s)(objectClass=group))", user_dn) == -1) {
+               DEBUG(1,("lookup_usergroups(dn=%s) asprintf failed!\n", user_dn));
+               return NT_STATUS_NO_MEMORY;
+       }
+       
+       rc = ads_search_retry(ads, &res, ldap_exp, group_attrs);
+       free(ldap_exp);
+       
+       if (!ADS_ERR_OK(rc) || !res) {
+               DEBUG(1,("lookup_usergroups ads_search member=%s: %s\n", user_dn, ads_errstr(rc)));
+               return ads_ntstatus(rc);
+       }
+       
+       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_gids) = talloc_zero(mem_ctx, sizeof(**user_gids) * (count + 1));
+       (*user_gids)[0] = primary_group;
+       
+       *num_groups = 1;
+       
+       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 (sid_equal(&group_sid, primary_group)) continue;
+               
+               (*user_gids)[*num_groups] = talloc(mem_ctx, sizeof(***user_gids));
+               if (!(*user_gids)[*num_groups]) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+
+               sid_copy((*user_gids)[*num_groups], &group_sid);
+
+               (*num_groups)++;
+                       
+       }
+
        status = NT_STATUS_OK;
 
+       DEBUG(3,("ads lookup_usergroups (alt) for dn=%s\n", user_dn));
 done:
-       if (msg) ads_msgfree(ads, msg);
+       if (res) 
+               ads_msgfree(ads, res);
+       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)
+                                 DOM_SID *sid, 
+                                 uint32 *num_groups, DOM_SID ***user_gids)
 {
        ADS_STRUCT *ads = NULL;
        const char *attrs[] = {"distinguishedName", NULL};
        const char *attrs2[] = {"tokenGroups", "primaryGroupID", NULL};
-       int rc, count;
+       ADS_STATUS rc;
+       int count;
        void *msg = NULL;
-       char *exp;
+       char *ldap_exp;
        char *user_dn;
        DOM_SID *sids;
        int i;
-       uint32 primary_group;
-       DOM_SID sid;
+       DOM_SID *primary_group;
+       uint32 primary_group_rid;
        char *sidstr;
+       fstring sid_string;
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 
        DEBUG(3,("ads: lookup_usergroups\n"));
-
-       (*num_groups) = 0;
-
-       sid_from_rid(domain, user_rid, &sid);
+       *num_groups = 0;
 
        ads = ads_cached_connection(domain);
-       if (!ads) goto done;
+       
+       if (!ads) {
+               domain->last_status = NT_STATUS_SERVER_DISABLED;
+               goto done;
+       }
 
-       sidstr = ads_sid_binstring(&sid);
-       asprintf(&exp, "(objectSid=%s)", sidstr);
-       rc = ads_search(ads, &msg, exp, attrs);
-       free(exp);
+       if (!(sidstr = sid_binstring(sid))) {
+               DEBUG(1,("lookup_usergroups(sid=%s) sid_binstring returned NULL\n", sid_to_string(sid_string, sid)));
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
+       if (asprintf(&ldap_exp, "(objectSid=%s)", sidstr) == -1) {
+               free(sidstr);
+               DEBUG(1,("lookup_usergroups(sid=%s) asprintf failed!\n", sid_to_string(sid_string, sid)));
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
+
+       rc = ads_search_retry(ads, &msg, ldap_exp, attrs);
+       free(ldap_exp);
        free(sidstr);
-       if (rc) {
-               DEBUG(1,("lookup_usergroups(rid=%d) ads_search: %s\n", user_rid, ads_errstr(rc)));
+
+       if (!ADS_ERR_OK(rc) || !msg) {
+               DEBUG(1,("lookup_usergroups(sid=%s) ads_search: %s\n", sid_to_string(sid_string, sid), ads_errstr(rc)));
                goto done;
        }
 
        user_dn = ads_pull_string(ads, mem_ctx, msg, "distinguishedName");
+       if (!user_dn) {
+               DEBUG(1,("lookup_usergroups(sid=%s) ads_search did not return a a distinguishedName!\n", sid_to_string(sid_string, sid)));
+               if (msg) 
+                       ads_msgfree(ads, msg);
+               goto done;
+       }
 
-       rc = ads_search_dn(ads, &msg, user_dn, attrs2);
-       if (rc) {
-               DEBUG(1,("lookup_usergroups(rid=%d) ads_search tokenGroups: %s\n", user_rid, ads_errstr(rc)));
+       if (msg) 
+               ads_msgfree(ads, msg);
+
+       rc = ads_search_retry_dn(ads, &msg, user_dn, attrs2);
+       if (!ADS_ERR_OK(rc) || !msg) {
+               DEBUG(1,("lookup_usergroups(sid=%s) ads_search tokenGroups: %s\n", sid_to_string(sid_string, sid), ads_errstr(rc)));
                goto done;
        }
 
-       if (!ads_pull_uint32(ads, msg, "primaryGroupID", &primary_group)) {
-               DEBUG(1,("No primary group for rid=%d !?\n", user_rid));
+       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)));
                goto done;
        }
 
-       count = ads_pull_sids(ads, mem_ctx, msg, "tokenGroups", &sids) + 1;
-       (*user_gids) = (uint32 *)talloc(mem_ctx, sizeof(uint32) * count);
-       (*user_gids)[(*num_groups)++] = primary_group;
+       primary_group = rid_to_talloced_sid(domain, mem_ctx, primary_group_rid);
 
-       for (i=1;i<count;i++) {
-               uint32 rid;
-               if (!sid_peek_rid(&sids[i-1], &rid)) continue;
-               (*user_gids)[*num_groups] = rid;
+       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 */
+       if (count == 0) {
+               return lookup_usergroups_alt(domain, mem_ctx, user_dn, 
+                                            primary_group,
+                                            num_groups, user_gids);
+       }
+
+       (*user_gids) = talloc_zero(mem_ctx, sizeof(**user_gids) * (count + 1));
+       (*user_gids)[0] = primary_group;
+       
+       *num_groups = 1;
+       
+       for (i=0;i<count;i++) {
+               if (sid_equal(&sids[i], primary_group)) continue;
+               
+               (*user_gids)[*num_groups] = talloc(mem_ctx, sizeof(***user_gids));
+               if (!(*user_gids)[*num_groups]) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+
+               sid_copy((*user_gids)[*num_groups], &sids[i]);
                (*num_groups)++;
        }
 
        status = NT_STATUS_OK;
+       DEBUG(3,("ads lookup_usergroups for sid=%s\n", sid_to_string(sid_string, sid)));
 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, 
-                               uint32 **rid_mem, char ***names, 
+                               DOM_SID *group_sid, uint32 *num_names, 
+                               DOM_SID ***sid_mem, char ***names, 
                                uint32 **name_types)
 {
-       DOM_SID group_sid;
-       char *sidstr;
-       const char *attrs[] = {"sAMAccountName", "objectSid", "sAMAccountType", NULL};
-       int rc, count;
-       void *res=NULL, *msg=NULL;
+       ADS_STATUS rc;
+       int count;
+       void *res=NULL;
        ADS_STRUCT *ads = NULL;
-       char *exp;
+       char *ldap_exp;
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+       char *sidstr;
+       const char *attrs[] = {"member", NULL};
+       char **members;
+       int i, num_members;
+       fstring sid_string;
+
+       DEBUG(10,("ads: lookup_groupmem %s sid=%s\n", domain->name, sid_string_static(group_sid)));
 
        *num_names = 0;
 
        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);
-       free(exp);
+       
+       if (!ads) {
+               domain->last_status = NT_STATUS_SERVER_DISABLED;
+               goto done;
+       }
+
+       sidstr = sid_binstring(group_sid);
+
+       /* search for all members of the group */
+       asprintf(&ldap_exp, "(objectSid=%s)",sidstr);
+       rc = ads_search_retry(ads, &res, ldap_exp, attrs);
+       free(ldap_exp);
        free(sidstr);
-       if (rc) {
+
+       if (!ADS_ERR_OK(rc) || !res) {
                DEBUG(1,("query_user_list ads_search: %s\n", ads_errstr(rc)));
                goto done;
        }
@@ -530,48 +724,259 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
                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;
+       /* 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;
+
+       (*sid_mem) = talloc_zero(mem_ctx, sizeof(**sid_mem) * num_members);
+       (*name_types) = talloc_zero(mem_ctx, sizeof(**name_types) * num_members);
+       (*names) = talloc_zero(mem_ctx, sizeof(**names) * num_members);
+
+       for (i=0;i<num_members;i++) {
+               uint32 name_type;
+               char *name;
                DOM_SID sid;
 
-               (*names)[*num_names] = ads_pull_string(ads, mem_ctx, msg, "sAMAccountName");
-               if (!ads_pull_uint32(ads, msg, "sAMAccountType", &atype)) {
-                       continue;
+               if (dn_lookup(ads, mem_ctx, members[i], &name, &name_type, &sid)) {
+                   (*names)[*num_names] = name;
+                   (*name_types)[*num_names] = name_type;
+                   (*sid_mem)[*num_names] = talloc(mem_ctx, sizeof(***sid_mem));
+                   if (!(*sid_mem)[*num_names]) {
+                           status = NT_STATUS_NO_MEMORY;
+                           goto done;
+                   }
+                   sid_copy((*sid_mem)[*num_names], &sid);
+                   (*num_names)++;
                }
-               (*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)[*num_names] = rid;
-               (*num_names)++;
        }       
 
        status = NT_STATUS_OK;
+       DEBUG(3,("ads lookup_groupmem for sid=%s\n", sid_to_string(sid_string, group_sid)));
 done:
-       if (msg) ads_msgfree(ads, msg);
-       if (res) ads_msgfree(ads, res);
+       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;
+       ADS_STATUS rc;
+
+       DEBUG(3,("ads: fetch sequence_number for %s\n", domain->name));
+
+       *seq = DOM_SEQUENCE_NONE;
+
+       ads = ads_cached_connection(domain);
+       
+       if (!ads) {
+               domain->last_status = NT_STATUS_SERVER_DISABLED;
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       rc = ads_USN(ads, 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;
+       }
+       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)
+{
+       NTSTATUS                result = NT_STATUS_UNSUCCESSFUL;
+       DS_DOMAIN_TRUSTS        *domains = NULL;
+       int                     count = 0;
+       int                     i;
+       struct cli_state        *cli = NULL;
+                               /* i think we only need our forest and downlevel trusted domains */
+       uint32                  flags = DS_DOMAIN_IN_FOREST | DS_DOMAIN_DIRECT_OUTBOUND;
+       char                    *contact_domain_name;
+
+       DEBUG(3,("ads: trusted_domains\n"));
+
+       *num_domains = 0;
+       *alt_names   = NULL;
+       *names       = NULL;
+       *dom_sids    = NULL;
+               
+       contact_domain_name = *domain->alt_name ? domain->alt_name : domain->name;
+       if ( !NT_STATUS_IS_OK(result = cm_fresh_connection(contact_domain_name, PI_NETLOGON, &cli)) ) {
+               DEBUG(5, ("trusted_domains: Could not open a connection to %s for PIPE_NETLOGON (%s)\n", 
+                         contact_domain_name, nt_errstr(result)));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+       
+       if ( NT_STATUS_IS_OK(result) )
+               result = cli_ds_enum_domain_trusts( cli, mem_ctx, cli->desthost, flags, &domains, (unsigned int *)&count );
+       
+       if ( NT_STATUS_IS_OK(result) && count) {
+       
+               /* Allocate memory for trusted domain names and sids */
+
+               if ( !(*names = (char **)talloc(mem_ctx, sizeof(char *) * count)) ) {
+                       DEBUG(0, ("trusted_domains: out of memory\n"));
+                       result = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+
+               if ( !(*alt_names = (char **)talloc(mem_ctx, sizeof(char *) * count)) ) {
+                       DEBUG(0, ("trusted_domains: out of memory\n"));
+                       result = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+
+               if ( !(*dom_sids = (DOM_SID *)talloc(mem_ctx, sizeof(DOM_SID) * count)) ) {
+                       DEBUG(0, ("trusted_domains: out of memory\n"));
+                       result = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+
+               /* Copy across names and sids */
+
+               for (i = 0; i < count; i++) {
+                       fstring tmp;
+                       fstring tmp2;
+
+                       (*names)[i] = NULL;
+                       (*alt_names)[i] = NULL;
+                       ZERO_STRUCT( (*dom_sids)[i] );
+
+                       if ( domains[i].netbios_ptr ) {
+                               unistr2_to_ascii(tmp, &domains[i].netbios_domain, sizeof(tmp) - 1);
+                               (*names)[i] = talloc_strdup(mem_ctx, tmp);
+                       }
+                       
+                       if ( domains[i].dns_ptr ) {
+                               unistr2_to_ascii(tmp2, &domains[i].dns_domain, sizeof(tmp2) - 1);
+                               (*alt_names)[i] = talloc_strdup(mem_ctx, tmp2);
+                       }
+                       
+                       /* sometimes we will get back a NULL SID from this call */
+                       
+                       if ( domains[i].sid_ptr )
+                               sid_copy(&(*dom_sids)[i], &domains[i].sid.sid);
+               }
+
+               *num_domains = count;   
+       }
+
+done:
+
+       SAFE_FREE( domains );
+       
+       /* remove connection;  This is a special case to the \NETLOGON pipe */
+       
+       if ( cli )
+               cli_shutdown( cli );
+
+       return result;
+}
+
+/* find the domain sid for a domain */
+static NTSTATUS domain_sid(struct winbindd_domain *domain, DOM_SID *sid)
+{
+       ADS_STRUCT *ads;
+       ADS_STATUS rc;
+
+       DEBUG(3,("ads: domain_sid\n"));
+
+       ads = ads_cached_connection(domain);
+
+       if (!ads) {
+               domain->last_status = NT_STATUS_SERVER_DISABLED;
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       rc = ads_domain_sid(ads, sid);
+
+       if (!ADS_ERR_OK(rc)) {
+       
+               /* its a dead connection; don't destroy it though
+                  since that has already been done indirectly 
+                  by ads_domain_sid() */
+
+               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;
+
+       DEBUG(3,("ads: alternate_name\n"));
+
+       ads = ads_cached_connection(domain);
+       
+       if (!ads) {
+               domain->last_status = NT_STATUS_SERVER_DISABLED;
+               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_m(domain->alt_name);
+               strupper_m(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