INN commit: trunk (3 files)

[INN Commit]

    Date: Thursday, March 8, 2018 @ 08:14:24
  Author: iulius
Revision: 10254

Suppress krb5-config probe output with --with-krb5 configure flag

Update to latest rra-c-util upstream version.

If --with-krb5 (or the equivalent for other probes) is given and a
krb5-config was found at the install root, skip the PATH search for
krb5-config to avoid confusing output.  This results in redoing the
probe and using cached output when testing multiple krb5-config
features, but that seems better than the confusing output.

Also, regenerate dependencies for auth_krb5.c.

Modified:
  trunk/authprogs/auth_krb5.c
  trunk/lib/Makefile
  trunk/m4/krb5-config.m4

-----------------------+
 authprogs/auth_krb5.c |    4 ++--
 lib/Makefile          |    7 ++++---
 m4/krb5-config.m4     |    8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

Modified: authprogs/auth_krb5.c
===================================================================
--- authprogs/auth_krb5.c	2018-03-05 18:13:42 UTC (rev 10253)
+++ authprogs/auth_krb5.c	2018-03-08 16:14:24 UTC (rev 10254)
@@ -6,8 +6,8 @@
 **  See <http://www.mallorn.com/tools/nnrpkrb5auth>
 **
 **  This program takes a username and password pair from nnrpd and checks
-**  checks their validity against a Kerberos KDC by attempting to obtain a
-**  TGT.  With the -i <instance> command line option, appends /<instance> to
+**  their validity against a Kerberos KDC by attempting to obtain a TGT.
+**  With the -i <instance> command line option, appends /<instance> to
 **  the username prior to authentication.
 **
 **  Special thanks to Von Welch <vwelch at vwelch.com> for giving me the initial

Modified: lib/Makefile
===================================================================
--- lib/Makefile	2018-03-05 18:13:42 UTC (rev 10253)
+++ lib/Makefile	2018-03-08 16:14:24 UTC (rev 10254)
@@ -225,9 +225,10 @@
   ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
   ../include/inn/defines.h ../include/inn/options.h ../include/clibrary.h \
   ../include/config.h ../include/inn/macros.h \
-  ../include/portable/stdbool.h ../include/inn/libinn.h \
-  ../include/inn/concat.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
-  ../include/inn/paths.h
+  ../include/portable/stdbool.h ../include/portable/socket.h \
+  ../include/portable/macros.h ../include/portable/getaddrinfo.h \
+  ../include/portable/getnameinfo.h ../include/inn/libinn.h \
+  ../include/inn/concat.h ../include/inn/xmalloc.h ../include/inn/xwrite.h
 getmodaddr.o: getmodaddr.c ../include/config.h ../include/inn/defines.h \
   ../include/inn/system.h ../include/inn/macros.h \
   ../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \

Modified: m4/krb5-config.m4
===================================================================
--- m4/krb5-config.m4	2018-03-05 18:13:42 UTC (rev 10253)
+++ m4/krb5-config.m4	2018-03-08 16:14:24 UTC (rev 10254)
@@ -12,7 +12,7 @@
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
 dnl Written by Russ Allbery <eagle at eyrie.org>
-dnl Copyright 2011-2012
+dnl Copyright 2011-2012, 2018
 dnl     The Board of Trustees of the Leland Stanford Junior University
 dnl
 dnl This file is free software; the authors give unlimited permission to copy
@@ -78,12 +78,12 @@
 dnl krb5-config didn't take an argument to specify the library type, but
 dnl always returned the flags for libkrb5.
 AC_DEFUN([INN_KRB5_CONFIG],
-[AC_REQUIRE([_INN_KRB5_CONFIG_PATH])
- inn_krb5_config_$3=
+[inn_krb5_config_$3=
  inn_krb5_config_$3[]_ok=
  AS_IF([test x"$1" != x && test -x "$1/bin/krb5-config"],
     [inn_krb5_config_$3="$1/bin/krb5-config"],
-    [inn_krb5_config_$3="$PATH_KRB5_CONFIG"])
+    [_INN_KRB5_CONFIG_PATH
+     inn_krb5_config_$3="$PATH_KRB5_CONFIG"])
  AS_IF([test x"$inn_krb5_config_$3" != x && test -x "$inn_krb5_config_$3"],
     [AC_CACHE_CHECK([for $2 support in krb5-config], [inn_cv_lib_$3[]_config],
          [AS_IF(["$inn_krb5_config_$3" 2>&1 | grep $2 >/dev/null 2>&1],