diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2009-05-31 05:42:58 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2009-05-31 05:42:58 +0000 |
| commit | 6318052d9e161cbc69e4085125ef824d94de16ef (patch) | |
| tree | 21a5399cf53ce4f1ffedece1c1700a317f190f2e /contrib/bind9/bin/named/tkeyconf.c | |
| parent | b6d434fc28de9fa7b453178184bdcc767035f5af (diff) | |
| parent | b0e69f719c1db2c19fcfba96f0dac9a5a2277350 (diff) | |
Notes
Diffstat (limited to 'contrib/bind9/bin/named/tkeyconf.c')
| -rw-r--r-- | contrib/bind9/bin/named/tkeyconf.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/contrib/bind9/bin/named/tkeyconf.c b/contrib/bind9/bin/named/tkeyconf.c index 3c843acfa815..82cf573bf7ff 100644 --- a/contrib/bind9/bin/named/tkeyconf.c +++ b/contrib/bind9/bin/named/tkeyconf.c @@ -1,8 +1,8 @@ /* - * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 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: tkeyconf.c,v 1.20.18.6 2006/03/02 00:37:21 marka Exp $ */ +/* $Id: tkeyconf.c,v 1.29 2007/06/19 23:46:59 tbox Exp $ */ /*! \file */ @@ -42,6 +42,13 @@ goto failure; \ } while (0) +#include<named/log.h> +#define LOG(msg) \ + isc_log_write(ns_g_lctx, \ + NS_LOGCATEGORY_GENERAL, \ + NS_LOGMODULE_SERVER, \ + ISC_LOG_ERROR, \ + "%s", msg) isc_result_t ns_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, @@ -100,6 +107,7 @@ ns_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, result = cfg_map_get(options, "tkey-gssapi-credential", &obj); if (result == ISC_R_SUCCESS) { s = cfg_obj_asstring(obj); + isc_buffer_init(&b, s, strlen(s)); isc_buffer_add(&b, strlen(s)); dns_fixedname_init(&fname); |