Update to rra-c-util 2.5

* Restore default settings after probing for GSS-API libraries.
* Support the *BSD build of Heimdal in the Kerberos probes.
* Fix krb5_free_error_message replacement for older Kerberos libraries.

diff --git a/NEWS b/NEWS
index 67250f151f471045fbc1364f9c25147edbc50098..7765cd367afe225529ad6f8ff1d11b267ed9b5d8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,12 @@ kadmin-remctl 3.1 (unreleased)
     Allow underscores in principal names by default in the examine
     function.
 
+    Update to rra-c-util 2.5:
+
+    * Restore default settings after probing for GSS-API libraries.
+    * Support the *BSD build of Heimdal in the Kerberos probes.
+    * Fix krb5_free_error_message replacement for older Kerberos libraries.
+
 kadmin-remctl 3.0 (2010-02-17)
 
     Add kadmin-backend-heim, which duplicates the kadmin-backend

diff --git a/configure.ac b/configure.ac
index 68f30abe0dfebada8abad27410ee730ee8a574eb..e8cbfc544bd3716fbd28721237707ec647a6f631 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,8 +24,7 @@ RRA_LIB_REMCTL
 RRA_LIB_KRB5
 RRA_LIB_KRB5_SWITCH
 AC_CHECK_FUNCS([krb5_get_init_creds_opt_alloc \
-    krb5_get_init_creds_opt_set_default_flags \
-    krb5_principal_get_realm])
+    krb5_get_init_creds_opt_set_default_flags])
 RRA_LIB_KRB5_RESTORE
 
 AC_HEADER_STDBOOL

diff --git a/m4/gssapi.m4 b/m4/gssapi.m4
index 4b08569eab71e297d549dff4157237801d663d14..0a657ffeb1cb20778c132e08bd8c09f36d20acf8 100644 (file)
--- a/m4/gssapi.m4
+++ b/m4/gssapi.m4
@@ -57,7 +57,8 @@ AC_DEFUN([_RRA_LIB_GSSAPI_REDUCED],
  AC_CHECK_LIB([gssapi_krb5], [gss_import_name], [GSSAPI_LIBS="-lgssapi_krb5"],
      [AC_CHECK_LIB([gssapi], [gss_import_name], [GSSAPI_LIBS="-lgssapi"],
          [AC_CHECK_LIB([gss], [gss_import_name], [GSSAPI_LIBS="-lgss"],
-             [AC_MSG_ERROR([cannot find usable GSS-API library])])])])])
+             [AC_MSG_ERROR([cannot find usable GSS-API library])])])])
+ RRA_LIB_GSSAPI_RESTORE])
 
 dnl Does the appropriate library checks for GSS-API linkage when we don't
 dnl have krb5-config or reduced dependencies.  libgss is used as a last

diff --git a/m4/krb5.m4 b/m4/krb5.m4
index bba9694bad0dca7dea625b89fbf8b65958100ca6..d7c27981f224dcbc399162263200c96ed2915b31 100644 (file)
--- a/m4/krb5.m4
+++ b/m4/krb5.m4
@@ -2,7 +2,7 @@ dnl Find the compiler and linker flags for Kerberos v5.
 dnl
 dnl Finds the compiler and linker flags for linking with Kerberos v5
 dnl libraries.  Provides the --with-krb5, --with-krb5-include, and
-dnl --with-krb5-lib configure options to specify non-standards paths to the
+dnl --with-krb5-lib configure options to specify non-standard paths to the
 dnl Kerberos libraries.  Uses krb5-config where available unless reduced
 dnl dependencies is requested.
 dnl
@@ -13,6 +13,9 @@ dnl Kerberos libraries, saving the current values first, and
 dnl RRA_LIB_KRB5_RESTORE to restore those settings to before the last
 dnl RRA_LIB_KRB5_SWITCH.
 dnl
+dnl If KRB5_CPPFLAGS, KRB5_LDFLAGS, or KRB5_LIBS are set before calling these
+dnl macros, their values will be added to whatever the macros discover.
+dnl
 dnl Provides the RRA_LIB_KRB5_OPTIONAL macro, which should be used if Kerberos
 dnl support is optional.  This macro will still always set the substitution
 dnl variables, but they'll be empty unless --with-krb5 is given.  Also,
@@ -26,7 +29,7 @@ dnl
 dnl Depends on RRA_ENABLE_REDUCED_DEPENDS and RRA_SET_LDFLAGS.
 dnl
 dnl Written by Russ Allbery <rra@stanford.edu>
-dnl Copyright 2005, 2006, 2007, 2008, 2009
+dnl Copyright 2005, 2006, 2007, 2008, 2009, 2010
 dnl     Board of Trustees, Leland Stanford Jr. University
 dnl
 dnl See LICENSE for licensing terms.
@@ -99,10 +102,11 @@ AC_DEFUN([_RRA_LIB_KRB5_MANUAL],
     [AC_CHECK_LIB([nsl], [socket], [LIBS="-lnsl -lsocket $LIBS"], ,
         [-lsocket])])
  AC_SEARCH_LIBS([crypt], [crypt])
