cvs updates from Mon Dec 20 21:24:21 EST 2010

[tridge/bind9.git] / bin / named / tkeyconf.c

diff --git a/bin/named/tkeyconf.c b/bin/named/tkeyconf.c
index e11aaa22d34ebc0833b771ffb31465c473ecc7ad..b1fbfbd9c4a1982f986f553b847eb3857dff08f5 100644 (file)
--- a/bin/named/tkeyconf.c
+++ b/bin/named/tkeyconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkeyconf.c,v 1.31 2009/09/02 23:48:01 tbox Exp $ */
+/* $Id: tkeyconf.c,v 1.32 2010/12/18 01:56:19 each Exp $ */
 
 /*! \file */
 
@@ -114,6 +114,18 @@ ns_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx,
                RETERR(dst_gssapi_acquirecred(name, ISC_FALSE, &tctx->gsscred));
        }
 
+       obj = NULL;
+       result = cfg_map_get(options, "tkey-gssapi-keytab", &obj);
+       if (result == ISC_R_SUCCESS) {
+               s = cfg_obj_asstring(obj);
+               tctx->gssapi_keytab = isc_mem_strdup(mctx, s);
+               if (tctx->gssapi_keytab == NULL) {
+                       result = ISC_R_NOMEMORY;
+                       goto failure;
+               }
+       }
+
+
        *tctxp = tctx;
        return (ISC_R_SUCCESS);