Changeset 745 for trunk/server/source3/lib/system_smbd.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/system_smbd.c (modified) (3 diffs)

trunk/server/source3/lib/system_smbd.c

@@ -25 +25 @@
 
 #include "includes.h"
+#include "system/passwd.h"
+#include "nsswitch/winbind_client.h"
 
 #ifndef HAVE_GETGROUPLIST
@@ -120 +122 @@
         }
 
-        if (initgroups(user, gid) != 0) {
+        if (initgroups(user, gid) == -1) {
                 DEBUG(0, ("getgrouplist_internals: initgroups() failed!\n"));
                 SAFE_FREE(gids_saved);
@@ -206 +208 @@
 bool getgroups_unix_user(TALLOC_CTX *mem_ctx, const char *user,
                          gid_t primary_gid,
-                         gid_t **ret_groups, size_t *p_ngroups)
-{
-        size_t ngrp;
+                         gid_t **ret_groups, uint32_t *p_ngroups)
+{
+        uint32_t ngrp;
         int max_grp;
         gid_t *temp_groups;