possibly fix the 15000 user problem
[sfrench/samba-autobuild/.git] / source3 / nsswitch / winbindd_rpc.c
index cc1d3b54570296c024505f4b70a9150bfe1e8ab5..5af42ee041bb1b5b3d8e3b37aaa5ac306f25417f 100644 (file)
@@ -1,5 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
+   Unix SMB/CIFS implementation.
 
    Winbind rpc backend functions
 
@@ -28,7 +28,7 @@
    application. */
 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)
 {
        CLI_POLICY_HND *hnd;
@@ -36,10 +36,11 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
        POLICY_HND dom_pol;
        BOOL got_dom_pol = False;
        uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
-       SAM_DISPINFO_CTR ctr;
-       SAM_DISPINFO_1 info1;
        int i;
 
+       *num_entries = 0;
+       *info = NULL;
+
        /* Get sam handle */
 
        if (!(hnd = cm_get_sam_handle(domain->name)))
@@ -55,30 +56,57 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 
        got_dom_pol = True;
 
-       ctr.sam.info1 = &info1;
-
-       /* Query display info level 1 */
-       result = cli_samr_query_dispinfo(hnd->cli, mem_ctx,
-                                       &dom_pol, start_ndx, 1,
-                                       num_entries, 0xffff, &ctr);
-
-       /* now map the result into the WINBIND_USERINFO structure */
-       (*info) = (WINBIND_USERINFO *)talloc(mem_ctx, (*num_entries)*sizeof(WINBIND_USERINFO));
-       if (!(*info)) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       for (i=0;i<*num_entries;i++) {
-               (*info)[i].acct_name = unistr2_tdup(mem_ctx, &info1.str[i].uni_acct_name);
-               (*info)[i].full_name = unistr2_tdup(mem_ctx, &info1.str[i].uni_full_name);
-               (*info)[i].user_rid = info1.sam[i].rid_user;
-               /* For the moment we set the primary group for every user to be the
-                  Domain Users group.  There are serious problems with determining
-                  the actual primary group for large domains.  This should really
-                  be made into a 'winbind force group' smb.conf parameter or
-                  something like that. */ 
-               (*info)[i].group_rid = DOMAIN_GROUP_RID_USERS;
-       }
+       i = 0;
+       do {
+               SAM_DISPINFO_CTR ctr;
+               SAM_DISPINFO_1 info1;
+               uint32 count = 0, start=i;
+               int j;
+               TALLOC_CTX *ctx2;
+
+               ctr.sam.info1 = &info1;
+
+               ctx2 = talloc_init_named("winbindd dispinfo");
+               if (!ctx2) {
+                       result = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+               
+               /* Query display info level 1 */
+               result = cli_samr_query_dispinfo(hnd->cli, ctx2,
+                                                &dom_pol, &start, 1,
+                                                &count, 0xFFFF, &ctr);
+
+               if (!NT_STATUS_IS_OK(result) && 
+                   !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)) break;
+
+               (*num_entries) += count;
+
+               /* now map the result into the WINBIND_USERINFO structure */
+               (*info) = talloc_realloc(mem_ctx, *info,
+                                        (*num_entries)*sizeof(WINBIND_USERINFO));
+               if (!(*info)) {
+                       result = NT_STATUS_NO_MEMORY;
+                       talloc_destroy(ctx2);
+                       goto done;
+               }
+
+               for (j=0;j<count;i++, j++) {
+                       (*info)[i].acct_name = unistr2_tdup(mem_ctx, &info1.str[j].uni_acct_name);
+                       (*info)[i].full_name = unistr2_tdup(mem_ctx, &info1.str[j].uni_full_name);
+                       (*info)[i].user_rid = info1.sam[j].rid_user;
+                       /* For the moment we set the primary group for
+                          every user to be the Domain Users group.
+                          There are serious problems with determining
+                          the actual primary group for large domains.
+                          This should really be made into a 'winbind
+                          force group' smb.conf parameter or
+                          something like that. */
+                       (*info)[i].group_rid = DOMAIN_GROUP_RID_USERS;
+               }
+
+               talloc_destroy(ctx2);
+       } while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
 
  done:
 
@@ -91,7 +119,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 /* 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)
 {
        uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
@@ -100,6 +128,7 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
        NTSTATUS status;
 
        *num_entries = 0;
+       *info = NULL;
 
        if (!(hnd = cm_get_sam_handle(domain->name))) {
                return NT_STATUS_UNSUCCESSFUL;
@@ -111,10 +140,36 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
                return status;
        }
 
-       status = cli_samr_enum_dom_groups(hnd->cli, mem_ctx, &dom_pol,
-                                         start_ndx,
-                                         0x8000, /* buffer size? */
-                                         info, num_entries);
+       do {
+               struct acct_info *info2 = NULL;
+               uint32 count = 0, start = *num_entries;
+               TALLOC_CTX *mem_ctx2;
+
+               mem_ctx2 = talloc_init_named("enum_dom_groups[rpc]");
+
+               status = cli_samr_enum_dom_groups(hnd->cli, mem_ctx2, &dom_pol,
+                                                 &start,
+                                                 0xFFFF, /* buffer size? */
+                                                 &info2, &count);
+
+               if (!NT_STATUS_IS_OK(status) && 
+                   !NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
+                       talloc_destroy(mem_ctx2);
+                       break;
+               }
+
+               (*info) = talloc_realloc(mem_ctx, *info, 
+                                        sizeof(**info) * ((*num_entries) + count));
+               if (! *info) {
+                       talloc_destroy(mem_ctx2);
+                       cli_samr_close(hnd->cli, mem_ctx, &dom_pol);
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               memcpy(&(*info)[*num_entries], info2, count*sizeof(*info2));
+               (*num_entries) += count;
+               talloc_destroy(mem_ctx2);
+       } while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES));
 
        cli_samr_close(hnd->cli, mem_ctx, &dom_pol);
 
