Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv

Conflicts:
	source4/lib/registry/ldb.c
	source4/rpc_server/winreg/rpc_winreg.c

1 files changed, 0 insertions, 77 deletions

diff --git a/source4/lib/util/util_pw.c b/source4/lib/util/util_pw.c
deleted file mode 100644
index 11e46ec4e3..0000000000
--- a/source4/lib/util/util_pw.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   Safe versions of getpw* calls
-
-   Copyright (C) Andrew Bartlett 2002
-   
-   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"
-
-static struct passwd *alloc_copy_passwd(TALLOC_CTX *mem_ctx, 
-					const struct passwd *from) 
-{
-	struct passwd *ret = talloc_zero(mem_ctx, struct passwd);
-
-	if (ret == NULL)
-		return NULL;
-
-	ret->pw_name = talloc_strdup(ret, from->pw_name);
-	ret->pw_passwd = talloc_strdup(ret, from->pw_passwd);
-	ret->pw_uid = from->pw_uid;
-	ret->pw_gid = from->pw_gid;
-	ret->pw_gecos = talloc_strdup(ret, from->pw_gecos);
-	ret->pw_dir = talloc_strdup(ret, from->pw_dir);
-	ret->pw_shell = talloc_strdup(ret, from->pw_shell);
-
-	return ret;
-}
-
-struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name) 
-{
-	struct passwd *temp;
-
-	temp = sys_getpwnam(name);
-	
-	if (!temp) {
-#if 0
-		if (errno == ENOMEM) {
-			/* what now? */
-		}
-#endif
-		return NULL;
-	}
-
-	return alloc_copy_passwd(mem_ctx, temp);
-}
-
-struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid) 
-{
-	struct passwd *temp;
-
-	temp = sys_getpwuid(uid);
-	
-	if (!temp) {
-#if 0
-		if (errno == ENOMEM) {
-			/* what now? */
-		}
-#endif
-		return NULL;
-	}
-
-	return alloc_copy_passwd(mem_ctx, temp);
-}