+ AC_SEARCH_LIBS([rk_simple_execve], [roken])
  rra_krb5_extra="$LIBS"
  LIBS="$rra_krb5_save_LIBS"
  AC_CHECK_LIB([krb5], [krb5_init_context],
-    [KRB5_LIBS="-lkrb5 -lasn1 -lroken -lcrypto -lcom_err $rra_krb5_extra"],
+    [KRB5_LIBS="-lkrb5 -lasn1 -lcom_err -lcrypto $rra_krb5_extra"],
     [AC_CHECK_LIB([krb5support], [krb5int_getspecific],
         [rra_krb5_extra="-lkrb5support $rra_krb5_extra"],
         [AC_CHECK_LIB([pthreads], [pthread_setspecific],
@@ -125,7 +129,7 @@ AC_DEFUN([_RRA_LIB_KRB5_MANUAL],
         [AS_IF([test x"$1" = xtrue],
             [AC_MSG_ERROR([cannot find usable Kerberos v5 library])])],
         [$rra_krb5_extra])],
-    [-lasn1 -lroken -lcrypto -lcom_err $rra_krb5_extra])
+    [-lasn1 -lcom_err -lcrypto $rra_krb5_extra])
  LIBS="$KRB5_LIBS $LIBS"
  AC_CHECK_FUNCS([krb5_get_error_message],
      [AC_CHECK_FUNCS([krb5_free_error_message])],
@@ -200,9 +204,6 @@ AC_DEFUN([RRA_LIB_KRB5],
 [rra_krb5_root=
  rra_krb5_libdir=
  rra_krb5_includedir=
- KRB5_CPPFLAGS=
- KRB5_LDFLAGS=
- KRB5_LIBS=
  AC_SUBST([KRB5_CPPFLAGS])
  AC_SUBST([KRB5_LDFLAGS])
  AC_SUBST([KRB5_LIBS])
@@ -230,9 +231,6 @@ AC_DEFUN([RRA_LIB_KRB5_OPTIONAL],
  rra_krb5_libdir=
  rra_krb5_includedir=
  rra_use_kerberos=
- KRB5_CPPFLAGS=
- KRB5_LDFLAGS=
- KRB5_LIBS=
  AC_SUBST([KRB5_CPPFLAGS])
  AC_SUBST([KRB5_LDFLAGS])
  AC_SUBST([KRB5_LIBS])

diff --git a/m4/remctl.m4 b/m4/remctl.m4
index 8ee3c16317b47e6f74b9804d5f70f132b59d9db1..bb3a56f00d2a7a5d05fc4404b0ed71ae02c46bb5 100644 (file)
--- a/m4/remctl.m4
+++ b/m4/remctl.m4
@@ -21,7 +21,7 @@ dnl
 dnl See LICENSE for licensing terms.
 
 dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to
-dnl versions that include the Kerberos v5 flags.  Used as a wrapper, with
+dnl versions that include the remctl flags.  Used as a wrapper, with
 dnl RRA_LIB_REMCTL_RESTORE, around tests.
 AC_DEFUN([RRA_LIB_REMCTL_SWITCH],
 [rra_remctl_save_CPPFLAGS="$CPPFLAGS"

diff --git a/portable/krb5-extra.c b/portable/krb5-extra.c
index 1d95d8146a76377fe8dc0329674561f604395601..95e773dd94da283a1badaccf2eeb75683aa3063d 100644 (file)
--- a/portable/krb5-extra.c
+++ b/portable/krb5-extra.c
@@ -77,7 +77,7 @@ krb5_get_error_message(krb5_context ctx UNUSED, krb5_error_code code UNUSED)
  * krb5_free_error_message is a subset of those with krb5_get_error_message.
  * If this assumption ever breaks, we may call the wrong free function.
  */
-static void
+void
 krb5_free_error_message(krb5_context ctx UNUSED, const char *msg)
 {
     if (msg == error_unknown)

diff --git a/portable/krb5.h b/portable/krb5.h
index 8b8c69615686708935a4951b58c97e012ea80ba2..4ca100fa59cbc248770aa9039b0b297e9b71c597 100644 (file)
--- a/portable/krb5.h
+++ b/portable/krb5.h
@@ -23,7 +23,13 @@
 #ifndef PORTABLE_KRB5_H
 #define PORTABLE_KRB5_H 1
 
-#include <config.h>
+/*
+ * Allow inclusion of config.h to be skipped, since sometimes we have to use a
+ * stripped-down version of config.h with a different name.
+ */
+#ifndef CONFIG_H_INCLUDED
+# include <config.h>
+#endif
 #include <portable/macros.h>
 
 #include <krb5.h>
@@ -63,15 +69,6 @@ krb5_error_code krb5_get_init_creds_opt_alloc(krb5_context,
 #define krb5_get_init_creds_opt_set_default_flags(c, p, r, o) /* empty */
 #endif
 
-/*
- * Heimdal provides a nice function that just returns a const char *.  On MIT,
- * there's an accessor macro that returns the krb5_data pointer, wihch
- * requires more work to get at the underlying char *.
- */
-#ifndef HAVE_KRB5_PRINCIPAL_GET_REALM
-const char *krb5_principal_get_realm(krb5_context, krb5_const_principal);
-#endif
-
 /* Undo default visibility change. */
 #pragma GCC visibility pop
 

diff --git a/util/macros.h b/util/macros.h
index 97b2c2b319c0aded61c76a3d075c539fbf2b6d24..0104d9f6d8841e8e288832bf5c32ab68b3ede91a 100644 (file)
--- a/util/macros.h
+++ b/util/macros.h
@@ -8,7 +8,6 @@
 #ifndef UTIL_MACROS_H
 #define UTIL_MACROS_H 1
 
-#include <config.h>
 #include <portable/macros.h>
 
 /* Used for unused parameters to silence gcc warnings. */