aboutsummaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2005-03-26 02:05:06 +0000
committerKen Raeburn <raeburn@mit.edu>2005-03-26 02:05:06 +0000
commit74cc2af420298ff9cf4e494d89b0c5219ea26d0b (patch)
tree9d0ad32700e36e16e46be1e9ad601eb4eec757ed /src/lib
parentdff9a341d2ed286218a7be923fd4bfe99c6fe626 (diff)
downloadkrb5-74cc2af420298ff9cf4e494d89b0c5219ea26d0b.zip
krb5-74cc2af420298ff9cf4e494d89b0c5219ea26d0b.tar.gz
krb5-74cc2af420298ff9cf4e494d89b0c5219ea26d0b.tar.bz2
* kuserok.c (krb5_kuserok): Use k5_getpwnam_r
ticket: 2982 status: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17157 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/krb5/os/ChangeLog4
-rw-r--r--src/lib/krb5/os/kuserok.c14
2 files changed, 5 insertions, 13 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 1823a2f..6a60ce4 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-25 Ken Raeburn <raeburn@mit.edu>
+
+ * kuserok.c (krb5_kuserok): Use k5_getpwnam_r.
+
2005-03-22 Tom Yu <tlyu@mit.edu>
* dnsglue.h: Define ns_rr_class to ns_rr_cl if ns_rr_class doesn't
diff --git a/src/lib/krb5/os/kuserok.c b/src/lib/krb5/os/kuserok.c
index c0111b9..356b987 100644
--- a/src/lib/krb5/os/kuserok.c
+++ b/src/lib/krb5/os/kuserok.c
@@ -74,21 +74,9 @@ krb5_kuserok(krb5_context context, krb5_principal principal, const char *luser)
int gobble;
/* no account => no access */
-#ifdef HAVE_GETPWNAM_R
char pwbuf[BUFSIZ];
struct passwd pwx;
-#if !defined(GETPWNAM_R_4_ARGS)
- /* POSIX */
- if (getpwnam_r(luser, &pwx, pwbuf, sizeof(pwbuf), &pwd) != 0)
- pwd = NULL;
-#else
- /* draft POSIX */
- pwd = getpwnam_r(luser, &pwx, pwbuf, sizeof(pwbuf));
-#endif
-#else
- pwd = getpwnam(luser);
-#endif
- if (pwd == NULL)
+ if (k5_getpwnam_r(luser, &pwx, pwbuf, sizeof(pwbuf), &pwd) != 0)
return(FALSE);
(void) strncpy(pbuf, pwd->pw_dir, sizeof(pbuf) - 1);
pbuf[sizeof(pbuf) - 1] = '\0';