Commit f731b5d6 authored by Automatic Updater's avatar Automatic Updater

update copyright notice

parent 4cda4fd1
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2001-2003 Internet Software Consortium. * Copyright (C) 2001-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: config.c,v 1.83 2008/01/22 00:29:03 jinmei Exp $ */ /* $Id: config.c,v 1.84 2008/01/22 23:28:04 tbox Exp $ */
/*! \file */ /*! \file */
...@@ -407,7 +407,7 @@ ns_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp, ...@@ -407,7 +407,7 @@ ns_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp,
static isc_result_t static isc_result_t
get_masters_def(const cfg_obj_t *cctx, const char *name, get_masters_def(const cfg_obj_t *cctx, const char *name,
const cfg_obj_t **ret) const cfg_obj_t **ret)
{ {
isc_result_t result; isc_result_t result;
const cfg_obj_t *masters = NULL; const cfg_obj_t *masters = NULL;
...@@ -525,7 +525,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, ...@@ -525,7 +525,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
tresult = get_masters_def(config, listname, &list); tresult = get_masters_def(config, listname, &list);
if (tresult == ISC_R_NOTFOUND) { if (tresult == ISC_R_NOTFOUND) {
cfg_obj_log(addr, ns_g_lctx, ISC_LOG_ERROR, cfg_obj_log(addr, ns_g_lctx, ISC_LOG_ERROR,
"masters \"%s\" not found", listname); "masters \"%s\" not found", listname);
result = tresult; result = tresult;
goto cleanup; goto cleanup;
...@@ -603,7 +603,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, ...@@ -603,7 +603,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
if (keys[i] == NULL) if (keys[i] == NULL)
goto cleanup; goto cleanup;
dns_name_init(keys[i], NULL); dns_name_init(keys[i], NULL);
keystr = cfg_obj_asstring(key); keystr = cfg_obj_asstring(key);
isc_buffer_init(&b, keystr, strlen(keystr)); isc_buffer_init(&b, keystr, strlen(keystr));
isc_buffer_add(&b, strlen(keystr)); isc_buffer_add(&b, strlen(keystr));
...@@ -659,7 +659,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, ...@@ -659,7 +659,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
isc_mem_put(mctx, lists, listcount * sizeof(*lists)); isc_mem_put(mctx, lists, listcount * sizeof(*lists));
if (stack != NULL) if (stack != NULL)
isc_mem_put(mctx, stack, stackcount * sizeof(*stack)); isc_mem_put(mctx, stack, stackcount * sizeof(*stack));
INSIST(keycount == addrcount); INSIST(keycount == addrcount);
*addrsp = addrs; *addrsp = addrs;
......
/* /*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 2001 Internet Software Consortium. * Copyright (C) 2000, 2001 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: lwdnoop.c,v 1.12 2008/01/22 01:51:16 marka Exp $ */ /* $Id: lwdnoop.c,v 1.13 2008/01/22 23:28:04 tbox Exp $ */
/*! \file */ /*! \file */
......
/* /*
* Portions Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2002 Internet Software Consortium. * Portions Copyright (C) 1999-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
/*% /*%
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: dst_parse.c,v 1.11 2008/01/22 01:34:15 marka Exp $ * $Id: dst_parse.c,v 1.12 2008/01/22 23:28:04 tbox Exp $
*/ */
#include <config.h> #include <config.h>
......
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 2001 Internet Software Consortium. * Copyright (C) 2000, 2001 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: gssapictx.c,v 1.9 2008/01/22 11:47:54 marka Exp $ */ /* $Id: gssapictx.c,v 1.10 2008/01/22 23:28:04 tbox Exp $ */
#include <config.h> #include <config.h>
...@@ -129,7 +129,7 @@ name_to_gbuffer(dns_name_t *name, isc_buffer_t *buffer, ...@@ -129,7 +129,7 @@ name_to_gbuffer(dns_name_t *name, isc_buffer_t *buffer,
dns_name_getlabelsequence(name, 0, labels - 1, &tname); dns_name_getlabelsequence(name, 0, labels - 1, &tname);
namep = &tname; namep = &tname;
} }
result = dns_name_totext(namep, ISC_FALSE, buffer); result = dns_name_totext(namep, ISC_FALSE, buffer);
isc_buffer_putuint8(buffer, 0); isc_buffer_putuint8(buffer, 0);
isc_buffer_usedregion(buffer, &r); isc_buffer_usedregion(buffer, &r);
...@@ -433,7 +433,7 @@ dst_gssapi_releasecred(gss_cred_id_t *cred) { ...@@ -433,7 +433,7 @@ dst_gssapi_releasecred(gss_cred_id_t *cred) {
char buf[1024]; char buf[1024];
REQUIRE(cred != NULL && *cred != NULL); REQUIRE(cred != NULL && *cred != NULL);
gret = gss_release_cred(&minor, cred); gret = gss_release_cred(&minor, cred);
if (gret != GSS_S_COMPLETE) { if (gret != GSS_S_COMPLETE) {
/* Log the error, but still free the credential's memory */ /* Log the error, but still free the credential's memory */
...@@ -441,7 +441,7 @@ dst_gssapi_releasecred(gss_cred_id_t *cred) { ...@@ -441,7 +441,7 @@ dst_gssapi_releasecred(gss_cred_id_t *cred) {
gss_error_tostring(gret, minor, buf, sizeof(buf))); gss_error_tostring(gret, minor, buf, sizeof(buf)));
} }
*cred = NULL; *cred = NULL;
return(ISC_R_SUCCESS); return(ISC_R_SUCCESS);
#else #else
UNUSED(cred); UNUSED(cred);
...@@ -467,7 +467,7 @@ dst_gssapi_initctx(dns_name_t *name, isc_buffer_t *intoken, ...@@ -467,7 +467,7 @@ dst_gssapi_initctx(dns_name_t *name, isc_buffer_t *intoken,
/* Client must pass us a valid gss_ctx_id_t here */ /* Client must pass us a valid gss_ctx_id_t here */
REQUIRE(gssctx != NULL); REQUIRE(gssctx != NULL);
isc_buffer_init(&namebuf, array, sizeof(array)); isc_buffer_init(&namebuf, array, sizeof(array));
name_to_gbuffer(name, &namebuf, &gnamebuf); name_to_gbuffer(name, &namebuf, &gnamebuf);
...@@ -501,7 +501,7 @@ dst_gssapi_initctx(dns_name_t *name, isc_buffer_t *intoken, ...@@ -501,7 +501,7 @@ dst_gssapi_initctx(dns_name_t *name, isc_buffer_t *intoken,
result = ISC_R_FAILURE; result = ISC_R_FAILURE;
goto out; goto out;
} }
/* /*
* XXXSRA Not handled yet: RFC 3645 3.1.1: check ret_flags * XXXSRA Not handled yet: RFC 3645 3.1.1: check ret_flags
* MUTUAL and INTEG flags, fail if either not set. * MUTUAL and INTEG flags, fail if either not set.
...@@ -691,7 +691,7 @@ gss_error_tostring(isc_uint32_t major, isc_uint32_t minor, ...@@ -691,7 +691,7 @@ gss_error_tostring(isc_uint32_t major, isc_uint32_t minor,
/* Handle major status */ /* Handle major status */
msg_ctx = 0; msg_ctx = 0;
(void)gss_display_status(&minor_stat, major, GSS_C_GSS_CODE, (void)gss_display_status(&minor_stat, major, GSS_C_GSS_CODE,
GSS_C_NULL_OID, &msg_ctx, &msg_major); GSS_C_NULL_OID, &msg_ctx, &msg_major);
/* Handle minor status */ /* Handle minor status */
msg_ctx = 0; msg_ctx = 0;
...@@ -700,14 +700,14 @@ gss_error_tostring(isc_uint32_t major, isc_uint32_t minor, ...@@ -700,14 +700,14 @@ gss_error_tostring(isc_uint32_t major, isc_uint32_t minor,
snprintf(buf, buflen, "GSSAPI error: Major = %s, Minor = %s.", snprintf(buf, buflen, "GSSAPI error: Major = %s, Minor = %s.",
(char *)msg_major.value, (char *)msg_minor.value); (char *)msg_major.value, (char *)msg_minor.value);
(void)gss_release_buffer(&minor_stat, &msg_major); (void)gss_release_buffer(&minor_stat, &msg_major);
(void)gss_release_buffer(&minor_stat, &msg_minor); (void)gss_release_buffer(&minor_stat, &msg_minor);
return(buf); return(buf);
#else #else
snprintf(buf, buflen, "GSSAPI error: Major = %u, Minor = %u.", snprintf(buf, buflen, "GSSAPI error: Major = %u, Minor = %u.",
major, minor); major, minor);
return (buf); return (buf);
#endif #endif
} }
......
This diff is collapsed.
/* /*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2002 Internet Software Consortium. * Copyright (C) 2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: apl_42.c,v 1.13 2008/01/22 23:17:31 marka Exp $ */ /* $Id: apl_42.c,v 1.14 2008/01/22 23:28:04 tbox Exp $ */
/* RFC3123 */ /* RFC3123 */
...@@ -49,7 +49,7 @@ fromtext_in_apl(ARGS_FROMTEXT) { ...@@ -49,7 +49,7 @@ fromtext_in_apl(ARGS_FROMTEXT) {
isc_tokentype_string, ISC_TRUE)); isc_tokentype_string, ISC_TRUE));
if (token.type != isc_tokentype_string) if (token.type != isc_tokentype_string)
break; break;
cp = DNS_AS_STR(token); cp = DNS_AS_STR(token);
neg = ISC_TF(*cp == '!'); neg = ISC_TF(*cp == '!');
if (neg) if (neg)
...@@ -259,7 +259,7 @@ fromstruct_in_apl(ARGS_FROMSTRUCT) { ...@@ -259,7 +259,7 @@ fromstruct_in_apl(ARGS_FROMSTRUCT) {
REQUIRE(apl->common.rdtype == type); REQUIRE(apl->common.rdtype == type);
REQUIRE(apl->common.rdclass == rdclass); REQUIRE(apl->common.rdclass == rdclass);
REQUIRE(apl->apl != NULL || apl->apl_len == 0); REQUIRE(apl->apl != NULL || apl->apl_len == 0);
isc_buffer_init(&b, apl->apl, apl->apl_len); isc_buffer_init(&b, apl->apl, apl->apl_len);
isc_buffer_add(&b, apl->apl_len); isc_buffer_add(&b, apl->apl_len);
isc_buffer_setactive(&b, apl->apl_len); isc_buffer_setactive(&b, apl->apl_len);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment