Changeset 740 for vendor/current/lib/util/util_pw.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/lib/util/util_pw.c (modified) (5 diffs)

vendor/current/lib/util/util_pw.c ¶

@@ -4 +4 @@
    Safe versions of getpw* calls
 
+   Copyright (C) Andrew Tridgell 1992-1998
+   Copyright (C) Jeremy Allison  1998-2005
    Copyright (C) Andrew Bartlett 2002
+   Copyright (C) Timur Bakeyev        2005
+   Copyright (C) Bjoern Jacke    2006-2007
+
    
    This program is free software; you can redistribute it and/or modify
@@ -21 +26 @@
 
 #include "includes.h"
+#include "system/passwd.h"
+#include "lib/util/util_pw.h"
 
-static struct passwd *alloc_copy_passwd(TALLOC_CTX *mem_ctx, 
-                                        const struct passwd *from) 
+/**************************************************************************
+ 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);
+}
+
+struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx,
+                            const struct passwd *from)
 {
         struct passwd *ret = talloc_zero(mem_ctx, struct passwd);
@@ -41 +91 @@
 }
 
-struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name) 
+struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name)
 {
         struct passwd *temp;
@@ -56 +106 @@
         }
 
-        return alloc_copy_passwd(mem_ctx, temp);
+        return tcopy_passwd(mem_ctx, temp);
 }
 
-struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid) 
+/****************************************************************************
+ talloc'ed version of getpwuid.
+****************************************************************************/
+
+struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid)
 {
         struct passwd *temp;
@@ -74 +128 @@
         }
 
-        return alloc_copy_passwd(mem_ctx, temp);
+        return tcopy_passwd(mem_ctx, temp);
 }