Update calling sequence to krb5_db_fetch_mkey()

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

diff --git a/src/kadmin.old/server/ChangeLog b/src/kadmin.old/server/ChangeLog
index f8710bb33aee6da429d71e3aa224745e73cc7e8f..1122d30375ab6c4319e82ec31f24e3b91e0034d3 100644 (file)
--- a/src/kadmin.old/server/ChangeLog
+++ b/src/kadmin.old/server/ChangeLog
@@ -1,4 +1,8 @@
 
+Mon Jul 17 15:11:40 EDT 1995   Paul Park       (pjpark@mit.edu)
+       * adm_server.c - Add NULL stash file argument to krb5_db_fetch_mkey().
+
+
 Fri Jul 7 16:03:56 EDT 1995    Paul Park       (pjpark@mit.edu)
        * Makefile.in - Remove all explicit library handling and LDFLAGS.
        * configure.in - Add USE_<mumble> and KRB5_LIBRARIES.

diff --git a/src/kadmin.old/server/adm_server.c b/src/kadmin.old/server/adm_server.c
index 0276f18f42460641fbc341ab6f3b82d7e8946045..2115800173333fd4db5a3df8fbc18d2f000c78dd 100644 (file)
--- a/src/kadmin.old/server/adm_server.c
+++ b/src/kadmin.old/server/adm_server.c
@@ -239,6 +239,7 @@ process_args(context, argc, argv)
                &master_encblock, 
                manual,
                FALSE,                  /* only read it once, if at all */
+               (char *) NULL,          /* No stash file */
                0,                      /* No salt supplied */
                &master_keyblock)) {
        com_err(argv[0], retval, "while fetching master key");

diff --git a/src/kadmin.v4/server/ChangeLog b/src/kadmin.v4/server/ChangeLog
index 9cf6d7f5b8b118f5973b1dc9ac358d559eeed08d..61ae0e257ebf0fc0bd8fc3aa66c7e0f9346adc68 100644 (file)
--- a/src/kadmin.v4/server/ChangeLog
+++ b/src/kadmin.v4/server/ChangeLog
@@ -1,4 +1,8 @@
 
+Mon Jul 17 15:12:30 EDT 1995   Paul Park       (pjpark@mit.edu)
+       * kadm_ser_wrap.c - Add NULL stash file argument to krb5_db_fetch_mkey.
+
+
 Fri Jul 7 16:05:11 EDT 1995    Paul Park       (pjpark@mit.edu)
        * Makefile.in - Remove all explicit library handling and LDFLAGS.
        * configure.in - Add USE_<mumble> and KRB5_LIBRARIES.

diff --git a/src/kadmin.v4/server/kadm_ser_wrap.c b/src/kadmin.v4/server/kadm_ser_wrap.c
index 46ebc386ce3160409b71f6ef1855d44b9ef50d5c..a2daf2307d2e3568d4f0e5e7560ef37ade68c732 100644 (file)
--- a/src/kadmin.v4/server/kadm_ser_wrap.c
+++ b/src/kadmin.v4/server/kadm_ser_wrap.c
@@ -89,7 +89,7 @@ kadm_ser_init(inter, realm)
        return KADM_NO_MAST;
     krb5_db_fetch_mkey(kadm_context, server_parm.master_princ,
                       &server_parm.master_encblock,
-                      (inter == 1), FALSE, NULL,
+                      (inter == 1), FALSE, (char *) NULL, NULL,
                       &server_parm.master_keyblock);
     if (retval)
        return KADM_NO_MAST;

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 42e7869ec48fd411a9e9cb9418c00490497c07c8..a6125e677dccea65645ad24c1b13b1d83300f799 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,4 +1,8 @@
 
+Mon Jul 17 15:15:01 EDT 1995   Paul Park       (pjpark@mit.edu)
+       * krb524d.c - Add NULL stash file argument to krb5_db_fetch_mkey().
+
+
 Fri Jul 7 16:07:21 EDT 1995    Paul Park       (pjpark@mit.edu)
        * Makefile.in - Remove all explicit library handling and LDFLAGS.
        * configure.in - Add USE_<mumble> and KRB5_LIBRARIES.

diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c
index 4bb7806c02f30dbded88dd6db9ad68378b2dfa3a..da434e77b94fc6484b0a59110e81f61b4795852b 100644 (file)
--- a/src/krb524/krb524d.c
+++ b/src/krb524/krb524d.c
@@ -227,6 +227,7 @@ void init_master(context)
      if ((ret = krb5_db_fetch_mkey(context, master_princ, &master_encblock,
                                  FALSE, /* non-manual type-in */
                                  FALSE, /* irrelevant, given prev. arg */
+                                 (char *) NULL,
                                  0, &master_keyblock))) {
          com_err(whoami, ret, "while fetching master key");
          cleanup_and_exit(1, context);