From 3954b6dc2253b6a0f396b3193ae60539f5e48c19 Mon Sep 17 00:00:00 2001 From: Alexandra Ellwood Date: Thu, 4 May 2006 18:43:20 +0000 Subject: [PATCH] need to export kadm5_set_use_password_server Need to export "kadm5_set_use_password_server" because it is used by krb5kdc when USE_PASSWORD_SERVER is defined. Since the Mac builds this way we need it in the export list. Unfortunately export lists don't get preprocessed. Note that I only added this one function. The rest of the password server functionality is still conditionalized around USE_PASSWORD_SERVER. Hopefully we can rip all this code out when Apple starts using the db plugin interface for their password server integration. ticket: new target_version: 1.5 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17977 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/kadm5/srv/libkadm5srv.exports | 1 + src/lib/kadm5/srv/svr_principal.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/kadm5/srv/libkadm5srv.exports b/src/lib/kadm5/srv/libkadm5srv.exports index e698c6957..2bc56b026 100644 --- a/src/lib/kadm5/srv/libkadm5srv.exports +++ b/src/lib/kadm5/srv/libkadm5srv.exports @@ -13,6 +13,7 @@ hist_key hist_kvno hist_princ init_dict +kadm5_set_use_password_server kadm5_chpass_principal kadm5_chpass_principal_3 kadm5_chpass_principal_util diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index 36ca2a158..f94d7e893 100644 --- a/src/lib/kadm5/srv/svr_principal.c +++ b/src/lib/kadm5/srv/svr_principal.c @@ -1170,8 +1170,6 @@ static kadm5_ret_t add_to_history(krb5_context context, return(0); } -#ifdef USE_PASSWORD_SERVER - /* FIXME: don't use global variable for this */ krb5_boolean use_password_server = 0; @@ -1187,6 +1185,8 @@ kadm5_set_use_password_server (void) use_password_server = 1; } +#ifdef USE_PASSWORD_SERVER + /* * kadm5_launch_task () runs a program (task_path) to synchronize the * Apple password server with the Kerberos database. Password server -- 2.26.2