diff options
| author | Paul Park <pjpark@mit.edu> | 1995-07-17 19:34:26 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-07-17 19:34:26 +0000 |
| commit | 014c25c2a4825abf099bd91a01daa5f33be0839e (patch) | |
| tree | 1070ee5b62c862c23a592a1c7c02076ddf3f4d54 /src/lib/kdb | |
| parent | cf73e4225b680d56bc04b536c78af4c46eb9226c (diff) | |
| download | krb5-014c25c2a4825abf099bd91a01daa5f33be0839e.tar.gz krb5-014c25c2a4825abf099bd91a01daa5f33be0839e.tar.xz krb5-014c25c2a4825abf099bd91a01daa5f33be0839e.zip | |
Move stash file #define to osconf.h and add stash file name handling
to krb5_db_fetch_mkey().
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6303 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kdb')
| -rw-r--r-- | src/lib/kdb/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/kdb/fetch_mkey.c | 8 | ||||
| -rw-r--r-- | src/lib/kdb/store_mkey.c | 1 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index bdd7bfd3f..2788a436e 100644 --- a/src/lib/kdb/ChangeLog +++ b/src/lib/kdb/ChangeLog @@ -1,3 +1,10 @@ + +Mon Jul 17 15:17:53 EDT 1995 Paul Park (pjpark@mit.edu) + * fetch_mkey.c - Remove inclusion of kdbint.h and add handling of + stash file argument. + * store_mkey.c - Remove inclusion of kdbint.h. The default name of + the stash file is in osconf.h now. + Sat Jul 8 22:37:14 1995 Theodore Y. Ts'o (tytso@dcl) * kdb_dbm.c (kdb5_kdbm_db_create): Make sure the dbm context is diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c index cae97569f..2ef352651 100644 --- a/src/lib/kdb/fetch_mkey.c +++ b/src/lib/kdb/fetch_mkey.c @@ -26,7 +26,6 @@ */ #include "k5-int.h" -#include "kdbint.h" /* these are available to other funcs, and the pointers may be reassigned */ @@ -53,12 +52,13 @@ char *krb5_mkey_pwd_prompt2 = KRB5_KDC_MKEY_2; #endif krb5_error_code -krb5_db_fetch_mkey(context, mname, eblock, fromkeyboard, twice, salt, key) +krb5_db_fetch_mkey(context, mname, eblock, fromkeyboard, twice, keyfile, salt, key) krb5_context context; krb5_principal mname; krb5_encrypt_block * eblock; krb5_boolean fromkeyboard; krb5_boolean twice; + char *keyfile; krb5_data * salt; krb5_keyblock * key; { @@ -108,9 +108,9 @@ krb5_db_fetch_mkey(context, mname, eblock, fromkeyboard, twice, salt, key) (void) strcat(defkeyfile, ""); #ifdef ANSI_STDIO - if (!(kf = fopen(defkeyfile, "rb"))) + if (!(kf = fopen((keyfile) ? keyfile : defkeyfile, "rb"))) #else - if (!(kf = fopen(defkeyfile, "r"))) + if (!(kf = fopen((keyfile) ? keyfile : defkeyfile, "r"))) #endif return KRB5_KDB_CANTREAD_STORED; if (fread((krb5_pointer) &keytype, 2, 1, kf) != 1) { diff --git a/src/lib/kdb/store_mkey.c b/src/lib/kdb/store_mkey.c index ddec7d203..a58d2fe7e 100644 --- a/src/lib/kdb/store_mkey.c +++ b/src/lib/kdb/store_mkey.c @@ -28,7 +28,6 @@ #include <errno.h> #include "k5-int.h" -#include "kdbint.h" /* Just in case sysincl.h didn't get it */ |