Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
82f0630b
Commit
82f0630b
authored
Dec 03, 2010
by
Mark Andrews
Browse files
2977. [bug] 'nsupdate -l' report if the session key is missing.
[RT #21670]
parent
6c9e21b4
Changes
4
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
82f0630b
2977. [bug] 'nsupdate -l' report if the session key is missing.
[RT #21670]
2976. [bug] named could die on exit after negotiating a GSS-TSIG
key. [RT #22573]
...
...
bin/nsupdate/nsupdate.c
View file @
82f0630b
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: nsupdate.c,v 1.18
3
2010/12/0
2 23:22:41
marka Exp $ */
/* $Id: nsupdate.c,v 1.18
4
2010/12/0
3 00:37:33
marka Exp $ */
/*! \file */
...
...
@@ -901,9 +901,12 @@ setup_system(void) {
if
(
keystr
!=
NULL
)
setup_keystr
();
else
if
(
local_only
)
read_sessionkey
(
mctx
,
lctx
);
else
if
(
keyfile
!=
NULL
)
else
if
(
local_only
)
{
result
=
read_sessionkey
(
mctx
,
lctx
);
if
(
result
!=
ISC_R_SUCCESS
)
fatal
(
"can't read key from %s: %s
\n
"
,
keyfile
,
isc_result_totext
(
result
));
}
else
if
(
keyfile
!=
NULL
)
setup_keyfile
(
mctx
,
lctx
);
}
...
...
bin/tests/system/nsupdate/clean.sh
View file @
82f0630b
...
...
@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.1
8
2010/1
1/30 23:46:55 tbox
Exp $
# $Id: clean.sh,v 1.1
9
2010/1
2/03 00:37:33 marka
Exp $
#
# Clean up after zone transfer tests.
...
...
@@ -28,3 +28,4 @@ rm -f random.data
rm
-f
ns2/example.bk
rm
-f
ns2/update.bk
rm
-f
*
/named.memstats
rm
-f
nsupdate.out
bin/tests/system/nsupdate/tests.sh
View file @
82f0630b
...
...
@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.3
0
2010/1
1/30 23:46:55 tbox
Exp $
# $Id: tests.sh,v 1.3
1
2010/1
2/03 00:37:33 marka
Exp $
SYSTEMTESTTOP
=
..
.
$SYSTEMTESTTOP
/conf.sh
...
...
@@ -239,5 +239,14 @@ $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd updated4.example.nil.\
@10.53.0.1 a
-p
5300
>
dig.out.ns1
||
status
=
1
$PERL
../digcomp.pl knowngood.ns1.afterstop dig.out.ns1
||
status
=
1
ret
=
0
echo
"I:check that 'nsupdate -l' with a missing keyfile reports the missing file"
$NSUPDATE
-l
-p
5300
-k
ns1/nonexistant.key 2> nsupdate.out < /dev/null
grep
ns1/nonexistant.key nsupdate.out
>
/dev/null
||
ret
=
1
if
test
$ret
-ne
0
then
echo
"I:failed"
;
status
=
1
fi
echo
"I:exit status:
$status
"
exit
$status
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment