util: move add_gid_to_array_unique to toplevel and add add_uid_to_array_unique.

Guenther

diff --git a/lib/util/config.mk b/lib/util/config.mk
index 1b620d1464c6a0018c8fc333e9c1ef89e639b8ba..3ae8a227800bd2ea9c1620d3e1448aa2989c6603 100644 (file)
--- a/lib/util/config.mk
+++ b/lib/util/config.mk
@@ -28,7 +28,8 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
                rbtree.o \
                talloc_stack.o \
                smb_threads.o \
-               params.o)
+               params.o \
+               util_id.o)
 
 PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
                                 dlinklist.h \

diff --git a/lib/util/util.h b/lib/util/util.h
index dab5ff93609ae8a8c3a970452d42b4719c141d24..20050d2f0a6929c19823420cdcb0c3d9399accca 100644 (file)
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -817,4 +817,16 @@ bool unmap_file(void *start, size_t size);
 
 void print_asc(int level, const uint8_t *buf,int len);
 
+/**
+ * Add an id to an array of ids.
+ *
+ * num should be a pointer to an integer that holds the current
+ * number of elements in ids. It will be updated by this function.
+ */
+
+bool add_uid_to_array_unique(TALLOC_CTX *mem_ctx, uid_t uid,
+                            uid_t **uids, size_t *num_uids);
+bool add_gid_to_array_unique(TALLOC_CTX *mem_ctx, gid_t gid,
+                            gid_t **gids, size_t *num_gids);
+
 #endif /* _SAMBA_UTIL_H_ */

diff --git a/lib/util/util_id.c b/lib/util/util_id.c
new file mode 100644 (file)
index 0000000..8744ce4
--- /dev/null
+++ b/lib/util/util_id.c
@@ -0,0 +1,88 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Helper routines for uid and gid arrays
+
+   Copyright (C) Guenther Deschner 2009
+
+   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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+
+/****************************************************************************
+ Add a gid to an array of gids if it's not already there.
+****************************************************************************/
+
+bool add_gid_to_array_unique(TALLOC_CTX *mem_ctx, gid_t gid,
+                            gid_t **gids, size_t *num_gids)
+{
+       int i;
+
+       if ((*num_gids != 0) && (*gids == NULL)) {
+               /*
+                * A former call to this routine has failed to allocate memory
+                */
+               return false;
+       }
+
+       for (i=0; i<*num_gids; i++) {
+               if ((*gids)[i] == gid) {
+                       return true;
+               }
+       }
+
+       *gids = talloc_realloc(mem_ctx, *gids, gid_t, *num_gids+1);
+       if (*gids == NULL) {
+               *num_gids = 0;
+               return false;
+       }
+
+       (*gids)[*num_gids] = gid;
+       *num_gids += 1;
+       return true;
+}
+
+/****************************************************************************
+ Add a uid to an array of uids if it's not already there.
+****************************************************************************/
+
+bool add_uid_to_array_unique(TALLOC_CTX *mem_ctx, uid_t uid,
+                            uid_t **uids, size_t *num_uids)
+{
+       int i;
+
+       if ((*num_uids != 0) && (*uids == NULL)) {
+               /*
+                * A former call to this routine has failed to allocate memory
+                */
+               return false;
+       }
+
+       for (i=0; i<*num_uids; i++) {
+               if ((*uids)[i] == uid) {
+                       return true;
+               }
+       }
+
+       *uids = talloc_realloc(mem_ctx, *uids, uid_t, *num_uids+1);
+       if (*uids == NULL) {
+               *num_uids = 0;
+               return false;
+       }
+
+       (*uids)[*num_uids] = uid;
+       *num_uids += 1;
+       return true;
+}

