[26749] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.10]: Always recreate acl files during dejagnu
daemon@ATHENA.MIT.EDU (Tom Yu)
Mon Jul 23 16:26:34 2012
Date: Mon, 23 Jul 2012 16:26:20 -0400
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201207232026.q6NKQK2j028978@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/96056d26de35093cd68b975c6777f79be4fdf49e
commit 96056d26de35093cd68b975c6777f79be4fdf49e
Author: Tom Yu <tlyu@mit.edu>
Date: Wed Jul 11 23:35:44 2012 -0400
Always recreate acl files during dejagnu tests
The dejagnu tests create some persistent acl files containing
hostname-derived principal names. These can get out of date if the
host has changed names since the last time the dejagnu tests were run,
causing failures (notably in iprop.exp). To avoid this problem,
change the dejagnu tests to always create new acl files for each test
run.
(cherry picked from commit 244bb3fde58dd6bab0969e0501b537c5871088f0)
ticket: 7200
version_fixed: 1.10.3
status: resolved
src/tests/dejagnu/config/default.exp | 10 ++++------
src/tests/dejagnu/krb-standalone/iprop.exp | 8 +++-----
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index 796ea37..1ed6aa8 100644
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -874,12 +874,10 @@ proc setup_kerberos_files { } {
}
# Create ACL file.
- if ![file exists $tmppwd/acl] {
- set aclfile [open $tmppwd/acl w]
- puts $aclfile "krbtest/admin@$REALMNAME *"
- puts $aclfile "kiprop/$hostname@$REALMNAME p"
- close $aclfile
- }
+ set aclfile [open $tmppwd/acl w]
+ puts $aclfile "krbtest/admin@$REALMNAME *"
+ puts $aclfile "kiprop/$hostname@$REALMNAME p"
+ close $aclfile
# Create dictfile file.
if ![file exists $tmppwd/dictfile] {
diff --git a/src/tests/dejagnu/krb-standalone/iprop.exp b/src/tests/dejagnu/krb-standalone/iprop.exp
index aff4dc2..0170bb6 100644
--- a/src/tests/dejagnu/krb-standalone/iprop.exp
+++ b/src/tests/dejagnu/krb-standalone/iprop.exp
@@ -5,11 +5,9 @@ proc setup_slave {} {
global tmppwd hostname REALMNAME KDB5_UTIL
file delete $tmppwd/slave-stash $tmppwd/slave-acl
file copy -force $tmppwd/acl $tmppwd/slave-acl
- if ![file exists $tmppwd/kpropdacl] {
- set aclfile [open $tmppwd/kpropd-acl w]
- puts $aclfile "host/$hostname@$REALMNAME"
- close $aclfile
- }
+ set aclfile [open $tmppwd/kpropd-acl w]
+ puts $aclfile "host/$hostname@$REALMNAME"
+ close $aclfile
setup_slave_db
# copy database - must be used after master db set up
envstack_push
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
