Pull up r25716 from trunk

 ------------------------------------------------------------------------
 r25716 | tlyu | 2012-02-27 13:31:50 -0500 (Mon, 27 Feb 2012) | 6 lines

 ticket: 7074
 target_version: 1.10.1
 tags: pullup

 Patch from Richard Basch to work around Solaris 8 lacking isblank().

ticket: 7074
version_fixed: 1.10.1
status: resolved

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

diff --git a/src/configure.in b/src/configure.in
index 3101439fdbd93a7489d8f501c79e4e0a0a96b65a..8c786764e1bc033381383307da2d31d16d295485 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -263,7 +263,7 @@ AC_CONFIG_HEADERS(include/autoconf.h, [echo timestamp > include/autoconf.stamp])
 AC_PROG_LEX
 AC_C_CONST
 AC_HEADER_DIRENT
-AC_CHECK_FUNCS(strdup setvbuf seteuid setresuid setreuid setegid setresgid setregid setsid flock fchmod chmod strftime strptime geteuid setenv unsetenv getenv gmtime_r localtime_r bswap16 bswap64 mkstemp getusershell access getcwd srand48 srand srandom stat strchr strerror strerror_r timegm)
+AC_CHECK_FUNCS(strdup setvbuf seteuid setresuid setreuid setegid setresgid setregid setsid flock fchmod chmod strftime strptime geteuid setenv unsetenv getenv gmtime_r localtime_r bswap16 bswap64 mkstemp getusershell access getcwd srand48 srand srandom stat strchr strerror strerror_r timegm isblank)
 
 AC_CHECK_FUNC(mkstemp,
 [MKSTEMP_ST_OBJ=

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c
index 217c9ce3a88ca1030cada413df9313bb40dc9089..6115bb7e64e9157927f1530cde3ce3ac26dfecc6 100644 (file)
--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c
@@ -39,9 +39,15 @@
 #include <kdb5.h>
 #include <kadm5/admin.h>
 
-#if defined(NEED_ISBLANK_PROTO) && !defined(isblank)
+#if !defined(isblank) && defined(HAVE_ISBLANK)
+#if defined(NEED_ISBLANK_PROTO)
 extern int isblank();
 #endif
+#else /* isblank missing */
+#if !defined(isblank)
+#define isblank isspace
+#endif
+#endif
 
 krb5_error_code
 krb5_ldap_get_db_opt(char *input, char **opt, char **val)