summaryrefslogtreecommitdiff
path: root/lib/isccc
diff options
context:
space:
mode:
Diffstat (limited to 'lib/isccc')
-rw-r--r--lib/isccc/Makefile.in4
-rw-r--r--lib/isccc/alist.c2
-rw-r--r--lib/isccc/api7
-rw-r--r--lib/isccc/base64.c2
-rw-r--r--lib/isccc/cc.c29
-rw-r--r--lib/isccc/ccmsg.c2
-rw-r--r--lib/isccc/include/Makefile.in2
-rw-r--r--lib/isccc/include/isccc/Makefile.in2
-rw-r--r--lib/isccc/include/isccc/alist.h2
-rw-r--r--lib/isccc/include/isccc/base64.h2
-rw-r--r--lib/isccc/include/isccc/cc.h2
-rw-r--r--lib/isccc/include/isccc/ccmsg.h2
-rw-r--r--lib/isccc/include/isccc/events.h2
-rw-r--r--lib/isccc/include/isccc/lib.h2
-rw-r--r--lib/isccc/include/isccc/result.h2
-rw-r--r--lib/isccc/include/isccc/sexpr.h2
-rw-r--r--lib/isccc/include/isccc/symtab.h2
-rw-r--r--lib/isccc/include/isccc/symtype.h2
-rw-r--r--lib/isccc/include/isccc/types.h2
-rw-r--r--lib/isccc/include/isccc/util.h2
-rw-r--r--lib/isccc/include/isccc/version.h2
-rw-r--r--lib/isccc/lib.c2
-rw-r--r--lib/isccc/result.c2
-rw-r--r--lib/isccc/sexpr.c2
-rw-r--r--lib/isccc/symtab.c2
-rw-r--r--lib/isccc/version.c2
26 files changed, 46 insertions, 40 deletions
diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index de92bd30510d7..efa834133c735 100644
--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2009, 2011 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2001, 2003 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-# $Id: Makefile.in,v 1.12.244.2 2011-02-28 01:20:04 tbox Exp $
+# $Id$
srcdir = @srcdir@
VPATH = @srcdir@
diff --git a/lib/isccc/alist.c b/lib/isccc/alist.c
index a4a912eb78c06..4f1743ed49726 100644
--- a/lib/isccc/alist.c
+++ b/lib/isccc/alist.c
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: alist.c,v 1.8 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: alist.c,v 1.8 2007/08/28 07:20:43 tbox Exp $ */
/*! \file */
diff --git a/lib/isccc/api b/lib/isccc/api
index 94575eb4ef20c..a629bf746325b 100644
--- a/lib/isccc/api
+++ b/lib/isccc/api
@@ -1,3 +1,8 @@
+# LIBINTERFACE ranges
+# 9.6: 50-59, 110-119
+# 9.7: 60-79
+# 9.8: 80-89
+# 9.9: 90-109
LIBINTERFACE = 80
-LIBREVISION = 0
+LIBREVISION = 1
LIBAGE = 0
diff --git a/lib/isccc/base64.c b/lib/isccc/base64.c
index 6c1a7bf3773a7..78b34edf4f921 100644
--- a/lib/isccc/base64.c
+++ b/lib/isccc/base64.c
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: base64.c,v 1.8 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: base64.c,v 1.8 2007/08/28 07:20:43 tbox Exp $ */
/*! \file */
diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c
index 9f5a60ca77942..b549d6cb9e2ed 100644
--- a/lib/isccc/cc.c
+++ b/lib/isccc/cc.c
@@ -1,5 +1,5 @@
/*
- * Portions Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2007, 2012 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 2001-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: cc.c,v 1.18 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: cc.c,v 1.18 2007/08/28 07:20:43 tbox Exp $ */
/*! \file */
@@ -403,16 +403,17 @@ table_fromwire(isccc_region_t *source, isccc_region_t *secret,
if (secret != NULL) {
if (checksum_rstart != NULL)
- return (verify(alist, checksum_rstart,
- (source->rend - checksum_rstart),
- secret));
- return (ISCCC_R_BADAUTH);
- }
-
- return (ISC_R_SUCCESS);
+ result = verify(alist, checksum_rstart,
+ (source->rend - checksum_rstart),
+ secret);
+ else
+ result = ISCCC_R_BADAUTH;
+ } else
+ result = ISC_R_SUCCESS;
bad:
- isccc_sexpr_free(&alist);
+ if (result != ISC_R_SUCCESS)
+ isccc_sexpr_free(&alist);
return (result);
}
@@ -439,7 +440,7 @@ list_fromwire(isccc_region_t *source, isccc_sexpr_t **listp)
}
*listp = list;
-
+
return (ISC_R_SUCCESS);
}
@@ -455,8 +456,8 @@ isccc_cc_fromwire(isccc_region_t *source, isccc_sexpr_t **alistp,
return (ISC_R_UNEXPECTEDEND);
GET32(version, source->rstart);
if (version != 1)
- return (ISCCC_R_UNKNOWNVERSION);
-
+ return (ISCCC_R_UNKNOWNVERSION);
+
return (table_fromwire(source, secret, alistp));
}
@@ -507,7 +508,7 @@ createmessage(isc_uint32_t version, const char *from, const char *to,
if (to != NULL &&
isccc_cc_definestring(_ctrl, "_to", to) == NULL)
goto bad;
-
+
*alistp = alist;
return (ISC_R_SUCCESS);
diff --git a/lib/isccc/ccmsg.c b/lib/isccc/ccmsg.c
index c94d90f70a4eb..298fc22d3485a 100644
--- a/lib/isccc/ccmsg.c
+++ b/lib/isccc/ccmsg.c
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: ccmsg.c,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: ccmsg.c,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
/*! \file */
diff --git a/lib/isccc/include/Makefile.in b/lib/isccc/include/Makefile.in
index 240560fec2c65..9f727c306ca3a 100644
--- a/lib/isccc/include/Makefile.in
+++ b/lib/isccc/include/Makefile.in
@@ -13,7 +13,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-# $Id: Makefile.in,v 1.5 2007-06-19 23:47:22 tbox Exp $
+# $Id: Makefile.in,v 1.5 2007/06/19 23:47:22 tbox Exp $
srcdir = @srcdir@
VPATH = @srcdir@
diff --git a/lib/isccc/include/isccc/Makefile.in b/lib/isccc/include/isccc/Makefile.in
index ba52f3fc21d4c..ae5bec758a0f3 100644
--- a/lib/isccc/include/isccc/Makefile.in
+++ b/lib/isccc/include/isccc/Makefile.in
@@ -13,7 +13,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-# $Id: Makefile.in,v 1.7 2007-06-19 23:47:22 tbox Exp $
+# $Id: Makefile.in,v 1.7 2007/06/19 23:47:22 tbox Exp $
srcdir = @srcdir@
VPATH = @srcdir@
diff --git a/lib/isccc/include/isccc/alist.h b/lib/isccc/include/isccc/alist.h
index 54100a312170b..29147a625bf60 100644
--- a/lib/isccc/include/isccc/alist.h
+++ b/lib/isccc/include/isccc/alist.h
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: alist.h,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: alist.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
#ifndef ISCCC_ALIST_H
#define ISCCC_ALIST_H 1
diff --git a/lib/isccc/include/isccc/base64.h b/lib/isccc/include/isccc/base64.h
index f39aef1f56629..795b0449dcefd 100644
--- a/lib/isccc/include/isccc/base64.h
+++ b/lib/isccc/include/isccc/base64.h
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: base64.h,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: base64.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
#ifndef ISCCC_BASE64_H
#define ISCCC_BASE64_H 1
diff --git a/lib/isccc/include/isccc/cc.h b/lib/isccc/include/isccc/cc.h
index 2f72b27fde588..79393be7b186e 100644
--- a/lib/isccc/include/isccc/cc.h
+++ b/lib/isccc/include/isccc/cc.h
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: cc.h,v 1.11 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: cc.h,v 1.11 2007/08/28 07:20:43 tbox Exp $ */
#ifndef ISCCC_CC_H
#define ISCCC_CC_H 1
diff --git a/lib/isccc/include/isccc/ccmsg.h b/lib/isccc/include/isccc/ccmsg.h
index 8479345a0936b..e25aa510b25af 100644
--- a/lib/isccc/include/isccc/ccmsg.h
+++ b/lib/isccc/include/isccc/ccmsg.h
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: ccmsg.h,v 1.11 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: ccmsg.h,v 1.11 2007/08/28 07:20:43 tbox Exp $ */
#ifndef ISCCC_CCMSG_H
#define ISCCC_CCMSG_H 1
diff --git a/lib/isccc/include/isccc/events.h b/lib/isccc/include/isccc/events.h
index bf2c4055134aa..a3e14703d475c 100644
--- a/lib/isccc/include/isccc/events.h
+++ b/lib/isccc/include/isccc/events.h
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: events.h,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: events.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
#ifndef ISCCC_EVENTS_H
#define ISCCC_EVENTS_H 1
diff --git a/lib/isccc/include/isccc/lib.h b/lib/isccc/include/isccc/lib.h
index 6de52ed93cea0..de74666b010c9 100644
--- a/lib/isccc/include/isccc/lib.h
+++ b/lib/isccc/include/isccc/lib.h
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: lib.h,v 1.11 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: lib.h,v 1.11 2007/08/28 07:20:43 tbox Exp $ */
#ifndef ISCCC_LIB_H
#define ISCCC_LIB_H 1
diff --git a/lib/isccc/include/isccc/result.h b/lib/isccc/include/isccc/result.h
index 13a09c7fc134e..2d54969d71dd3 100644
--- a/lib/isccc/include/isccc/result.h
+++ b/lib/isccc/include/isccc/result.h
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: result.h,v 1.12 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: result.h,v 1.12 2007/08/28 07:20:43 tbox Exp $ */
#ifndef ISCCC_RESULT_H
#define ISCCC_RESULT_H 1
diff --git a/lib/isccc/include/isccc/sexpr.h b/lib/isccc/include/isccc/sexpr.h
index e0e5af587fbaf..6112631cb048e 100644
--- a/lib/isccc/include/isccc/sexpr.h
+++ b/lib/isccc/include/isccc/sexpr.h
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: sexpr.h,v 1.11 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: sexpr.h,v 1.11 2007/08/28 07:20:43 tbox Exp $ */
#ifndef ISCCC_SEXPR_H
#define ISCCC_SEXPR_H 1
diff --git a/lib/isccc/include/isccc/symtab.h b/lib/isccc/include/isccc/symtab.h
index 031e851db1a76..77a188ac42612 100644
--- a/lib/isccc/include/isccc/symtab.h
+++ b/lib/isccc/include/isccc/symtab.h
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: symtab.h,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: symtab.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
#ifndef ISCCC_SYMTAB_H
#define ISCCC_SYMTAB_H 1
diff --git a/lib/isccc/include/isccc/symtype.h b/lib/isccc/include/isccc/symtype.h
index d007997afedbf..c8e6868c37ddd 100644
--- a/lib/isccc/include/isccc/symtype.h
+++ b/lib/isccc/include/isccc/symtype.h
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: symtype.h,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: symtype.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
#ifndef ISCCC_SYMTYPE_H
#define ISCCC_SYMTYPE_H 1
diff --git a/lib/isccc/include/isccc/types.h b/lib/isccc/include/isccc/types.h
index 2ff494c27d05f..fd5c9f3e1f3aa 100644
--- a/lib/isccc/include/isccc/types.h
+++ b/lib/isccc/include/isccc/types.h
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: types.h,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: types.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
#ifndef ISCCC_TYPES_H
#define ISCCC_TYPES_H 1
diff --git a/lib/isccc/include/isccc/util.h b/lib/isccc/include/isccc/util.h
index dda3b5eafa543..2e36b6e32dc03 100644
--- a/lib/isccc/include/isccc/util.h
+++ b/lib/isccc/include/isccc/util.h
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: util.h,v 1.11 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: util.h,v 1.11 2007/08/28 07:20:43 tbox Exp $ */
#ifndef ISCCC_UTIL_H
#define ISCCC_UTIL_H 1
diff --git a/lib/isccc/include/isccc/version.h b/lib/isccc/include/isccc/version.h
index d352a1b550270..869316c273112 100644
--- a/lib/isccc/include/isccc/version.h
+++ b/lib/isccc/include/isccc/version.h
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: version.h,v 1.9 2007-06-19 23:47:22 tbox Exp $ */
+/* $Id: version.h,v 1.9 2007/06/19 23:47:22 tbox Exp $ */
/*! \file isccc/version.h */
diff --git a/lib/isccc/lib.c b/lib/isccc/lib.c
index 43edcf131007d..17170f5dde8c9 100644
--- a/lib/isccc/lib.c
+++ b/lib/isccc/lib.c
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: lib.c,v 1.9 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: lib.c,v 1.9 2007/08/28 07:20:43 tbox Exp $ */
/*! \file */
diff --git a/lib/isccc/result.c b/lib/isccc/result.c
index e37fc06fa013c..cbedc16fb0cd9 100644
--- a/lib/isccc/result.c
+++ b/lib/isccc/result.c
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: result.c,v 1.10 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: result.c,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
/*! \file */
diff --git a/lib/isccc/sexpr.c b/lib/isccc/sexpr.c
index 0f14ab91a8d98..e96536dfce5d4 100644
--- a/lib/isccc/sexpr.c
+++ b/lib/isccc/sexpr.c
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: sexpr.c,v 1.9 2007-08-28 07:20:43 tbox Exp $ */
+/* $Id: sexpr.c,v 1.9 2007/08/28 07:20:43 tbox Exp $ */
/*! \file */
diff --git a/lib/isccc/symtab.c b/lib/isccc/symtab.c
index 1fc7b5f1dfb8f..d7ae68790de22 100644
--- a/lib/isccc/symtab.c
+++ b/lib/isccc/symtab.c
@@ -29,7 +29,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: symtab.c,v 1.11 2007-09-13 04:45:18 each Exp $ */
+/* $Id: symtab.c,v 1.11 2007/09/13 04:45:18 each Exp $ */
/*! \file */
diff --git a/lib/isccc/version.c b/lib/isccc/version.c
index 35c4253936fa1..c9d912405bebd 100644
--- a/lib/isccc/version.c
+++ b/lib/isccc/version.c
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: version.c,v 1.7 2007-06-19 23:47:22 tbox Exp $ */
+/* $Id: version.c,v 1.7 2007/06/19 23:47:22 tbox Exp $ */
/*! \file */
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-26 03:57:52 +0000