diff --git a/source3/Makefile.in b/source3/Makefile.in
index c7514a0b1d26280be0569f6340ccbf89911a4b31..72fce60faa0e3779c092daa767eb1bd4c12989f8 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -355,7 +355,7 @@ UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \
                   ../lib/util/genrand.o ../lib/util/util_net.o \
                   ../lib/util/become_daemon.o ../lib/util/system.o \
                   ../lib/util/tevent_unix.o ../lib/util/tevent_ntstatus.o \
-                  ../lib/util/smb_threads.o
+                  ../lib/util/smb_threads.o ../lib/util/util_id.o
 
 CRYPTO_OBJ = ../lib/crypto/crc32.o ../lib/crypto/md5.o \
                         ../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4713bd713a4bfe4f68c3288581360b0a23c4fdb1..7d297f6c32e4f954355f58abac18df3ee8b1a80c 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1088,8 +1088,6 @@ struct user_auth_info *get_cmdline_auth_info_copy(TALLOC_CTX *mem_ctx,
                                                 const struct user_auth_info *info);
 bool set_cmdline_auth_info_machine_account_creds(struct user_auth_info *auth_info);
 void set_cmdline_auth_info_getpass(struct user_auth_info *auth_info);
-bool add_gid_to_array_unique(TALLOC_CTX *mem_ctx, gid_t gid,
-                            gid_t **gids, size_t *num_gids);
 bool file_exist_stat(const char *fname,SMB_STRUCT_STAT *sbuf);
 bool socket_exist(const char *fname);
 bool directory_exist_stat(char *dname,SMB_STRUCT_STAT *st);

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 8e67edeae6b9056d7d5e9ad6d43d58a54770da54..b85f29e1362e9c8a200499aa4a6ee37bd2b2b965 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -495,39 +495,6 @@ void set_cmdline_auth_info_getpass(struct user_auth_info *auth_info)
        TALLOC_FREE(frame);
 }
 
-/****************************************************************************
- Add a gid to an array of gids if it's not already there.
-****************************************************************************/
-
-bool add_gid_to_array_unique(TALLOC_CTX *mem_ctx, gid_t gid,
-                            gid_t **gids, size_t *num_gids)
-{
-       int i;
-
-       if ((*num_gids != 0) && (*gids == NULL)) {
-               /*
-                * A former call to this routine has failed to allocate memory
-                */
-               return False;
-       }
-
-       for (i=0; i<*num_gids; i++) {
-               if ((*gids)[i] == gid) {
-                       return True;
-               }
-       }
-
-       *gids = TALLOC_REALLOC_ARRAY(mem_ctx, *gids, gid_t, *num_gids+1);
-       if (*gids == NULL) {
-               *num_gids = 0;
-               return False;
-       }
-
-       (*gids)[*num_gids] = gid;
-       *num_gids += 1;
-       return True;
-}
-
 /*******************************************************************
  Check if a file exists - call vfs_file_exist for samba files.
 ********************************************************************/

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index b4e1bd436c1ccae4e1abc7d852432c4fd82ad699..b69e41590feb219d1d6c9313f6912b944be71e87 100644 (file)
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -1330,26 +1330,6 @@ static bool pdb_default_sid_to_id(struct pdb_methods *methods,
        return ret;
 }
 
-static bool add_uid_to_array_unique(TALLOC_CTX *mem_ctx,
-                                   uid_t uid, uid_t **pp_uids, size_t *p_num)
-{
-       size_t i;
-
-       for (i=0; i<*p_num; i++) {
-               if ((*pp_uids)[i] == uid)
-                       return True;
-       }
-       
-       *pp_uids = TALLOC_REALLOC_ARRAY(mem_ctx, *pp_uids, uid_t, *p_num+1);
-
-       if (*pp_uids == NULL)
-               return False;
-
-       (*pp_uids)[*p_num] = uid;
-       *p_num += 1;
-       return True;
-}
-
 static bool get_memberuids(TALLOC_CTX *mem_ctx, gid_t gid, uid_t **pp_uids, size_t *p_num)
 {
        struct group *grp;