From: Ken Raeburn <raeburn@mit.edu>
Date: Thu, 1 Feb 2007 00:02:36 +0000 (+0000)
Subject: Don't need to register WRFILE: keytab type, it's already in the compiled-in
X-Git-Tag: krb5-1.7-alpha1~1302
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=29fe5816b01725953e0722546fcb605ecb55c022;p=krb5.git

Don't need to register WRFILE: keytab type, it's already in the compiled-in
list.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19132 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/krb/t_ser.c b/src/lib/krb5/krb/t_ser.c
index 8ddcff7c0..d62bceeb7 100644
--- a/src/lib/krb5/krb/t_ser.c
+++ b/src/lib/krb5/krb/t_ser.c
@@ -411,7 +411,6 @@ ser_keytab_test(krb5_context kcontext, int verbose)
     krb5_error_code	kret;
     char		ccname[128];
     krb5_keytab		keytab;
-    extern krb5_kt_ops	krb5_ktf_writable_ops;
 
     sprintf(ccname, "temp_kt_%d", (int) getpid());
     if (!(kret = krb5_kt_resolve(kcontext, ccname, &keytab)) &&
@@ -424,12 +423,7 @@ ser_keytab_test(krb5_context kcontext, int verbose)
 			      (krb5_pointer) keytab, KV5M_KEYTAB)) &&
 	    !(kret = krb5_kt_close(kcontext, keytab))) {
 	    sprintf(ccname, "WRFILE:temp_kt_%d", (int) getpid());
-	    if ((kret = krb5_kt_resolve(kcontext, ccname, &keytab)))
-		kret = krb5_kt_register(kcontext, &krb5_ktf_writable_ops);
-	    else
-		kret = krb5_kt_close(kcontext, keytab);
-	    if (!kret &&
-		!(kret = krb5_kt_resolve(kcontext, ccname, &keytab)) &&
+	    if (!(kret = krb5_kt_resolve(kcontext, ccname, &keytab)) &&
 		!(kret = ser_data(verbose, "> Resolved WRFILE keytab",
 				  (krb5_pointer) keytab, KV5M_KEYTAB)) &&
 		!(kret = krb5_kt_close(kcontext, keytab))) {
diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c
index f2fb27ad6..79112e7c2 100644
--- a/src/tests/create/kdb5_mkdums.c
+++ b/src/tests/create/kdb5_mkdums.c
@@ -93,7 +93,6 @@ main(argc, argv)
     krb5_error_code retval;
     char *dbname = 0;
     int enctypedone = 0;
-    extern krb5_kt_ops krb5_ktf_writable_ops;
     int num_to_create;
     char principal_string[BUFSIZ];
     char *suffix = 0;
@@ -151,15 +150,6 @@ main(argc, argv)
 
     if (!(num_to_create && suffix)) usage(progname, 1);
 
-
-    if ((retval = krb5_kt_register(test_context, &krb5_ktf_writable_ops))) {
-        if (retval != KRB5_KT_TYPE_EXISTS) {
-	  com_err(progname, retval,
-		"while registering writable key table functions");
-	  exit(1);
-	}
-    }
-
     if (!enctypedone)
 	master_keyblock.enctype = DEFAULT_KDC_ENCTYPE;