From 23965f301f89ecb473c2b5c5e36cbc0a090a0309 Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Thu, 5 Oct 1995 14:41:09 +0000 Subject: [PATCH] Move declaration of std_ks_tuple from kdb5_edit.h to cpw.c (extern part) as not all sources include adm.h for the necessary structures. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6926 dc483132-0cff-0310-8789-dd5450dbe970 --- src/admin/edit/ChangeLog | 6 ++++++ src/admin/edit/cpw.c | 3 +++ src/admin/edit/kdb5_edit.h | 3 --- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog index 4409397cd..774762ef5 100644 --- a/src/admin/edit/ChangeLog +++ b/src/admin/edit/ChangeLog @@ -1,3 +1,9 @@ +Thu Oct 5 10:35:35 1995 Ezra Peisach + + * cpw.c: Declare std_ks_tuple as extern. + * kdb5_edit.h: Remove std_ks_tuple declaration as not all sources + include adm.h for structures + Tue Oct 3 23:10:57 1995 Theodore Y. Ts'o * cpw.c (enter_rnd_key, enter_pwd_key): diff --git a/src/admin/edit/cpw.c b/src/admin/edit/cpw.c index adb8e9c6b..1afc293e9 100644 --- a/src/admin/edit/cpw.c +++ b/src/admin/edit/cpw.c @@ -36,6 +36,9 @@ extern char *Err_no_master_msg; extern char *Err_no_database; extern char *current_dbname; +extern krb5_key_salt_tuple *std_ks_tuple; +extern int std_ks_tuple_count; + /* * I can't figure out any way for this not to be global, given how ss * works. diff --git a/src/admin/edit/kdb5_edit.h b/src/admin/edit/kdb5_edit.h index c04f2ed96..cc988011d 100644 --- a/src/admin/edit/kdb5_edit.h +++ b/src/admin/edit/kdb5_edit.h @@ -36,9 +36,6 @@ struct mblock { krb5_kvno mkvno; }; -extern krb5_key_salt_tuple *std_ks_tuple; -extern int std_ks_tuple_count; - void add_key PROTOTYPE((char const *, char const *, krb5_const_principal, const krb5_keyblock *, -- 2.26.2