Eliminate qualname.plin

Rewriting the qualname Perl script to use getaddrinfo created an
unchecked dependency on Perl 5.14.  Instead, remove the script and use
the C program in tests/resolve for the kadmin and gssrpc test suites.

diff --git a/src/kadmin/testing/scripts/Makefile.in b/src/kadmin/testing/scripts/Makefile.in
index 8c0d2362a12dc72320dc0a3829418700b299643c..4b3c75c9adab844b67edf9dd589fab896b10dd90 100644 (file)
--- a/src/kadmin/testing/scripts/Makefile.in
+++ b/src/kadmin/testing/scripts/Makefile.in
@@ -5,7 +5,7 @@ PERL_PATH=@PERL_PATH@
 .SUFFIXES: .plin .pl
 
 GEN_SCRIPTS = compare_dump.pl make-host-keytab.pl \
-       simple_dump.pl verify_xrunner_report.pl qualname.pl
+       simple_dump.pl verify_xrunner_report.pl
 
 all: env-setup.sh $(GEN_SCRIPTS)
 

diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin
index 7262983515b247f083923a13234781b5097c4681..8c29bb996e6d3e147872466a6680adbe3d55dc08 100755 (executable)
--- a/src/kadmin/testing/scripts/env-setup.shin
+++ b/src/kadmin/testing/scripts/env-setup.shin
@@ -69,12 +69,14 @@ MAKE_KEYTAB=$TESTDIR/scripts/make-host-keytab.pl; export MAKE_KEYTAB
 LOCAL_MAKE_KEYTAB=$TESTDIR/scripts/make-host-keytab.pl
 export LOCAL_MAKE_KEYTAB
 SIMPLE_DUMP=$TESTDIR/scripts/simple_dump.pl; export SIMPLE_DUMP
-QUALNAME=$TESTDIR/scripts/qualname.pl; export QUALNAME
 TCLUTIL=$STESTDIR/tcl/util.t; export TCLUTIL
 BSDDB_DUMP=$TESTDIR/util/bsddb_dump; export BSDDB_DUMP
 CLNTTCL=$TESTDIR/util/kadm5_clnt_tcl; export CLNTTCL
 SRVTCL=$TESTDIR/util/kadm5_srv_tcl; export SRVTCL
 
+QUALNAME=`$BUILDTOP/tests/resolve/resolve -q | tr '[A-Z]' '[a-z]'`
+export QUALNAME
+
 KRB5_CONFIG=$K5ROOT/krb5.conf; export KRB5_CONFIG
 KRB5_KDC_PROFILE=$K5ROOT/kdc.conf; export KRB5_KDC_PROFILE
 KRB5_KTNAME=$K5ROOT/ovsec_adm.keytab; export KRB5_KTNAME

diff --git a/src/kadmin/testing/scripts/init_db b/src/kadmin/testing/scripts/init_db
index bf119f2ac58e2034cf85fd075ad72c44ab1e661d..2496be2aba1cd902fddfdd74134884bb259c0c85 100755 (executable)
--- a/src/kadmin/testing/scripts/init_db
+++ b/src/kadmin/testing/scripts/init_db
@@ -77,11 +77,9 @@ fi
 #      esac
 # done
 
-qualname=`$QUALNAME`
-
 sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \
-       -e "s/__KDCHOST__/$qualname/g" \
-       -e "s/__LOCALHOST__/$qualname/g" \
+       -e "s/__KDCHOST__/$QUALNAME/g" \
+       -e "s/__LOCALHOST__/$QUALNAME/g" \
        -e "s#__MODDIR__#$MODDIR#g" \
        < $STESTDIR/proto/krb5.conf.proto > $K5ROOT/krb5.conf
 sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \

diff --git a/src/kadmin/testing/scripts/qualname.plin b/src/kadmin/testing/scripts/qualname.plin
deleted file mode 100755 (executable)
index ccc57e3..0000000
--- a/src/kadmin/testing/scripts/qualname.plin
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/perl
-use Socket qw(:addrinfo);
-use strict;
-
-my $hostname;
-if ($#ARGV == -1) {
-    chop($hostname = `hostname`);
-} else {
-    $hostname = $ARGV[0];
-}
-
-my ($gaerr, @addrs) = getaddrinfo($hostname, "", {flags => AI_CANONNAME});
-die "No such host: $hostname ($gaerr)" if $gaerr;
-my ($canonname, $addr) = ($addrs[0]->{canonname}, $addrs[0]->{addr});
-
-my ($gnerr, $name, $servicename) = getnameinfo($addr, NI_NAMEREQD);
-my $qualname = $gnerr ? $name : $name;
-
-$qualname =~ tr/A-Z/a-z/;      # lowercase our name for keytab use.
-print "$qualname\n";

