* t_ser.c (ser_data): Don't initialize db serialization code that doesn't exist

any more.
(ser_kcontext_test): Don't create and destroy databases.

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 01f9e4956069e798a82e9592ca766c0b96f17220..e40681409ea6f9512aafbc760cf25f1f8dfb6b4f 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-29  Ken Raeburn  <raeburn@mit.edu>
+
+       * t_ser.c (ser_data): Don't initialize db serialization code that
+       doesn't exist any more.
+       (ser_kcontext_test): Don't create and destroy databases.
+
 2005-05-19  Sam Hartman  <hartmans@mit.edu>
 
        * kfree.c (krb5_free_keyblock_contents krb5_free_keyblock):   Make

diff --git a/src/lib/krb5/krb/t_ser.c b/src/lib/krb5/krb/t_ser.c
index 61c6e47979fdf1597055585037e6f45cccf59c69..f25ea8a2e5f8ff8728f062ac7b692ef9242fc1ea 100644 (file)
--- a/src/lib/krb5/krb/t_ser.c
+++ b/src/lib/krb5/krb/t_ser.c
@@ -90,7 +90,6 @@ ser_data(int verbose, char *msg, krb5_pointer ctx, krb5_magic dtype)
            exit(1);
     }
     krb5_ser_context_init(ser_ctx);
-    krb5_ser_db_context_init(ser_ctx);
     krb5_ser_auth_context_init(ser_ctx);
     krb5_ser_ccache_init(ser_ctx);
     krb5_ser_rcache_init(ser_ctx);
@@ -203,6 +202,7 @@ ser_kcontext_test(krb5_context kcontext, int verbose)
     krb5_error_code    kret;
     profile_t          sprofile;
     char               dbname[128];
+    char               *argv[] = { dbname, NULL };
 
     sprintf(dbname, "temp_%d", (int) getpid());
     sprofile = kcontext->profile;
@@ -217,19 +217,7 @@ ser_kcontext_test(krb5_context kcontext, int verbose)
            !(kret = krb5_set_default_realm(kcontext, "this.is.a.test"))) {
            if (!(kret = ser_data(verbose, "> Context with default realm",
                                  (krb5_pointer) kcontext,
-                                 KV5M_CONTEXT)) &&
-               !(kret = krb5_db_create(kcontext, dbname,
-                                       KRB5_KDB_CREATE_BTREE)) &&
-               !(kret = krb5_db_set_name(kcontext, dbname)) &&
-               !(kret = krb5_db_init(kcontext)) &&
-               !(kret = ser_data(verbose, "> Context with open database",
-                                 (krb5_pointer) kcontext,
-                                 KV5M_CONTEXT)) &&
-               !(kret = krb5_db_fini(kcontext)) &&
-               !(kret = ser_data(verbose, "> Context with closed database",
-                                 (krb5_pointer) kcontext, 
                                  KV5M_CONTEXT))) {
-               krb5_db_destroy(kcontext, dbname);
                if (verbose)
                    printf("* krb5_context test succeeded\n");
            }