Update to rra-c-util 4.8 and C TAP Harness 1.12

Update to rra-c-util 4.8:

* Look for krb5-config in /usr/kerberos/bin after the user's PATH.
* Kerberos library probing fixes without transitive shared libraries.
* Fix Autoconf warnings when probing for AIX's bundled Kerberos.
* Avoid using krb5-config if --with-{krb5,gssapi}-{include,lib} given.
* Correctly remove -I/usr/include from Kerberos and GSS-API flags.
* Build on systems where krb5/krb5.h exists but krb5.h does not.
* Pass --deps to krb5-config unless --enable-reduced-depends was used.
* Do not use krb5-config results unless gssapi is supported.
* Fix probing for Heimdal's libroken to work with older versions.
* Update warning flags for GCC 4.6.1.
* Update utility library and test suite for newer GCC warnings.
* Fix broken GCC attribute markers causing compilation problems.
* Suppress warnings on compilers that support gcc's __attribute__.
* Add notices to all files copied over from rra-c-util.
* Fix warnings when reporting memory allocation failure in messages.c.
* Fix message utility library compiler warnings on 64-bit systems.
* Include strings.h for additional POSIX functions where found.
* Use an atexit handler to clean up after Kerberos tests.
* Kerberos test configuration now goes in tests/config.
* The principal of the test keytab is determined automatically.
* Simplify the test suite calls for Kerberos and remctl tests.
* Check for a missing ssize_t.
* Improve the xstrndup utility function.
* Checked asprintf variants are now void functions and cannot fail.
* Fix use of long long in portable/mkstemp.c.
* Fix test suite portability to Solaris.
* Substantial improvements to the POD syntax and spelling checks.

Update to C TAP Harness 1.12:

* Fix compliation of runtests with more aggressive warnings.
* Add a more complete usage message and a -h command-line flag.
* Flush stderr before printing output from tests.
* Better handle running shell tests without BUILD and SOURCE set.
* Fix runtests to honor -s even if BUILD and -b aren't given.
* runtests now frees all allocated resources on exit.
* Only use feature-test macros when requested or built with gcc -ansi.
* Drop is_double from the C TAP library to avoid requiring -lm.
* Avoid using local in the shell libtap.sh library.
* Suppress warnings on compilers that support gcc's __attribute__.

Change-Id: I394294d5486ac1ce265c7713bec71a148aaaf1ce
Reviewed-on: https://gerrit.stanford.edu/841
Reviewed-by: Russ Allbery <rra@stanford.edu>
Tested-by: Russ Allbery <rra@stanford.edu>

1 files changed, 49 insertions, 15 deletions

diff --git a/tests/tap/kerberos.sh b/tests/tap/kerberos.sh
index 904cae5..d2f174d 100644
--- a/tests/tap/kerberos.sh
+++ b/tests/tap/kerberos.sh
@@ -1,30 +1,61 @@
 # Shell function library to initialize Kerberos credentials
 #
+# Note that while many of the functions in this library could benefit from
+# using "local" to avoid possibly hammering global variables, Solaris /bin/sh
+# doesn't support local and this library aspires to be portable to Solaris
+# Bourne shell.  Instead, all private variables are prefixed with "tap_".
+#
+# The canonical version of this file is maintained in the rra-c-util package,
+# which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
+#
 # Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2009, 2010 Board of Trustees, Leland Stanford Jr. University
+# Copyright 2009, 2010, 2011, 2012
+#     The Board of Trustees of the Leland Stanford Junior University
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# See LICENSE for licensing terms.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+# We use test_tmpdir.
+. "${SOURCE}/tap/libtap.sh"
 
 # Set up Kerberos, including the ticket cache environment variable.  Bail out
 # if not successful, return 0 if successful, and return 1 if Kerberos is not
 # configured.  Sets the global principal variable to the principal to use.
 kerberos_setup () {
-    local keytab
-    keytab=`test_file_path data/test.keytab`
-    principal=`test_file_path data/test.principal`
+    tap_keytab=`test_file_path config/keytab`
+    principal=`test_file_path config/principal`
     principal=`cat "$principal" 2>/dev/null`
-    if [ -z "$keytab" ] || [ -z "$principal" ] ; then
+    if [ -z "$tap_keytab" ] || [ -z "$principal" ] ; then
         return 1
     fi
-    KRB5CCNAME="$BUILD/data/test.cache"; export KRB5CCNAME
-    kinit -k -t "$keytab" "$principal" >/dev/null </dev/null
+    KRB5CCNAME=`test_tmpdir`/krb5cc_test; export KRB5CCNAME
+    kinit --no-afslog -k -t "$tap_keytab" "$principal" >/dev/null </dev/null
     status=$?
     if [ $status != 0 ] ; then
-        kinit -t "$keytab" "$principal" >/dev/null </dev/null
+        kinit -k -t "$tap_keytab" "$principal" >/dev/null </dev/null
+        status=$?
+    fi
+    if [ $status != 0 ] ; then
+        kinit -t "$tap_keytab" "$principal" >/dev/null </dev/null
         status=$?
     fi
     if [ $status != 0 ] ; then
-        kinit -k -K "$keytab" "$principal" >/dev/null </dev/null
+        kinit -k -K "$tap_keytab" "$principal" >/dev/null </dev/null
         status=$?
     fi
     if [ $status != 0 ] ; then
@@ -35,7 +66,8 @@ kerberos_setup () {
 
 # Clean up at the end of a test.  Currently only removes the ticket cache.
 kerberos_cleanup () {
-    rm -f "$BUILD/data/test.cache"
+    tap_tmp=`test_tmpdir`
+    rm -f "$tap_tmp"/krb5cc_test
 }
 
 # List the contents of a keytab with enctypes and keys.  This adjusts for the
@@ -44,11 +76,13 @@ kerberos_cleanup () {
 # may just hang.  Takes the keytab to list and the file into which to save the
 # output, and strips off the header containing the file name.
 ktutil_list () {
-    if klist -keK "$1" > ktutil-tmp 2>/dev/null ; then
+    tap_tmp=`test_tmpdir`
+    if klist -keK "$1" > "$tap_tmp"/ktutil-tmp 2>/dev/null ; then
         :
     else
-        ktutil -k "$1" list --keys > ktutil-tmp < /dev/null 2>/dev/null
+        ktutil -k "$1" list --keys > "$tap_tmp"/ktutil-tmp </dev/null \
+            2>/dev/null
     fi
-    sed -e '/Keytab name:/d' -e "/^[^ ]*:/d" ktutil-tmp > "$2"
-    rm -f ktutil-tmp
+    sed -e '/Keytab name:/d' -e "/^[^ ]*:/d" "$tap_tmp"/ktutil-tmp > "$2"
+    rm -f "$tap_tmp"/ktutil-tmp
 }