Module Name: src
Committed By: christos
Date: Fri Sep 8 14:57:44 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech:
gss_pname_to_uid.c
Log Message:
This is why we have libroken...
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c:1.2 Sat Jan 28 16:31:46 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c Fri Sep 8 10:57:44 2017
@@ -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 @@ gss_pname_to_uid(OM_uint32 *minor_status
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 @@ gss_pname_to_uid(OM_uint32 *minor_status
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);
