Conflicts:
lib/dns/dst_parse.c lib/isc/win32/file.c
This commit is contained in:
@@ -134,7 +134,7 @@ n=`expr $n + 1`
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
echo "I:checking update of an old-style key"
|
||||
echo "I:checking update of an old-style key ($n)"
|
||||
ret=0
|
||||
# printing metadata should not work with an old-style key
|
||||
$SETTIME -pall `cat oldstyle.key` > /dev/null 2>&1 && ret=1
|
||||
@@ -145,5 +145,17 @@ n=`expr $n + 1`
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
echo "I:checking warning about permissions change on key with dnssec-settime ($n)"
|
||||
ret=0
|
||||
# settime should print a warning about changing the permissions
|
||||
chmod 644 `cat oldstyle.key`.private
|
||||
$SETTIME -P none `cat oldstyle.key` > tmp.out 2>&1 || ret=1
|
||||
grep "warning" tmp.out > /dev/null 2>&1 || ret=1
|
||||
$SETTIME -P none `cat oldstyle.key` > tmp.out 2>&1 || ret=1
|
||||
grep "warning" tmp.out > /dev/null 2>&1 && ret=1
|
||||
n=`expr $n + 1`
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
echo "I:exit status: $status"
|
||||
exit $status
|
||||
|
||||
Reference in New Issue
Block a user