conditionalize ka-server reading support on KASERVER_DB

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4889 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1998-05-16 05:11:12 +00:00
parent dbfbe5f88a
commit 31f12b41a0

View File

@@ -55,7 +55,7 @@ static krb5_data msched5;
#ifdef KRB4 #ifdef KRB4
static int v4_db; static int v4_db;
#ifdef KA_SERVER #ifdef KASERVER_DB
static int ka_db; static int ka_db;
static char *afs_cell; static char *afs_cell;
#endif #endif
@@ -226,7 +226,7 @@ out:
return ret; return ret;
} }
#ifdef KA_SERVER #ifdef KASERVER_DB
#include "kadb.h" #include "kadb.h"
@@ -337,7 +337,7 @@ ka_dump(struct prop_data *pd, const char *file, const char *cell)
return 0; return 0;
} }
#endif /* KA_SERVER */ #endif /* KASERVER_DB */
#endif /* KRB4 */ #endif /* KRB4 */
@@ -350,7 +350,7 @@ struct getargs args[] = {
#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" },
#endif #endif
#ifdef KA_SERVER #ifdef KASERVER_DB
{ "ka-db", 'K', arg_flag, &ka_db, "use kaserver database" }, { "ka-db", 'K', arg_flag, &ka_db, "use kaserver database" },
{ "cell", 'c', arg_string, &afs_cell, "name of AFS cell" }, { "cell", 'c', arg_string, &afs_cell, "name of AFS cell" },
#endif #endif
@@ -468,7 +468,7 @@ int main(int argc, char **argv)
if(e) krb5_errx(context, 1, "kdb_get_master_key: %s", krb_get_err_text(e)); if(e) krb5_errx(context, 1, "kdb_get_master_key: %s", krb_get_err_text(e));
e = krb_get_lrealm(realm, 1); e = krb_get_lrealm(realm, 1);
if(e) krb5_errx(context, 1, "krb_get_lrealm: %s", krb_get_err_text(e)); if(e) krb5_errx(context, 1, "krb_get_lrealm: %s", krb_get_err_text(e));
#ifdef KA_SERVER #ifdef KASERVER_DB
}else if(ka_db) { }else if(ka_db) {
e = krb_get_lrealm(realm, 1); e = krb_get_lrealm(realm, 1);
if(e) krb5_errx(context, 1, "krb_get_lrealm: %s", krb_get_err_text(e)); if(e) krb5_errx(context, 1, "krb_get_lrealm: %s", krb_get_err_text(e));
@@ -496,7 +496,7 @@ int main(int argc, char **argv)
if(e) if(e)
krb5_errx(context, 1, "kerb_db_iterate: %s", krb5_errx(context, 1, "kerb_db_iterate: %s",
krb_get_err_text(e)); krb_get_err_text(e));
#ifdef KA_SERVER #ifdef KASERVER_DB
} else if(ka_db) { } else if(ka_db) {
e = ka_dump(&pd, database, afs_cell); e = ka_dump(&pd, database, afs_cell);
if(e) krb5_errx(context, 1, "ka_dump: %s", krb_get_err_text(e)); if(e) krb5_errx(context, 1, "ka_dump: %s", krb_get_err_text(e));
@@ -553,7 +553,7 @@ int main(int argc, char **argv)
#ifdef KRB4 #ifdef KRB4
if(v4_db) if(v4_db)
e = kerb_db_iterate ((k_iter_proc_t)v4_prop, &pd); e = kerb_db_iterate ((k_iter_proc_t)v4_prop, &pd);
#ifdef KA_SERVER #ifdef KASERVER_DB
else if(ka_db) { else if(ka_db) {
e = ka_dump(&pd, database, afs_cell); e = ka_dump(&pd, database, afs_cell);
if(e) krb5_errx(context, 1, "ka_dump: %s", if(e) krb5_errx(context, 1, "ka_dump: %s",