Skip to content

Commit

Permalink
Eliminate qualname.plin
Browse files Browse the repository at this point in the history
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.

(cherry picked from commit 2a852b1)
  • Loading branch information
greghudson committed Dec 9, 2019
1 parent cd64550 commit 3cf73c5
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 35 deletions.
2 changes: 1 addition & 1 deletion src/kadmin/testing/scripts/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 3 additions & 1 deletion src/kadmin/testing/scripts/env-setup.shin
Original file line number Diff line number Diff line change
Expand Up @@ -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.srvtab; export KRB5_KTNAME
Expand Down
6 changes: 2 additions & 4 deletions src/kadmin/testing/scripts/init_db
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
20 changes: 0 additions & 20 deletions src/kadmin/testing/scripts/qualname.plin

This file was deleted.

3 changes: 1 addition & 2 deletions src/kadmin/testing/scripts/start_servers
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/kadmin/testing/scripts/start_servers_local
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/rpc/unit-test/lib/helpers.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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_SRVTAB)
exec $env(MAKE_KEYTAB) -princ "server/$CANON_HOST" $env(RPC_TEST_SRVTAB)
Expand Down
5 changes: 1 addition & 4 deletions src/lib/rpc/unit-test/rpc_test_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit 3cf73c5

Please sign in to comment.