From 64421129b672d0ce55c5aa235e5038dd2ea1b32b Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 2 Mar 2011 16:06:32 +0100
Subject: lib/util/util_pw: share sys_get{pw,gr} group of calls.

Guenther
---
 source3/lib/system.c   | 44 --------------------------------------------
 source3/lib/username.c |  1 +
 source3/lib/util.c     |  1 +
 3 files changed, 2 insertions(+), 44 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/system.c b/source3/lib/system.c
index 092287a602..d1a1403340 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -1345,50 +1345,6 @@ int sys_setgroups(gid_t UNUSED(primary_gid), int setlen, gid_t *gidset)
 #endif
 }
 
-/**************************************************************************
- Wrappers for setpwent(), getpwent() and endpwent()
-****************************************************************************/
-
-void sys_setpwent(void)
-{
-	setpwent();
-}
-
-struct passwd *sys_getpwent(void)
-{
-	return getpwent();
-}
-
-void sys_endpwent(void)
-{
-	endpwent();
-}
-
-/**************************************************************************
- Wrappers for getpwnam(), getpwuid(), getgrnam(), getgrgid()
-****************************************************************************/
-
-
-struct passwd *sys_getpwnam(const char *name)
-{
-	return getpwnam(name);
-}
-
-struct passwd *sys_getpwuid(uid_t uid)
-{
-	return getpwuid(uid);
-}
-
-struct group *sys_getgrnam(const char *name)
-{
-	return getgrnam(name);
-}
-
-struct group *sys_getgrgid(gid_t gid)
-{
-	return getgrgid(gid);
-}
-
 /**************************************************************************
  Extract a command into an arg list.
 ****************************************************************************/
diff --git a/source3/lib/username.c b/source3/lib/username.c
index 4e77bee304..eea906128e 100644
--- a/source3/lib/username.c
+++ b/source3/lib/username.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "memcache.h"
+#include "../lib/util/util_pw.h"
 
 /* internal functions */
 static struct passwd *uname_string_combinations(char *s, TALLOC_CTX *mem_ctx,
diff --git a/source3/lib/util.c b/source3/lib/util.c
index b99d9d42a8..2690a6f649 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -25,6 +25,7 @@
 #include "popt_common.h"
 #include "secrets.h"
 #include "ctdbd_conn.h"
+#include "../lib/util/util_pw.h"
 
 /* Max allowable allococation - 256mb - 0x10000000 */
 #define MAX_ALLOC_SIZE (1024*1024*256)
-- 
cgit