diff options
| author | Paul Park <pjpark@mit.edu> | 1995-07-17 19:36:58 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-07-17 19:36:58 +0000 |
| commit | 0440abd0eb59d500e910322890941c0caa369c43 (patch) | |
| tree | 67acda72f0bc7d83fe62db027582cb0d6181a6df /src | |
| parent | 98b59e5b55dda7eef896bb9edfc36a5b13b1eccb (diff) | |
| download | krb5-0440abd0eb59d500e910322890941c0caa369c43.tar.gz krb5-0440abd0eb59d500e910322890941c0caa369c43.tar.xz krb5-0440abd0eb59d500e910322890941c0caa369c43.zip | |
Update calling sequence to krb5_db_fetch_mkey()
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6305 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/kadmin.old/server/ChangeLog | 4 | ||||
| -rw-r--r-- | src/kadmin.old/server/adm_server.c | 1 | ||||
| -rw-r--r-- | src/kadmin.v4/server/ChangeLog | 4 | ||||
| -rw-r--r-- | src/kadmin.v4/server/kadm_ser_wrap.c | 2 | ||||
| -rw-r--r-- | src/krb524/ChangeLog | 4 | ||||
| -rw-r--r-- | src/krb524/krb524d.c | 1 |
6 files changed, 15 insertions, 1 deletions
diff --git a/src/kadmin.old/server/ChangeLog b/src/kadmin.old/server/ChangeLog index f8710bb33..1122d3037 100644 --- 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 0276f18f4..211580017 100644 --- 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 9cf6d7f5b..61ae0e257 100644 --- 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 46ebc386c..a2daf2307 100644 --- 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 42e7869ec..a6125e677 100644 --- 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 4bb7806c0..da434e77b 100644 --- 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); |