oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

abstract out --no-afslog and --no-unlog

Browse Source
This commit is contained in:
Love Hornquist Astrand
2010-06-01 14:42:16 -07:00
parent d94ba7a5de
commit 86da42df1d
18 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/bin/setup-env.in
View File

@@ -43,6 +43,14 @@ have_db="${top_builddir}/tests/db/have-db"
leaks_kill="${top_srcdir}/tests/kdc/leaks-kill.sh" leaks_kill="${top_srcdir}/tests/kdc/leaks-kill.sh"
wait_kdc="${top_srcdir}/tests/kdc/wait-kdc.sh" wait_kdc="${top_srcdir}/tests/kdc/wait-kdc.sh"
if [ ! "${NO_AFS}" ] ; then
afs_no_unlog="--no-unlog"
afs_no_afslog="--no-afslog"
else
afs_no_unlog=""
afs_no_afslog=""
fi
# data # data
hx509_data="${top_srcdir}/lib/hx509/data" hx509_data="${top_srcdir}/lib/hx509/data"

4
tests/gss/check-basic.in
View File

@@ -51,8 +51,8 @@ cache="FILE:krb5ccfile"
cache2="FILE:krb5ccfile2" cache2="FILE:krb5ccfile2"
nocache="FILE:no-such-cache" nocache="FILE:no-such-cache"
kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog" kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache ${afs_no_afslog}"
kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache --no-unlog" kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache ${afs_no_unlog}"
klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache" klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache"
kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"

2
tests/gss/check-context.in
View File

@@ -49,7 +49,7 @@ keytab="FILE:${keytabfile}"
nokeytab="FILE:no-such-keytab" nokeytab="FILE:no-such-keytab"
cache="FILE:krb5ccfile" cache="FILE:krb5ccfile"
kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog" kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache ${afs_no_afslog}"
klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache" klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache"
kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache" kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache"
kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"

4
tests/gss/check-ntlm.in
View File

@@ -49,8 +49,8 @@ keytab="FILE:${keytabfile}"
cache="FILE:krb5ccfile" cache="FILE:krb5ccfile"
cacheds="FILE:krb5ccfile-ds" cacheds="FILE:krb5ccfile-ds"
kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog" kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache ${afs_no_afslog}"
kinitds="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cacheds --no-afslog" kinitds="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cacheds ${afs_no_afslog}"
kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
kdigest="${TESTS_ENVIRONMENT} ../../kuser/kdigest" kdigest="${TESTS_ENVIRONMENT} ../../kuser/kdigest"

4
tests/gss/check-spnego.in
View File

@@ -49,8 +49,8 @@ keytab="FILE:${keytabfile}"
cache="FILE:krb5ccfile" cache="FILE:krb5ccfile"
cacheds="FILE:krb5ccfile-ds" cacheds="FILE:krb5ccfile-ds"
kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog --forwardable" kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache ${afs_no_afslog} --forwardable"
kinitds="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cacheds --no-afslog" kinitds="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cacheds ${afs_no_afslog}"
kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"

4
tests/kdc/check-cc.in
View File

@@ -51,8 +51,8 @@ R=TEST.H5L.SE
port=@port@ port=@port@
pwport=@pwport@ pwport=@pwport@
kinit="${kinit} --password-file=${objdir}/foopassword --no-afslog" kinit="${kinit} --password-file=${objdir}/foopassword ${afs_no_afslog}"
test ! "${NO_AFS}" && kdestroy="${kdestroy} --no-unlog" kdestroy="${kdestroy} ${afs_no_unlog}"
kadmin="${kadmin} -l -r $R" kadmin="${kadmin} -l -r $R"
kdc="${kdc} --addresses=localhost -P $port" kdc="${kdc} --addresses=localhost -P $port"

4
tests/kdc/check-delegation.in
View File

@@ -54,10 +54,10 @@ kdc="${kdc} --addresses=localhost -P $port"
server=host/datan.test4.h5l.se@TEST4.H5L.ORG server=host/datan.test4.h5l.se@TEST4.H5L.ORG
cache="FILE:${objdir}/cache.krb5" cache="FILE:${objdir}/cache.krb5"
kinit="${kinit} -c $cache --no-afslog" kinit="${kinit} -c $cache ${afs_no_afslog}"
klist="${klist} -c $cache" klist="${klist} -c $cache"
kgetcred="${kgetcred} -c $cache" kgetcred="${kgetcred} -c $cache"
kdestroy="${kdestroy} -c $cache --no-unlog" kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"
KRB5_CONFIG="${objdir}/krb5.conf" KRB5_CONFIG="${objdir}/krb5.conf"
export KRB5_CONFIG export KRB5_CONFIG