diff --git a/src/kadmin/testing/scripts/start_servers b/src/kadmin/testing/scripts/start_servers
index 87bd52fc0ba6890d5a3c3fd7545aaa08f15d987f..f23df06828f8347dde5d288284f5a59c78fceedf 100755 (executable)
--- a/src/kadmin/testing/scripts/start_servers
+++ b/src/kadmin/testing/scripts/start_servers
@@ -35,10 +35,9 @@ fi
 if [ $local = 0 ]; then
 
        # Fix up the local krb5.conf to point to the remote 
-       localname=`$QUALNAME`
        sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \
                -e "s/__KDCHOST__/$hostname/g" \
-               -e "s/__LOCALHOST__/$localname/g" \
+               -e "s/__LOCALHOST__/$QUALNAME/g" \
                -e "s#__MODDIR__#$TOP/../plugins/kdb#g"\
                -e "s#__PLUGIN_DIR__#$TOP/../plugins#g"\
                < $STESTDIR/proto/krb5.conf.proto > $K5ROOT/krb5.conf

diff --git a/src/kadmin/testing/scripts/start_servers_local b/src/kadmin/testing/scripts/start_servers_local
index 80989297455992a8a3a9442a4c3d131dbcc41ccd..e502a6a0b20698e656ec1faf900eb81b36c81b30 100755 (executable)
--- a/src/kadmin/testing/scripts/start_servers_local
+++ b/src/kadmin/testing/scripts/start_servers_local
@@ -73,8 +73,6 @@ fi
 
 # allow admin to krlogin as root (for cleanup)
 DUMMY=${REALM=SECURE-TEST.OV.COM}; export REALM
-hostname=`hostname`
-QUALNAME=`$TOP/testing/scripts/qualname.pl $hostname`; export QUALNAME
 
 cat - > /tmp/start_servers_local$$ <<\EOF
 if { [catch {

diff --git a/src/lib/rpc/unit-test/lib/helpers.exp b/src/lib/rpc/unit-test/lib/helpers.exp
index 6ba2b10ae13bcc1bc6be303fbce707488b020a7e..f08c732011ace8cc65b537a87e72cd76bcf04b85 100644 (file)
--- a/src/lib/rpc/unit-test/lib/helpers.exp
+++ b/src/lib/rpc/unit-test/lib/helpers.exp
@@ -119,7 +119,7 @@ proc setup_database {} {
 }
 
 if ![info exists CANON_HOST] {
-    set CANON_HOST [exec $env(QUALNAME)]
+    set CANON_HOST $env(QUALNAME)
     setup_database
     file delete $env(RPC_TEST_KEYTAB)
     exec $env(MAKE_KEYTAB) -princ "server/$CANON_HOST" $env(RPC_TEST_KEYTAB)

diff --git a/src/lib/rpc/unit-test/rpc_test_setup.sh b/src/lib/rpc/unit-test/rpc_test_setup.sh
index b610f87efcd4a5d26f50b39e55ddcc0a34f78115..d7df0eb2b5c5e93814d9d75e0fe0521652894ce2 100755 (executable)
--- a/src/lib/rpc/unit-test/rpc_test_setup.sh
+++ b/src/lib/rpc/unit-test/rpc_test_setup.sh
@@ -20,12 +20,9 @@ fi
 
 PATH=$TOP/install/admin:$PATH; export PATH
 
-CANON_HOST=`$QUALNAME`
-export CANON_HOST
-
 cat - > /tmp/rpc_test_setup$$ <<\EOF
 source $env(TCLUTIL)
-set h $env(CANON_HOST)
+set h $env(QUALNAME)
 puts stdout [kadm5_init admin admin $KADM5_ADMIN_SERVICE null $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 server_handle]
 if ![info exists server_handle] { exit 1 }
 puts stdout [kadm5_create_principal $server_handle [simple_principal server/$h] {KADM5_PRINCIPAL} admin]