[29637] in CVS-changelog-for-Kerberos-V5
krb5 commit: Use krb5_db_register_keytab() in kinit, kadmind
daemon@ATHENA.MIT.EDU (Greg Hudson)
Thu Sep 8 11:01:35 2016
Date: Thu, 8 Sep 2016 11:01:30 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201609081501.u88F1UAL006429@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/78cf203c0193c9746cc2835d18d66d4b76b2afcf
commit 78cf203c0193c9746cc2835d18d66d4b76b2afcf
Author: Andreas Schneider <asn@samba.org>
Date: Wed Sep 7 18:40:58 2016 +0200
Use krb5_db_register_keytab() in kinit, kadmind
src/clients/kinit/kinit_kdb.c | 4 ++--
src/kadmin/server/ovsec_kadmd.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/clients/kinit/kinit_kdb.c b/src/clients/kinit/kinit_kdb.c
index 0b8af10..47baf90 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 bf780dc..dd92192 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:");
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
