diff options
| author | Erwin Lansing <erwin@FreeBSD.org> | 2012-12-17 10:58:24 +0000 |
|---|---|---|
| committer | Erwin Lansing <erwin@FreeBSD.org> | 2012-12-17 10:58:24 +0000 |
| commit | 823eb5f9dd4d336a5cd85e9129ab1da5676191df (patch) | |
| tree | 840dc4ed116d4d74d5bf86e593e1d96d38b4b07f /lib/isccc | |
| parent | e65fce108837a6a80efa79ff174877e27db324c0 (diff) | |
| download | src-vendor/bind9-9.6.tar.gz src-vendor/bind9-9.6.zip | |
Vendor import of Bind 9.6-ESV-R8vendor/bind9/9.6-ESV-R8vendor/bind9-9.6
Approved by: delphij (mentor)
Sponsored by: DK Hostmaster A/S
Notes
Notes:
svn path=/vendor/bind9/dist-9.6/; revision=244353
svn path=/vendor/bind9/9.6-ESV-R8/; revision=244354; tag=vendor/bind9/9.6-ESV-R8
Diffstat (limited to 'lib/isccc')
| -rw-r--r-- | lib/isccc/api | 2 | ||||
| -rw-r--r-- | lib/isccc/cc.c | 6 | ||||
| -rw-r--r-- | lib/isccc/include/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/isccc/include/isccc/Makefile.in | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/isccc/api b/lib/isccc/api index d7da70cea3a1..eee306167cee 100644 --- a/lib/isccc/api +++ b/lib/isccc/api @@ -4,5 +4,5 @@ # 9.8: 80-89 # 9.9: 90-109 LIBINTERFACE = 50 -LIBREVISION = 2 +LIBREVISION = 3 LIBAGE = 0 diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c index b549d6cb9e2e..1ab9479855ee 100644 --- a/lib/isccc/cc.c +++ b/lib/isccc/cc.c @@ -399,8 +399,6 @@ table_fromwire(isccc_region_t *source, isccc_region_t *secret, first_tag = ISC_FALSE; } - *alistp = alist; - if (secret != NULL) { if (checksum_rstart != NULL) result = verify(alist, checksum_rstart, @@ -412,7 +410,9 @@ table_fromwire(isccc_region_t *source, isccc_region_t *secret, result = ISC_R_SUCCESS; bad: - if (result != ISC_R_SUCCESS) + if (result == ISC_R_SUCCESS) + *alistp = alist; + else isccc_sexpr_free(&alist); return (result); diff --git a/lib/isccc/include/Makefile.in b/lib/isccc/include/Makefile.in index 9f727c306ca3..6b222a52267d 100644 --- a/lib/isccc/include/Makefile.in +++ b/lib/isccc/include/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/isccc/include/isccc/Makefile.in b/lib/isccc/include/isccc/Makefile.in index ae5bec758a0f..c4af19a74968 100644 --- a/lib/isccc/include/isccc/Makefile.in +++ b/lib/isccc/include/isccc/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2012 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any |