4
tests/kdc/check-des.in
View File

@@ -54,10 +54,10 @@ afsserver=afs/test.h5l.se
hostserver=host/server.test.h5l.se hostserver=host/server.test.h5l.se
cache="FILE:${objdir}/cache.krb5" cache="FILE:${objdir}/cache.krb5"
kinit="${kinit} -c $cache --no-afslog" kinit="${kinit} -c $cache ${afs_no_afslog}"
klist="${klist} -c $cache" klist="${klist} -c $cache"
kgetcred="${kgetcred} -c $cache" kgetcred="${kgetcred} -c $cache"
kdestroy="${kdestroy} -c $cache --no-unlog" kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"
KRB5_CONFIG="${objdir}/krb5.conf" KRB5_CONFIG="${objdir}/krb5.conf"
export KRB5_CONFIG export KRB5_CONFIG

2
tests/kdc/check-digest.in
View File

@@ -56,7 +56,7 @@ ocache="FILE:${objdir}/ocache.krb5"
keytabfile=${objdir}/server.keytab keytabfile=${objdir}/server.keytab
keytab="FILE:${keytabfile}" keytab="FILE:${keytabfile}"
kinit="${kinit} -c $cache --no-afslog" kinit="${kinit} -c $cache ${afs_no_afslog}"
klist="${klist} -c $cache" klist="${klist} -c $cache"
kdigest="${kdigest} --ccache=$cache" kdigest="${kdigest} --ccache=$cache"

2
tests/kdc/check-iprop.in
View File

@@ -54,7 +54,7 @@ keytab="FILE:${keytabfile}"
kdc="${kdc} --addresses=localhost -P $port" kdc="${kdc} --addresses=localhost -P $port"
kadmin="${kadmin} -r $R" kadmin="${kadmin} -r $R"
kinit="${kinit} -c $cache --no-afslog" kinit="${kinit} -c $cache ${afs_no_afslog}"
KRB5_CONFIG="${objdir}/krb5.conf" KRB5_CONFIG="${objdir}/krb5.conf"
export KRB5_CONFIG export KRB5_CONFIG

4
tests/kdc/check-kadmin.in
View File

@@ -55,9 +55,9 @@ kadmind="${kadmind} -p $admport"
server=host/datan.test.h5l.se server=host/datan.test.h5l.se
kinit="${kinit} -c $cache --no-afslog" kinit="${kinit} -c $cache ${afs_no_afslog}"
kgetcred="${kgetcred} -c $cache" kgetcred="${kgetcred} -c $cache"
kdestroy="${kdestroy} -c $cache --no-unlog" kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"
KRB5_CONFIG="${objdir}/krb5.conf" KRB5_CONFIG="${objdir}/krb5.conf"
export KRB5_CONFIG export KRB5_CONFIG

4
tests/kdc/check-kdc.in
View File

@@ -70,11 +70,11 @@ keytab="FILE:${keytabfile}"
ps="proxy-service@${R}" ps="proxy-service@${R}"
aesenctype="aes256-cts-hmac-sha1-96" aesenctype="aes256-cts-hmac-sha1-96"
kinit="${kinit} -c $cache --no-afslog" kinit="${kinit} -c $cache ${afs_no_afslog}"
klist="${klist} -c $cache" klist="${klist} -c $cache"
kgetcred="${kgetcred} -c $cache" kgetcred="${kgetcred} -c $cache"
kgetcred_imp="${kgetcred} -c $cache --out-cache=${ocache}" kgetcred_imp="${kgetcred} -c $cache --out-cache=${ocache}"
kdestroy="${kdestroy} -c $cache --no-unlog" kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"
kimpersonate="${kimpersonate} -k ${keytab} --ccache=${ocache}" kimpersonate="${kimpersonate} -k ${keytab} --ccache=${ocache}"
rm -f ${keytabfile} rm -f ${keytabfile}

4
tests/kdc/check-kpasswdd.in
View File

@@ -60,10 +60,10 @@ cache="FILE:${objdir}/cache.krb5"
keytabfile=${objdir}/server.keytab keytabfile=${objdir}/server.keytab
keytab="FILE:${keytabfile}" keytab="FILE:${keytabfile}"
kinit="${kinit} -c $cache --no-afslog" kinit="${kinit} -c $cache ${afs_no_afslog}"
klist="${klist} -c $cache" klist="${klist} -c $cache"
kgetcred="${kgetcred} -c $cache" kgetcred="${kgetcred} -c $cache"
kdestroy="${kdestroy} -c $cache --no-unlog" kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"
KRB5_CONFIG="${objdir}/krb5.conf" KRB5_CONFIG="${objdir}/krb5.conf"
export KRB5_CONFIG export KRB5_CONFIG

4
tests/kdc/check-pkinit.in
View File

@@ -54,9 +54,9 @@ cache="FILE:${objdir}/cache.krb5"
keyfile="${hx509_data}/key.der" keyfile="${hx509_data}/key.der"
keyfile2="${hx509_data}/key2.der" keyfile2="${hx509_data}/key2.der"
kinit="${kinit} -c $cache --no-afslog" kinit="${kinit} -c $cache ${afs_no_afslog}"
kgetcred="${kgetcred} -c $cache" kgetcred="${kgetcred} -c $cache"
kdestroy="${kdestroy} -c $cache --no-unlog" kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"
KRB5_CONFIG="${objdir}/krb5-pkinit.conf" KRB5_CONFIG="${objdir}/krb5-pkinit.conf"
export KRB5_CONFIG export KRB5_CONFIG

4
tests/kdc/check-referral.in
View File

@@ -54,10 +54,10 @@ kdc="${kdc} --addresses=localhost -P $port"
cache="FILE:${objdir}/cache.krb5" cache="FILE:${objdir}/cache.krb5"
kinit="${kinit} -c $cache --no-afslog" kinit="${kinit} -c $cache ${afs_no_afslog}"
klist="${klist} -c $cache" klist="${klist} -c $cache"
kgetcred="${kgetcred} -c $cache" kgetcred="${kgetcred} -c $cache"
kdestroy="${kdestroy} -c $cache --no-unlog" kdestroy="${kdestroy} -c $cache ${afs_no_unlog}"
KRB5_CONFIG="${objdir}/krb5.conf" KRB5_CONFIG="${objdir}/krb5.conf"

8
tests/kdc/check-uu.in
View File

@@ -54,10 +54,10 @@ kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
cache1="FILE:${objdir}/cache1.krb5" cache1="FILE:${objdir}/cache1.krb5"
cache2="FILE:${objdir}/cache2.krb5" cache2="FILE:${objdir}/cache2.krb5"
kinit1="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache1 --no-afslog" kinit1="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache1 ${afs_no_afslog}"
kinit2="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache2 --no-afslog" kinit2="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache2 ${afs_no_afslog}"
kdestroy1="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache1 --no-unlog" kdestroy1="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache1 ${afs_no_unlog}"
kdestroy2="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache2 --no-unlog" kdestroy2="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache2 ${afs_no_unlog}"
uu_server="${TESTS_ENVIRONMENT} ../../appl/test/uu_server" uu_server="${TESTS_ENVIRONMENT} ../../appl/test/uu_server"
uu_client="${TESTS_ENVIRONMENT} ../../appl/test/uu_client" uu_client="${TESTS_ENVIRONMENT} ../../appl/test/uu_client"

2
tests/ldap/check-ldap.in
View File

@@ -45,7 +45,7 @@ port=@port@
server=host/datan.test.h5l.se server=host/datan.test.h5l.se
cache="FILE:${objdir}/cache.krb5" cache="FILE:${objdir}/cache.krb5"
kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog" kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache ${afs_no_afslog}"
kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache" kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache"
kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"

4
tests/plugin/check-pac.in
View File

@@ -55,10 +55,10 @@ cache="FILE:${objdir}/cache.krb5"
keytabfile=${objdir}/server.keytab keytabfile=${objdir}/server.keytab
keytab="FILE:${keytabfile}" keytab="FILE:${keytabfile}"
kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog" kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache ${afs_no_afslog}"
klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache" klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache"
kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache" kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache"
kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache --no-unlog" kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache ${afs_no_unlog}"
test_apreq="${TESTS_ENVIRONMENT} ../../lib/krb5/test_ap-req" test_apreq="${TESTS_ENVIRONMENT} ../../lib/krb5/test_ap-req"
KRB5_CONFIG="${objdir}/krb5.conf" KRB5_CONFIG="${objdir}/krb5.conf"