oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

declare some variables unconditionally to simplify things

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6485 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-07-22 11:21:24 +00:00
parent c147b7d93d
commit cb5dfa1f84
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
kdc/hprop.c
View File

@@ -52,12 +52,14 @@ static int decrypt_flag;
static EncryptionKey mkey5; static EncryptionKey mkey5;
static krb5_data msched5; static krb5_data msched5;
#ifdef KRB4
static int v4_db; static int v4_db;
#ifdef KASERVER_DB
static int ka_db; static int ka_db;
static char *afs_cell; static char *afs_cell;
#ifdef KRB4
static char *realm;
#ifdef KASERVER_DB
static int kaspecials_flag; static int kaspecials_flag;
#endif #endif
#endif #endif
@@ -125,7 +127,7 @@ v5_prop(krb5_context context, HDB *db, hdb_entry *entry, void *appdata)
#ifdef KRB4 #ifdef KRB4
static des_cblock mkey4; static des_cblock mkey4;
static des_key_schedule msched4; static des_key_schedule msched4;
static char realm[REALM_SZ]; static char realm_buf[REALM_SZ];
static int static int
v4_prop(void *arg, Principal *p) v4_prop(void *arg, Principal *p)
@@ -382,6 +384,7 @@ struct getargs args[] = {
{ "database", 'd', arg_string, &database, "database", "file" }, { "database", 'd', arg_string, &database, "database", "file" },
#ifdef KRB4 #ifdef KRB4
{ "v4-db", '4', arg_flag, &v4_db, "use version 4 database" }, { "v4-db", '4', arg_flag, &v4_db, "use version 4 database" },
{ "v4-realm", 'r', arg_string, &realm, "v4 realm to use" },
#endif #endif
#ifdef KASERVER_DB #ifdef KASERVER_DB
{ "ka-db", 'K', arg_flag, &ka_db, "use kaserver database" }, { "ka-db", 'K', arg_flag, &ka_db, "use kaserver database" },
@@ -609,6 +612,22 @@ main(int argc, char **argv)
} }
#ifdef KRB4 #ifdef KRB4
if (v4_db
#ifdef KASERVER_DB
|| ka_db
#endif
) {
int e;
if (realm == NULL) {
e = krb_get_lrealm(realm_buf, 1);
if(e)
krb5_errx(context, 1, "krb_get_lrealm: %s",
krb_get_err_text(e));
realm = realm_buf;
}
}
if(v4_db) { if(v4_db) {
int e = kerb_db_set_name (database); int e = kerb_db_set_name (database);
if(e) if(e)
@@ -618,16 +637,6 @@ main(int argc, char **argv)
if(e) if(e)
krb5_errx(context, 1, "kdb_get_master_key: %s", krb5_errx(context, 1, "kdb_get_master_key: %s",
krb_get_err_text(e)); krb_get_err_text(e));
e = krb_get_lrealm(realm, 1);
if(e)
krb5_errx(context, 1, "krb_get_lrealm: %s",
krb_get_err_text(e));
#ifdef KASERVER_DB
} else if(ka_db) {
int e = krb_get_lrealm(realm, 1);
if(e)
krb5_errx(context, 1, "krb_get_lrealm: %s", krb_get_err_text(e));
#endif
} else } else
#endif #endif
{ {