From fd0b693f00f4d0b7b603bf4a2b8812869ad1df19 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Wed, 23 Sep 2015 18:20:41 -0400 Subject: [PATCH] Fix kadmin with e2fsprogs libss The libss in e2fsprogs exports ss_execute_command(), but does not prototype it (as of this writing; a patch has been submitted upstream). When using the system ss library, check if a prototype is needed and provide one if so. ticket: 8251 (new) target_version: 1.14 tags: pullup --- src/aclocal.m4 | 1 + src/kadmin/cli/ss_wrapper.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/aclocal.m4 b/src/aclocal.m4 index ff444ee8c7..dbb7db2eb2 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -1483,6 +1483,7 @@ int main(int argc, char *argv[]) { }], krb5_cv_system_ss_okay=yes, AC_MSG_ERROR(cannot run test program), krb5_cv_system_ss_okay="assumed")]) LIBS="$old_LIBS" + KRB5_NEED_PROTO([#include ],ss_execute_command,1) else SS_VERSION=k5 AC_MSG_RESULT(krb5) diff --git a/src/kadmin/cli/ss_wrapper.c b/src/kadmin/cli/ss_wrapper.c index 776c383d71..7ae9f1a225 100644 --- a/src/kadmin/cli/ss_wrapper.c +++ b/src/kadmin/cli/ss_wrapper.c @@ -29,6 +29,10 @@ #include #include "kadmin.h" +#ifdef NEED_SS_EXECUTE_COMMAND_PROTO +int ss_execute_command(int, char **); +#endif + extern ss_request_table kadmin_cmds; extern int exit_status; extern char *whoami; -- 2.47.2