s3-auth Change type of num_sids to uint32_t

[samba.git] / source3 / winbindd / winbindd_util.c

diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index 735a446e0787bef502a7780c014156e0bd4c3da8..671c86827370d33c23e0daa8f0835bed6e81891b 100644 (file)
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -22,14 +22,12 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "secrets.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
 extern struct winbindd_methods cache_methods;
-extern struct winbindd_methods builtin_passdb_methods;
-extern struct winbindd_methods sam_passdb_methods;
-
 
 /**
  * @file winbindd_util.c
@@ -598,7 +596,7 @@ bool init_domain_list(void)
 
        /* BUILTIN domain */
 
-       domain = add_trusted_domain("BUILTIN", NULL, &builtin_passdb_methods,
+       domain = add_trusted_domain("BUILTIN", NULL, &cache_methods,
                                    &global_sid_Builtin);
        if (domain) {
                setup_domain_child(domain);
@@ -607,7 +605,7 @@ bool init_domain_list(void)
        /* Local SAM */
 
        domain = add_trusted_domain(get_global_sam_name(), NULL,
-                                   &sam_passdb_methods, get_global_sam_sid());
+                                   &cache_methods, get_global_sam_sid());
        if (domain) {
                if ( role != ROLE_DOMAIN_MEMBER ) {
                        domain->primary = True;
@@ -1068,11 +1066,11 @@ int winbindd_num_clients(void)
 NTSTATUS lookup_usergroups_cached(struct winbindd_domain *domain,
                                  TALLOC_CTX *mem_ctx,
                                  const struct dom_sid *user_sid,
-                                 uint32 *p_num_groups, struct dom_sid **user_sids)
+                                 uint32_t *p_num_groups, struct dom_sid **user_sids)
 {
        struct netr_SamInfo3 *info3 = NULL;
        NTSTATUS status = NT_STATUS_NO_MEMORY;
-       size_t num_groups = 0;
+       uint32_t num_groups = 0;
 
        DEBUG(3,(": lookup_usergroups_cached\n"));