? heimdal.diff
? o
Index: configure.ac
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/heimdal/dist/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure.ac	28 Jan 2017 21:31:43 -0000	1.2
+++ configure.ac	8 Sep 2017 15:29:43 -0000	1.3
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.2 $)
+AC_REVISION($Revision: 1.3 $)
 AC_PREREQ(2.62)
 test -z "$CFLAGS" && CFLAGS="-g"
 AC_INIT([Heimdal],[7.99.1],[https://github.com/heimdal/heimdal/issues])
@@ -514,6 +514,7 @@
 rk_DLADDR
 
 AC_CHECK_GETPWNAM_R_POSIX
+AC_CHECK_GETPWUID_R_POSIX
 
 dnl detect doors on solaris
 if test "$enable_pthread_support" != no; then
Index: cf/check-getpwuid_r-posix.m4
===================================================================
RCS file: cf/check-getpwuid_r-posix.m4
diff -N cf/check-getpwuid_r-posix.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ cf/check-getpwuid_r-posix.m4	8 Sep 2017 15:29:43 -0000	1.1
@@ -0,0 +1,40 @@
+dnl Id
+dnl
+dnl check for getpwuid_r, and if it's posix or not
+
+AC_DEFUN([AC_CHECK_GETPWUID_R_POSIX],[
+AC_FIND_FUNC_NO_LIBS(getpwuid_r,c_r)
+if test "$ac_cv_func_getpwuid_r" = yes; then
+	AC_CACHE_CHECK(if getpwuid_r is posix,ac_cv_func_getpwuid_r_posix,
+	ac_libs="$LIBS"
+	LIBS="$LIBS $LIB_getpwuid_r"
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#define _POSIX_PTHREAD_SEMANTICS
+#include <pwd.h>
+int main(int argc, char **argv)
+{
+	struct passwd pw, *pwd;
+	return getpwuid_r(0, &pw, 0, 0, &pwd) < 0;
+}
+]])],[ac_cv_func_getpwuid_r_posix=yes],[ac_cv_func_getpwuid_r_posix=no],[:])
+LIBS="$ac_libs")
+	AC_CACHE_CHECK(if _POSIX_PTHREAD_SEMANTICS is needed,ac_cv_func_getpwuid_r_posix_def,
+	ac_libs="$LIBS"
+	LIBS="$LIBS $LIB_getpwuid_r"
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <pwd.h>
+int main(int argc, char **argv)
+{
+	struct passwd pw, *pwd;
+	return getpwuid_r(0, &pw, 0, 0, &pwd) < 0;
+}
+]])],[ac_cv_func_getpwuid_r_posix_def=no],[ac_cv_func_getpwuid_r_posix_def=yes],[:])
+LIBS="$ac_libs")
+if test "$ac_cv_func_getpwuid_r_posix" = yes; then
+	AC_DEFINE(POSIX_GETPWUID_R, 1, [Define if getpwuid_r has POSIX flavour.])
+fi
+if test "$ac_cv_func_getpwuid_r_posix" = yes -a "$ac_cv_func_getpwuid_r_posix_def" = yes; then
+	AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Define to get POSIX getpwuid_r in some systems.])
+fi
+fi
+])
Index: kcm/client.c
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/heimdal/dist/kcm/client.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kcm/client.c	28 Jan 2017 21:31:44 -0000	1.2
+++ kcm/client.c	8 Sep 2017 15:29:43 -0000	1.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: client.c,v 1.2 2017/01/28 21:31:44 christos Exp $	*/
+/*	$NetBSD: client.c,v 1.3 2017/09/08 15:29:43 christos Exp $	*/
 
 /*
  * Copyright (c) 2005, PADL Software Pty Ltd.
@@ -174,8 +174,10 @@
 	if (matches == 0)
 	    matches = sscanf(name,"%ld",&uid);
 	if (matches == 1) {
-	    struct passwd *pwd = getpwuid(uid);
-	    if (pwd != NULL) {
+	    struct passwd pw, *pwd = NULL;
+	    char pwbuf[2048];
+
+	    if (rk_getpwuid_r(getuid(), &pw, pwbuf, sizeof(pwbuf), &pwd) == 0) {
 		gid_t gid = pwd->pw_gid;
 		kcm_chown(context, client, ccache, uid, gid);
 	    }
Index: kcm/config.c
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/heimdal/dist/kcm/config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kcm/config.c	28 Jan 2017 21:31:44 -0000	1.2
+++ kcm/config.c	8 Sep 2017 15:29:43 -0000	1.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: config.c,v 1.2 2017/01/28 21:31:44 christos Exp $	*/
+/*	$NetBSD: config.c,v 1.3 2017/09/08 15:29:43 christos Exp $	*/
 
 /*
  * Copyright (c) 2005, PADL Software Pty Ltd.
@@ -159,28 +159,33 @@
 {
     uid_t uid = 0;
     gid_t gid = 0;
-    struct passwd *pw;
     struct group *gr;
     int uid_p = 0;
     int gid_p = 0;
+    struct passwd pw, *pwd = NULL;
+    char pwbuf[2048];
 
     if (system_user != NULL) {
 	if (isdigit((unsigned char)system_user[0])) {
-	    pw = getpwuid(atoi(system_user));
+	    if (rk_getpwuid_r(atoi(system_user), &pw, pwbuf, sizeof(pwbuf),
+		&pwd) != 0)
+		    pwd = NULL;
 	} else {
-	    pw = getpwnam(system_user);
+	    if (rk_getpwnam_r(system_user, &pw, pwbuf, sizeof(pwbuf),
+		&pwd) != 0)
+		    pwd = NULL;
 	}
-	if (pw == NULL) {
+	if (pwd == NULL) {
 	    return errno;
 	}
 
-	system_user = strdup(pw->pw_name);
+	system_user = strdup(pwd->pw_name);
 	if (system_user == NULL) {
 	    return ENOMEM;
 	}
 
-	uid = pw->pw_uid; uid_p = 1;
-	gid = pw->pw_gid; gid_p = 1;
+	uid = pwd->pw_uid; uid_p = 1;
+	gid = pwd->pw_gid; gid_p = 1;
     }
 
     if (system_group != NULL) {
Index: lib/gssapi/mech/gss_pname_to_uid.c
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lib/gssapi/mech/gss_pname_to_uid.c	28 Jan 2017 21:31:46 -0000	1.2
+++ lib/gssapi/mech/gss_pname_to_uid.c	8 Sep 2017 14:57:44 -0000	1.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: gss_pname_to_uid.c,v 1.2 2017/01/28 21:31:46 christos Exp $	*/
+/*	$NetBSD: gss_pname_to_uid.c,v 1.3 2017/09/08 14:57:44 christos Exp $	*/
 
 /*
  * Copyright (c) 2011, PADL Software Pty Ltd.
@@ -150,12 +150,8 @@
     OM_uint32 major, tmpMinor;
     gss_buffer_desc localname = GSS_C_EMPTY_BUFFER;
     char *szLocalname;
-#ifdef POSIX_GETPWNAM_R
     char pwbuf[2048];
     struct passwd pw, *pwd;
-#else
-    struct passwd *pwd;
-#endif
 
     major = gss_localname(minor_status, pname, mech_type, &localname);
     if (GSS_ERROR(major))
@@ -171,12 +167,8 @@
     memcpy(szLocalname, localname.value, localname.length);
     szLocalname[localname.length] = '\0';
 
-#ifdef POSIX_GETPWNAM_R
-    if (getpwnam_r(szLocalname, &pw, pwbuf, sizeof(pwbuf), &pwd) != 0)
+    if (rk_getpwnam_r(szLocalname, &pw, pwbuf, sizeof(pwbuf), &pwd) != 0)
         pwd = NULL;
-#else
-    pwd = getpwnam(szLocalname);
-#endif
 
     gss_release_buffer(&tmpMinor, &localname);
     free(szLocalname);
Index: lib/hx509/softp11.c
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lib/hx509/softp11.c	28 Jan 2017 21:31:48 -0000	1.2
+++ lib/hx509/softp11.c	8 Sep 2017 15:29:43 -0000	1.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: softp11.c,v 1.2 2017/01/28 21:31:48 christos Exp $	*/
+/*	$NetBSD: softp11.c,v 1.3 2017/09/08 15:29:43 christos Exp $	*/
 
 /*
  * Copyright (c) 2004 - 2008 Kungliga Tekniska Högskolan
@@ -833,9 +833,11 @@
         home = getenv("HOME");
     }
     if (fn == NULL && home == NULL) {
-        struct passwd *pw = getpwuid(getuid());
-        if(pw != NULL)
-            home = pw->pw_dir;
+	struct passwd pw, *pwd = NULL;
+	char pwbuf[2048];
+
+	if (rk_getpwuid_r(getuid(), &pw, pwbuf, sizeof(pwbuf), &pwd) == 0)
+            home = pwd->pw_dir;
     }
     if (fn == NULL) {
         if (home) {
Index: lib/krb5/config_file.c
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lib/krb5/config_file.c	28 Jan 2017 21:31:49 -0000	1.2
+++ lib/krb5/config_file.c	8 Sep 2017 15:29:43 -0000	1.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: config_file.c,v 1.2 2017/01/28 21:31:49 christos Exp $	*/
+/*	$NetBSD: config_file.c,v 1.3 2017/09/08 15:29:43 christos Exp $	*/
 
 /*
  * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan
@@ -441,9 +441,11 @@
 	    home = getenv("HOME");
 
 	if (home == NULL) {
-	    struct passwd *pw = getpwuid(getuid());
-	    if(pw != NULL)
-		home = pw->pw_dir;
+	    struct passwd pw, *pwd = NULL;
+	    char pwbuf[2048];
+
+	    if (rk_getpwuid_r(getuid(), &pw, pwbuf, sizeof(pwbuf), &pwd) == 0)
+		home = pwd->pw_dir;
 	}
 	if (home) {
 	    int aret;
Index: lib/krb5/get_default_principal.c
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lib/krb5/get_default_principal.c	28 Jan 2017 21:31:49 -0000	1.2
+++ lib/krb5/get_default_principal.c	8 Sep 2017 15:29:43 -0000	1.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: get_default_principal.c,v 1.2 2017/01/28 21:31:49 christos Exp $	*/
+/*	$NetBSD: get_default_principal.c,v 1.3 2017/09/08 15:29:43 christos Exp $	*/
 
 /*
  * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
@@ -78,9 +78,11 @@
 	else
 	    ret = krb5_make_principal(context, princ, NULL, "root", NULL);
     } else {
-	struct passwd *pw = getpwuid(uid);
-	if(pw != NULL)
-	    user = pw->pw_name;
+	struct passwd pw, *pwd = NULL;
+	char pwbuf[2048];
+
+	if (rk_getpwuid_r(uid, &pw, pwbuf, sizeof(pwbuf), &pwd) == 0)
+	    user = pwd->pw_name;
 	else {
 	    user = get_env_user();
 	    if(user == NULL)
Index: lib/krb5/kuserok.c
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lib/krb5/kuserok.c	28 Jan 2017 21:31:49 -0000	1.2
+++ lib/krb5/kuserok.c	8 Sep 2017 14:52:50 -0000	1.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: kuserok.c,v 1.2 2017/01/28 21:31:49 christos Exp $	*/
+/*	$NetBSD: kuserok.c,v 1.3 2017/09/08 14:52:50 christos Exp $	*/
 
 /*
  * Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan
@@ -625,7 +625,7 @@
 	if (!_krb5_homedir_access(context))
 	    return KRB5_PLUGIN_NO_HANDLE;
 
-	if (getpwnam_r(luser, &pw, pwbuf, sizeof(pwbuf), &pwd) != 0) {
+	if (rk_getpwnam_r(luser, &pw, pwbuf, sizeof(pwbuf), &pwd) != 0) {
 	    krb5_set_error_message(context, errno, "User unknown (getpwnam_r())");
 	    return KRB5_PLUGIN_NO_HANDLE;
 	}
Index: lib/roken/getxxyyy.c
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lib/roken/getxxyyy.c	28 Jan 2017 21:31:50 -0000	1.2
+++ lib/roken/getxxyyy.c	8 Sep 2017 15:29:43 -0000	1.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: getxxyyy.c,v 1.2 2017/01/28 21:31:50 christos Exp $	*/
+/*	$NetBSD: getxxyyy.c,v 1.3 2017/09/08 15:29:43 christos Exp $	*/
 
 /*
  * Copyright (c) 2011 Kungliga Tekniska Högskolan
@@ -39,30 +39,18 @@
 
 #ifdef TEST_GETXXYYY
 #undef rk_getpwnam_r
+#undef rk_getpwuid_r
 
 ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
 rk_getpwnam_r(const char *, struct passwd *, char *, size_t, struct passwd **);
+ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
+rk_getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **);
 #endif
 
-#if !defined(POSIX_GETPWNAM_R) || defined(TEST_GETXXYYY)
-
-/*
- * At least limit the race between threads
- */
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-rk_getpwnam_r(const char *name, struct passwd *pwd, char *buffer,
-	      size_t bufsize, struct passwd **result)
+#if !defined(POSIX_GETPWUID_R) || !defined(POSIX_GETPWNAM_R) || defined(TEST_GETXXYYY)
+static void
+copypw(struct passwd *pwd, char *buffer, size_t bufsize, const struct passwd *p)
 {
-     struct passwd *p;
-     size_t slen, n = 0;
-     
-     *result = NULL;
-
-     p = getpwnam(name);
-     if(p == NULL)
-	 return (errno = ENOENT);
-	 
      memset(pwd, 0, sizeof(*pwd));
 
 #define APPEND(el)					\
@@ -83,6 +71,53 @@
      APPEND(pw_gecos);
      APPEND(pw_dir);
      APPEND(pw_shell);
+}
+
+#if !defined(POSIX_GETPWUID_R) || defined(TEST_GETXXYYY)
+/*
+ * At least limit the race between threads
+ */
+
+ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
+rk_getpwnam_r(const char *name, struct passwd *pwd, char *buffer,
+	      size_t bufsize, struct passwd **result)
+{
+     struct passwd *p;
+     size_t slen, n = 0;
+     
+     *result = NULL;
+
+     p = getpwnam(name);
+     if(p == NULL)
+	 return (errno = ENOENT);
+	 
+     copypw(pwd, buffer, bufsize, p);
+
+     *result = pwd;
+
+     return 0;
+}
+
+#if !defined(POSIX_GETPWNAM_R) || defined(TEST_GETXXYYY)
+
+/*
+ * At least limit the race between threads
+ */
+
+ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
+rk_getpwnam_r(const char *name, struct passwd *pwd, char *buffer,
+	      size_t bufsize, struct passwd **result)
+{
+     struct passwd *p;
+     size_t slen, n = 0;
+     
+     *result = NULL;
+
+     p = getpwnam(name);
+     if(p == NULL)
+	 return (errno = ENOENT);
+	 
+     copypw(pwd, buffer, bufsize, p);
 
      *result = pwd;
 
@@ -133,6 +168,18 @@
     if (ret == 0)
 	errx(1, "rk_getpwnam_r no user");
 
+    ret = rk_getpwuid_r(0, &pwd, buf, sizeof(buf), &result);
+    if (ret)
+	errx(1, "rk_getpwuid_r");
+    print_result(result);
+
+    ret = rk_getpwuid_r(0, &pwd, buf, 1, &result);
+    if (ret == 0)
+	errx(1, "rk_getpwuid_r too small buf");
+
+    ret = rk_getpwuid_r(-1234, &pwd, buf, sizeof(buf), &result);
+    if (ret == 0)
+	errx(1, "rk_getpwuid_r no user");
     return 0;
 }
 
Index: lib/roken/roken.h.in
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lib/roken/roken.h.in	28 Jan 2017 21:31:50 -0000	1.4
+++ lib/roken/roken.h.in	8 Sep 2017 15:29:43 -0000	1.5
@@ -650,6 +650,13 @@
 rk_getpwnam_r(const char *, struct passwd *, char *, size_t, struct passwd **);
 #endif
 
+#ifdef POSIX_GETPWUID_R
+#define rk_getpwuid_r(_u, _pw, _b, _sz, _pwd) getpwuid_r(_u, _pw, _b, _sz, _pwd)
+#else
+ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
+rk_getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **);
+#endif
+
 ROKEN_LIB_FUNCTION const char * ROKEN_LIB_CALL get_default_username (void);
 
 #ifndef HAVE_SETEUID