aboutsummaryrefslogtreecommitdiff
path: root/lib/isccc
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2008-07-12 08:12:46 +0000
committerDoug Barton <dougb@FreeBSD.org>2008-07-12 08:12:46 +0000
commitcba78608de638f8cc6d1d48a2b3072e82386b70d (patch)
tree2857dd6ab984105d7ac37bbcfc816607c48ccc1d /lib/isccc
parentf16b9a8f9e30675de8048c5832ffbb3f50f2fdc4 (diff)
vendor/bind9/9.3.5
Diffstat (limited to 'lib/isccc')
-rw-r--r--lib/isccc/api2
-rw-r--r--lib/isccc/cc.c19
-rw-r--r--lib/isccc/include/isccc/Makefile.in8
-rw-r--r--lib/isccc/include/isccc/lib.h8
-rw-r--r--lib/isccc/include/isccc/version.h8
-rw-r--r--lib/isccc/lib.c8
-rw-r--r--lib/isccc/sexpr.c8
-rw-r--r--lib/isccc/symtab.c10
-rw-r--r--lib/isccc/version.c8
9 files changed, 44 insertions, 35 deletions
diff --git a/lib/isccc/api b/lib/isccc/api
index 8c77091b90c5..bc239a7d7753 100644
--- a/lib/isccc/api
+++ b/lib/isccc/api
@@ -1,3 +1,3 @@
LIBINTERFACE = 2
-LIBREVISION = 2
+LIBREVISION = 3
LIBAGE = 2
diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c
index ccf8c686aee5..8786e4814fe9 100644
--- a/lib/isccc/cc.c
+++ b/lib/isccc/cc.c
@@ -1,5 +1,5 @@
/*
- * Portions Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 2001-2003 Internet Software Consortium.
* Portions Copyright (C) 2001 Nominum, Inc.
*
@@ -16,7 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: cc.c,v 1.4.2.3.2.5 2004/08/28 06:25:23 marka Exp $ */
+/* $Id: cc.c,v 1.4.2.3.2.7 2006/12/07 23:57:57 marka Exp $ */
#include <config.h>
@@ -466,12 +466,21 @@ createmessage(isc_uint32_t version, const char *from, const char *to,
result = ISC_R_NOMEMORY;
_ctrl = isccc_alist_create();
+ if (_ctrl == NULL)
+ goto bad;
+ if (isccc_alist_define(alist, "_ctrl", _ctrl) == NULL) {
+ isccc_sexpr_free(&_ctrl);
+ goto bad;
+ }
+
_data = isccc_alist_create();
- if (_ctrl == NULL || _data == NULL)
+ if (_data == NULL)
goto bad;
- if (isccc_alist_define(alist, "_ctrl", _ctrl) == NULL ||
- isccc_alist_define(alist, "_data", _data) == NULL)
+ if (isccc_alist_define(alist, "_data", _data) == NULL) {
+ isccc_sexpr_free(&_data);
goto bad;
+ }
+
if (isccc_cc_defineuint32(_ctrl, "_ser", serial) == NULL ||
isccc_cc_defineuint32(_ctrl, "_tim", now) == NULL ||
(want_expires &&
diff --git a/lib/isccc/include/isccc/Makefile.in b/lib/isccc/include/isccc/Makefile.in
index b86e50cf39e2..910002d744f0 100644
--- a/lib/isccc/include/isccc/Makefile.in
+++ b/lib/isccc/include/isccc/Makefile.in
@@ -1,7 +1,7 @@
-# Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2001 Internet Software Consortium.
+# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2003 Internet Software Consortium.
#
-# Permission to use, copy, modify, and distribute this software for any
+# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
@@ -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.3.12.3 2004/03/08 09:05:05 marka Exp $
+# $Id: Makefile.in,v 1.3.12.6 2007/08/28 07:19:17 tbox Exp $
srcdir = @srcdir@
VPATH = @srcdir@
diff --git a/lib/isccc/include/isccc/lib.h b/lib/isccc/include/isccc/lib.h
index a57357d28005..d695343fa23f 100644
--- a/lib/isccc/include/isccc/lib.h
+++ b/lib/isccc/include/isccc/lib.h
@@ -1,9 +1,9 @@
/*
- * Portions Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001 Internet Software Consortium.
+ * Portions Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2003 Internet Software Consortium.
* Portions Copyright (C) 2001 Nominum, Inc.
*
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
@@ -16,7 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: lib.h,v 1.2.12.3 2004/03/08 09:05:05 marka Exp $ */
+/* $Id: lib.h,v 1.2.12.6 2007/08/28 07:19:17 tbox Exp $ */
#ifndef ISCCC_LIB_H
#define ISCCC_LIB_H 1
diff --git a/lib/isccc/include/isccc/version.h b/lib/isccc/include/isccc/version.h
index 36a909c51494..9be1c53cffa9 100644
--- a/lib/isccc/include/isccc/version.h
+++ b/lib/isccc/include/isccc/version.h
@@ -1,8 +1,8 @@
/*
- * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2001 Internet Software Consortium.
+ * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2001, 2003 Internet Software Consortium.
*
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: version.h,v 1.2.222.3 2004/03/08 09:05:05 marka Exp $ */
+/* $Id: version.h,v 1.2.222.6 2007/08/28 07:19:17 tbox Exp $ */
#include <isc/platform.h>
diff --git a/lib/isccc/lib.c b/lib/isccc/lib.c
index d37e28c768f0..29ad400d5837 100644
--- a/lib/isccc/lib.c
+++ b/lib/isccc/lib.c
@@ -1,9 +1,9 @@
/*
- * Portions Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001 Internet Software Consortium.
+ * Portions Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2003 Internet Software Consortium.
* Portions Copyright (C) 2001 Nominum, Inc.
*
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
@@ -16,7 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: lib.c,v 1.2.12.3 2004/03/08 09:05:04 marka Exp $ */
+/* $Id: lib.c,v 1.2.12.6 2007/08/28 07:19:17 tbox Exp $ */
#include <config.h>
diff --git a/lib/isccc/sexpr.c b/lib/isccc/sexpr.c
index a372a7d2aa71..53fc152236ef 100644
--- a/lib/isccc/sexpr.c
+++ b/lib/isccc/sexpr.c
@@ -1,9 +1,9 @@
/*
- * Portions Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001 Internet Software Consortium.
+ * Portions Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2003 Internet Software Consortium.
* Portions Copyright (C) 2001 Nominum, Inc.
*
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
@@ -16,7 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: sexpr.c,v 1.2.12.3 2004/03/08 09:05:04 marka Exp $ */
+/* $Id: sexpr.c,v 1.2.12.6 2007/08/28 07:19:17 tbox Exp $ */
#include <config.h>
diff --git a/lib/isccc/symtab.c b/lib/isccc/symtab.c
index 6aca4850f4da..d0bacc34a72f 100644
--- a/lib/isccc/symtab.c
+++ b/lib/isccc/symtab.c
@@ -1,9 +1,9 @@
/*
- * Portions Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001 Internet Software Consortium.
+ * Portions Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2001, 2003 Internet Software Consortium.
* Portions Copyright (C) 2001 Nominum, Inc.
*
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
@@ -16,16 +16,16 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: symtab.c,v 1.3.12.3 2004/03/08 09:05:04 marka Exp $ */
+/* $Id: symtab.c,v 1.3.12.7 2007/09/13 05:18:08 each Exp $ */
#include <config.h>
#include <ctype.h>
#include <stdlib.h>
-#include <string.h>
#include <isc/assertions.h>
#include <isc/magic.h>
+#include <isc/string.h>
#include <isccc/result.h>
#include <isccc/symtab.h>
diff --git a/lib/isccc/version.c b/lib/isccc/version.c
index 08cda2f33dad..99fcf17feeb6 100644
--- a/lib/isccc/version.c
+++ b/lib/isccc/version.c
@@ -1,8 +1,8 @@
/*
- * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1998-2001 Internet Software Consortium.
+ * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2003 Internet Software Consortium.
*
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: version.c,v 1.1.12.3 2004/03/08 09:05:04 marka Exp $ */
+/* $Id: version.c,v 1.1.12.6 2007/08/28 07:19:17 tbox Exp $ */
#include <isccc/version.h>
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-30 18:24:22 +0000