pullup from trunk

ticket: 3146
version_fixed: 1.4.3

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17329 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index eddec9724be91817e22cb6920ca6c2af4f869941..f06fee506b23ad7a12abd93fda1f3ae86e092cff 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-11  Tom Yu  <tlyu@mit.edu>
+
+       * import_name.c: Include stdio.h regardless of presence of
+       getpwuid_r(), to ensure definition of BUFSIZ.  Reported by
+       Vladimir Terziev.
+
 2005-04-07  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in (gssapi_krb5.h): Use awk hack to work around quoting

diff --git a/src/lib/gssapi/krb5/import_name.c b/src/lib/gssapi/krb5/import_name.c
index 7969cca3aa88f89d72fbe662f3b82972d1c21981..828ba67da958f240911e8843b98f8cad8a7009de 100644 (file)
--- a/src/lib/gssapi/krb5/import_name.c
+++ b/src/lib/gssapi/krb5/import_name.c
@@ -28,10 +28,8 @@
 
 #ifndef NO_PASSWORD
 #include <pwd.h>
-#ifdef HAVE_GETPWUID_R
 #include <stdio.h>
 #endif
-#endif
 
 #ifdef HAVE_STRING_H
 #include <string.h>