[29070] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix kadmin with e2fsprogs libss
daemon@ATHENA.MIT.EDU (Greg Hudson)
Thu Sep 24 19:38:53 2015
Date: Thu, 24 Sep 2015 19:38:50 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201509242338.t8ONcojW029841@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/fd0b693f00f4d0b7b603bf4a2b8812869ad1df19
commit fd0b693f00f4d0b7b603bf4a2b8812869ad1df19
Author: Greg Hudson <ghudson@mit.edu>
Date: Wed Sep 23 18:20:41 2015 -0400
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(+), 0 deletions(-)
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index ff444ee..dbb7db2 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/ss.h>],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 776c383..7ae9f1a 100644
--- a/src/kadmin/cli/ss_wrapper.c
+++ b/src/kadmin/cli/ss_wrapper.c
@@ -29,6 +29,10 @@
#include <ss/ss.h>
#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;
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
