diff options
| author | Tom Yu <tlyu@mit.edu> | 2012-03-08 04:31:30 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2012-03-08 04:31:30 +0000 |
| commit | 0de2816b7969621d71e3532932c7575033a93a5e (patch) | |
| tree | 67163353701663b92ba8608a07da8cf37376c393 | |
| parent | 64ad05cbb3c4a3f2ab6cae0423c7f3ae488ee33e (diff) | |
| download | krb5-0de2816b7969621d71e3532932c7575033a93a5e.zip krb5-0de2816b7969621d71e3532932c7575033a93a5e.tar.gz krb5-0de2816b7969621d71e3532932c7575033a93a5e.tar.bz2 | |
workaround for Solaris 8 lacking isblank
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: 7101
version_fixed: 1.9.4
status: resolved
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-9@25745 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/configure.in | 2 | ||||
| -rw-r--r-- | src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/configure.in b/src/configure.in index 57b8252..b84a6e4 100644 --- a/src/configure.in +++ b/src/configure.in @@ -214,7 +214,7 @@ AC_PROG_AWK AC_PROG_LEX AC_C_CONST AC_HEADER_DIRENT -AC_CHECK_FUNCS(strdup setvbuf inet_ntoa inet_aton 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) +AC_CHECK_FUNCS(strdup setvbuf inet_ntoa inet_aton 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 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 5e05511..67de9fc 100644 --- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c +++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c @@ -40,9 +40,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) |