summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/username.c74
-rw-r--r--source3/lib/util.c2
-rw-r--r--source3/lib/util_pw.c88
3 files changed, 74 insertions, 90 deletions
diff --git a/source3/lib/username.c b/source3/lib/username.c
index 3087bac0f4..afe83acfd9 100644
--- a/source3/lib/username.c
+++ b/source3/lib/username.c
@@ -3,7 +3,8 @@
Username handling
Copyright (C) Andrew Tridgell 1992-1998
Copyright (C) Jeremy Allison 1997-2001.
-
+ 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
@@ -19,6 +20,7 @@
*/
#include "includes.h"
+#include "memcache.h"
/* internal functions */
static struct passwd *uname_string_combinations(char *s, TALLOC_CTX *mem_ctx,
@@ -28,6 +30,76 @@ static struct passwd *uname_string_combinations2(char *s, TALLOC_CTX *mem_ctx, i
struct passwd * (*fn) (TALLOC_CTX *mem_ctx, const char *),
int N);
+static struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name)
+{
+ struct passwd *pw, *for_cache;
+
+ pw = (struct passwd *)memcache_lookup_talloc(
+ NULL, GETPWNAM_CACHE, data_blob_string_const_null(name));
+ if (pw != NULL) {
+ return tcopy_passwd(mem_ctx, pw);
+ }
+
+ pw = sys_getpwnam(name);
+ if (pw == NULL) {
+ return NULL;
+ }
+
+ for_cache = tcopy_passwd(talloc_tos(), pw);
+ if (for_cache == NULL) {
+ return NULL;
+ }
+
+ memcache_add_talloc(NULL, GETPWNAM_CACHE,
+ data_blob_string_const_null(name), &for_cache);
+
+ return tcopy_passwd(mem_ctx, pw);
+}
+
+/****************************************************************************
+ talloc copy a struct passwd.
+****************************************************************************/
+
+struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, const struct passwd *from)
+{
+ struct passwd *ret = TALLOC_P(mem_ctx, struct passwd);
+ if (!ret) {
+ 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;
+}
+
+/****************************************************************************
+ Flush all cached passwd structs.
+****************************************************************************/
+
+void flush_pwnam_cache(void)
+{
+ memcache_flush(NULL, GETPWNAM_CACHE);
+}
+
+/****************************************************************************
+ talloc'ed version of getpwuid.
+****************************************************************************/
+
+struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid)
+{
+ struct passwd *temp = sys_getpwuid(uid);
+
+ if (!temp) {
+ return NULL;
+ }
+
+ return tcopy_passwd(mem_ctx, temp);
+}
+
/****************************************************************************
Get a users home directory.
****************************************************************************/
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 36d966126e..36b2e422e2 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1306,7 +1306,7 @@ uid_t nametouid(const char *name)
char *p;
uid_t u;
- pass = getpwnam_alloc(talloc_tos(), name);
+ pass = Get_Pwnam_alloc(talloc_tos(), name);
if (pass) {
u = pass->pw_uid;
TALLOC_FREE(pass);
diff --git a/source3/lib/util_pw.c b/source3/lib/util_pw.c
deleted file mode 100644
index 5ba5fde0eb..0000000000
--- a/source3/lib/util_pw.c
+++ /dev/null
@@ -1,88 +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"
-#include "memcache.h"
-
-struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx, const struct passwd *from)
-{
- struct passwd *ret = TALLOC_P(mem_ctx, struct passwd);
- if (!ret) {
- 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;
-}
-
-void flush_pwnam_cache(void)
-{
- memcache_flush(NULL, GETPWNAM_CACHE);
-}
-
-struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name)
-{
- struct passwd *pw, *for_cache;
-
- pw = (struct passwd *)memcache_lookup_talloc(
- NULL, GETPWNAM_CACHE, data_blob_string_const_null(name));
- if (pw != NULL) {
- return tcopy_passwd(mem_ctx, pw);
- }
-
- pw = sys_getpwnam(name);
- if (pw == NULL) {
- return NULL;
- }
-
- for_cache = tcopy_passwd(talloc_tos(), pw);
- if (for_cache == NULL) {
- return NULL;
- }
-
- memcache_add_talloc(NULL, GETPWNAM_CACHE,
- data_blob_string_const_null(name), &for_cache);
-
- return tcopy_passwd(mem_ctx, pw);
-}
-
-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 tcopy_passwd(mem_ctx, temp);
-}
generated by cgit (git 2.34.1) at 2024-11-23 18:41:51 +0000