From 98558995d6ac778843f5c1488b6295cf6c2f4744 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Sun, 31 Oct 2010 21:58:37 -0400 Subject: [PATCH] check for error_message IRIX apparently has enough krb5 to try building aklog, but no error_message. ok. so let's cope Reviewed-on: http://gerrit.openafs.org/3208 Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear (cherry picked from commit 572f9baaeb626293f4db62a66db1ea9b9a373c03) Change-Id: I44c71ffedcbe55db696db667d1941a7bdc781cff Reviewed-on: http://gerrit.openafs.org/3987 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/aklog/aklog.c | 4 +++- src/cf/krb5.m4 | 3 ++- src/config/afsconfig-windows.h | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/aklog/aklog.c b/src/aklog/aklog.c index b72f96eb1..afb25b96d 100644 --- a/src/aklog/aklog.c +++ b/src/aklog/aklog.c @@ -335,8 +335,10 @@ redirect_errors(const char *who, afs_int32 code, const char *fmt, va_list ap) if (strncmp(str, "unknown", strlen("unknown")) == 0) { #ifdef HAVE_KRB5_SVC_GET_MSG krb5_svc_get_msg(code,&str); -#else +#elif defined(HAVE_ERROR_MESSAGE) str = error_message(code); +#else + ; /* IRIX apparently has neither: use the string we have */ #endif } fputs(str, stderr); diff --git a/src/cf/krb5.m4 b/src/cf/krb5.m4 index a14dd2f4a..898c29c61 100644 --- a/src/cf/krb5.m4 +++ b/src/cf/krb5.m4 @@ -139,9 +139,10 @@ AC_DEFUN([_RRA_LIB_KRB5_MANUAL], [AC_CHECK_FUNCS([krb5_free_error_message])], [AC_CHECK_FUNCS([krb5_get_error_string], , [AC_CHECK_FUNCS([krb5_get_err_txt], , + [AC_CHECK_FUNCS([error_message], , [AC_CHECK_FUNCS([krb5_svc_get_msg], [AC_CHECK_HEADERS([ibm_svc/krb5_svc.h])], - [AC_CHECK_HEADERS([et/com_err.h])])])])]) + [AC_CHECK_HEADERS([et/com_err.h])])])])])]) RRA_LIB_KRB5_RESTORE]) dnl Sanity-check the results of krb5-config and be sure we can really link a diff --git a/src/config/afsconfig-windows.h b/src/config/afsconfig-windows.h index 6e7662c49..1edd7cb6e 100644 --- a/src/config/afsconfig-windows.h +++ b/src/config/afsconfig-windows.h @@ -49,6 +49,9 @@ /* Define if you have the connect function. */ #undef HAVE_CONNECT +/* Define if you have the error_message function. */ +#define HAVE_ERROR_MESSAGE + /* Define if you have the gethostbyname function. */ #define HAVE_GETHOSTBYNAME -- 2.39.5