diff options
Diffstat (limited to 'usr.sbin/bind/lib/isccc')
| -rw-r--r-- | usr.sbin/bind/lib/isccc/Makefile.in | 8 | ||||
| -rw-r--r-- | usr.sbin/bind/lib/isccc/api | 6 | ||||
| -rw-r--r-- | usr.sbin/bind/lib/isccc/cc.c | 12 | ||||
| -rw-r--r-- | usr.sbin/bind/lib/isccc/include/isccc/result.h | 11 | ||||
| -rw-r--r-- | usr.sbin/bind/lib/isccc/result.c | 9 |
5 files changed, 26 insertions, 20 deletions
diff --git a/usr.sbin/bind/lib/isccc/Makefile.in b/usr.sbin/bind/lib/isccc/Makefile.in index b925e23d63b..2ccebefcdbd 100644 --- a/usr.sbin/bind/lib/isccc/Makefile.in +++ b/usr.sbin/bind/lib/isccc/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2001 Internet Software Consortium. +# Copyright (C) 2001, 2003 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $ISC: Makefile.in,v 1.2 2001/07/09 22:25:26 gson Exp $ +# $ISC: Makefile.in,v 1.2.2.2 2003/10/09 07:32:53 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -31,7 +31,7 @@ CDEFINES = CWARNINGS = ISCLIBS = ../../lib/isc/libisc.@A@ -ISCCCLIBS = ../../lib/cc/libisccc.@A@ +ISCCCLIBS = ../../lib/isccc/libisccc.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ ISCCCDEPLIBS = libisccc.@A@ @@ -71,7 +71,7 @@ libisccc.la: ${OBJS} ${LIBTOOL} --mode=link \ ${CC} ${ALL_CFLAGS} -o libisccc.la -rpath ${libdir} \ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ - ${OBJS} ${LIBS} + ${OBJS} ${LIBS} ${ISCLIBS} timestamp: libisccc.@A@ touch timestamp diff --git a/usr.sbin/bind/lib/isccc/api b/usr.sbin/bind/lib/isccc/api index 06977fcb711..13178156a49 100644 --- a/usr.sbin/bind/lib/isccc/api +++ b/usr.sbin/bind/lib/isccc/api @@ -1,3 +1,3 @@ -LIBINTERFACE = 0 -LIBREVISION = 1 -LIBAGE = 0 +LIBINTERFACE = 1 +LIBREVISION = 0 +LIBAGE = 1 diff --git a/usr.sbin/bind/lib/isccc/cc.c b/usr.sbin/bind/lib/isccc/cc.c index 342a8d5855d..df81f47e36c 100644 --- a/usr.sbin/bind/lib/isccc/cc.c +++ b/usr.sbin/bind/lib/isccc/cc.c @@ -1,6 +1,6 @@ /* - * Portions Copyright (C) 2001, 2002 Internet Software Consortium. - * Portions Copyright (C) 2001, 2002 Nominum, Inc. + * Portions Copyright (C) 2001-2003 Internet Software Consortium. + * Portions Copyright (C) 2001-2003 Nominum, Inc. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -16,7 +16,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $ISC: cc.c,v 1.4.2.2 2002/03/26 00:55:13 marka Exp $ */ +/* $ISC: cc.c,v 1.4.2.4 2003/10/09 07:32:53 marka Exp $ */ #include <config.h> @@ -105,7 +105,7 @@ value_towire(isccc_sexpr_t *elt, isccc_region_t *target) * the placeholder length too. Adjust and * emit. */ - INSIST(len >= 4); + INSIST(len >= 4U); len -= 4; PUT32(len, lenp); } else if (isccc_sexpr_listp(elt)) { @@ -128,7 +128,7 @@ value_towire(isccc_sexpr_t *elt, isccc_region_t *target) * 'len' is 4 bytes too big, since it counts * the placeholder length. Adjust and emit. */ - INSIST(len >= 4); + INSIST(len >= 4U); len -= 4; PUT32(len, lenp); } @@ -152,7 +152,7 @@ table_towire(isccc_sexpr_t *alist, isccc_region_t *target) ks = isccc_sexpr_tostring(k); v = ISCCC_SEXPR_CDR(kv); len = strlen(ks); - INSIST(len <= 255); + INSIST(len <= 255U); /* * Emit the key name. */ diff --git a/usr.sbin/bind/lib/isccc/include/isccc/result.h b/usr.sbin/bind/lib/isccc/include/isccc/result.h index 4f1e573c463..fba41b8e5e7 100644 --- a/usr.sbin/bind/lib/isccc/include/isccc/result.h +++ b/usr.sbin/bind/lib/isccc/include/isccc/result.h @@ -1,6 +1,6 @@ /* - * Portions Copyright (C) 2001 Internet Software Consortium. - * Portions Copyright (C) 2001 Nominum, Inc. + * Portions Copyright (C) 2001, 2003 Internet Software Consortium. + * Portions Copyright (C) 2001, 2003 Nominum, Inc. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -16,7 +16,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $ISC: result.h,v 1.3 2001/03/28 23:11:41 bwelling Exp $ */ +/* $ISC: result.h,v 1.3.2.2 2003/07/22 04:03:53 marka Exp $ */ #ifndef ISCCC_RESULT_H #define ISCCC_RESULT_H 1 @@ -30,8 +30,11 @@ #define ISCCC_R_UNKNOWNVERSION (ISC_RESULTCLASS_ISCCC + 0) #define ISCCC_R_SYNTAX (ISC_RESULTCLASS_ISCCC + 1) #define ISCCC_R_BADAUTH (ISC_RESULTCLASS_ISCCC + 2) +#define ISCCC_R_EXPIRED (ISC_RESULTCLASS_ISCCC + 3) +#define ISCCC_R_CLOCKSKEW (ISC_RESULTCLASS_ISCCC + 4) +#define ISCCC_R_DUPLICATE (ISC_RESULTCLASS_ISCCC + 5) -#define ISCCC_R_NRESULTS 3 /* Number of results */ +#define ISCCC_R_NRESULTS 6 /* Number of results */ ISC_LANG_BEGINDECLS diff --git a/usr.sbin/bind/lib/isccc/result.c b/usr.sbin/bind/lib/isccc/result.c index 9e86390428f..e0847eaa448 100644 --- a/usr.sbin/bind/lib/isccc/result.c +++ b/usr.sbin/bind/lib/isccc/result.c @@ -1,6 +1,6 @@ /* - * Portions Copyright (C) 2001 Internet Software Consortium. - * Portions Copyright (C) 2001 Nominum, Inc. + * Portions Copyright (C) 2001, 2003 Internet Software Consortium. + * Portions Copyright (C) 2001, 2003 Nominum, Inc. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -16,7 +16,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $ISC: result.c,v 1.3 2001/03/28 23:11:40 bwelling Exp $ */ +/* $ISC: result.c,v 1.3.2.2 2003/07/22 04:03:52 marka Exp $ */ #include <config.h> @@ -30,6 +30,9 @@ static const char *text[ISCCC_R_NRESULTS] = { "unknown version", /* 1 */ "syntax error", /* 2 */ "bad auth", /* 3 */ + "expired", /* 4 */ + "clock skew", /* 5 */ + "duplicate" /* 6 */ }; #define ISCCC_RESULT_RESULTSET 2 |