@@ -133,15 +188,28 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
        DOM_SID *sids = NULL;
        uint32 *types = NULL;
        int num_sids;
+       const char *full_name;
 
-       if (!(mem_ctx = talloc_init()))
+       if (!(mem_ctx = talloc_init_named("name_to_sid[rpc] for [%s]\\[%s]", domain->name, name))) {
+               DEBUG(0, ("talloc_init failed!\n"));
                return NT_STATUS_NO_MEMORY;
+       }
         
-       if (!(hnd = cm_get_lsa_handle(domain->name)))
+       if (!(hnd = cm_get_lsa_handle(domain->name))) {
+               talloc_destroy(mem_ctx);
                return NT_STATUS_UNSUCCESSFUL;
+       }
         
-       status = cli_lsa_lookup_names(hnd->cli, mem_ctx, &hnd->pol, 1, &name, 
-                                     &sids, &types, &num_sids);
+       full_name = talloc_asprintf(mem_ctx, "%s\\%s", domain->name, name);
+       
+       if (!full_name) {
+               DEBUG(0, ("talloc_asprintf failed!\n"));
+               talloc_destroy(mem_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = cli_lsa_lookup_names(hnd->cli, mem_ctx, &hnd->pol, 1, 
+                                     &full_name, &sids, &types, &num_sids);
         
        /* Return rid and type if lookup successful */        
        if (NT_STATUS_IS_OK(status)) {
@@ -163,6 +231,7 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
                            enum SID_NAME_USE *type)
 {
        CLI_POLICY_HND *hnd;
+       char **domains;
        char **names;
        uint32 *types;
        int num_names;
@@ -172,15 +241,20 @@ static NTSTATUS sid_to_name(struct winbindd_domain *domain,
                return NT_STATUS_UNSUCCESSFUL;
         
        status = cli_lsa_lookup_sids(hnd->cli, mem_ctx, &hnd->pol,
-                                    1, sid, &names, &types, 
+                                    1, sid, &domains, &names, &types, 
                                     &num_names);
 
        if (NT_STATUS_IS_OK(status)) {
                *type = types[0];
                *name = names[0];
-               DEBUG(5,("Mapped sid to %s\n", *name));
-       }
+               DEBUG(5,("Mapped sid to [%s]\\[%s]\n", domains[0], *name));
 
+               /* Paranoia */
+               if (strcasecmp(domain->name, domains[0]) != 0) {
+                       DEBUG(1, ("domain name from domain param and PDC lookup return differ! (%s vs %s)\n", domain->name, domains[0]));
+                       return NT_STATUS_UNSUCCESSFUL;
+               }
+       }
        return status;
 }
 
@@ -218,11 +292,14 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
+       got_user_pol = True;
+
        /* Get user info */
        result = cli_samr_query_userinfo(hnd->cli, mem_ctx, &user_pol, 
                                         0x15, &ctr);
 
        cli_samr_close(hnd->cli, mem_ctx, &user_pol);
+       got_user_pol = False;
 
        user_info->group_rid = ctr->info.id21->group_rid;
        user_info->acct_name = unistr2_tdup(mem_ctx, 
@@ -255,6 +332,17 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
        DOM_GID *user_groups;
        int i;
 
+       *num_groups = 0;
+
+       /* First try cached universal groups from logon */
+       *user_gids = uni_group_cache_fetch(&domain->sid, user_rid, mem_ctx, num_groups);
+       if((*num_groups > 0) && *user_gids) {
+               return NT_STATUS_OK;
+       } else {
+           *user_gids = NULL;
+           *num_groups = 0;
+       }
+
        /* Get sam handle */
        if (!(hnd = cm_get_sam_handle(domain->name)))
                goto done;
@@ -315,6 +403,8 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
         uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
         BOOL got_dom_pol = False, got_group_pol = False;
 
+       *num_names = 0;
+
         /* Get sam handle */
 
         if (!(hnd = cm_get_sam_handle(domain->name)))
@@ -357,8 +447,8 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
 
 #define MAX_LOOKUP_RIDS 900
 
-        *names = talloc(mem_ctx, *num_names * sizeof(char *));
-        *name_types = talloc(mem_ctx, *num_names * sizeof(uint32));
+        *names = talloc_zero(mem_ctx, *num_names * sizeof(char *));
+        *name_types = talloc_zero(mem_ctx, *num_names * sizeof(uint32));
 
         for (i = 0; i < *num_names; i += MAX_LOOKUP_RIDS) {
                 int num_lookup_rids = MIN(*num_names - i, MAX_LOOKUP_RIDS);
@@ -417,7 +507,7 @@ static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq)
 
        *seq = DOM_SEQUENCE_NONE;
 
-       if (!(mem_ctx = talloc_init()))
+       if (!(mem_ctx = talloc_init_named("sequence_number[rpc]")))
                return NT_STATUS_NO_MEMORY;
 
        /* Get sam handle */
@@ -471,6 +561,8 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        uint32 enum_ctx = 0;
 
+       *num_domains = 0;
+
        if (!(hnd = cm_get_lsa_handle(lp_workgroup())))
                goto done;
 
@@ -489,7 +581,7 @@ static NTSTATUS domain_sid(struct winbindd_domain *domain, DOM_SID *sid)
        CLI_POLICY_HND *hnd;
        fstring level5_dom;
 
-       if (!(mem_ctx = talloc_init()))
+       if (!(mem_ctx = talloc_init_named("domain_sid[rpc]")))
                return NT_STATUS_NO_MEMORY;
 
        /* Get sam handle */