From: Andreas Schneider <asn@samba.org>
Date: Wed, 7 Sep 2016 16:40:58 +0000 (+0200)
Subject: Use krb5_db_register_keytab() in kinit, kadmind
X-Git-Tag: krb5-1.15-beta1~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78cf203c0193c9746cc2835d18d66d4b76b2afcf;p=thirdparty%2Fkrb5.git

Use krb5_db_register_keytab() in kinit, kadmind
---

diff --git a/src/clients/kinit/kinit_kdb.c b/src/clients/kinit/kinit_kdb.c
index 0b8af10bd3..47baf9010a 100644
--- a/src/clients/kinit/kinit_kdb.c
+++ b/src/clients/kinit/kinit_kdb.c
@@ -33,7 +33,7 @@
 
 #include <k5-int.h>
 #include <kadm5/admin.h>
-#include <kdb_kt.h>
+#include <kdb.h>
 #include "extern.h"
 
 /** Server handle */
@@ -66,7 +66,7 @@ kinit_kdb_init(krb5_context *pcontext, char *realm)
                         &server_handle);
     if (retval)
         return retval;
-    retval = krb5_kt_register(*pcontext, &krb5_kt_kdb_ops);
+    retval = krb5_db_register_keytab(*pcontext);
     return retval;
 }
 
diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index bf780dcdbe..dd921920fc 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -187,7 +187,7 @@ setup_kdb_keytab()
     ret = krb5_ktkdb_set_context(context);
     if (ret)
         return ret;
-    ret = krb5_kt_register(context, &krb5_kt_kdb_ops);
+    ret = krb5_db_register_keytab(context);
     if (ret)
         return ret;
     return krb5_gss_register_acceptor_identity("KDB:");