* lib/kadm5/alt_prof.c (kadm5_get_config_params): Replace filename and

envvar arguments with a flag indicating whether KDC config data should
be used.  Prototype and all callers changed.
(krb5_read_realm_params): Delete config file and env var arguments.
Prototype and all callers changed.

* lib/kadm5/admin.h (KADM5_CONFIG_PROFILE): Commented out.
(struct _kadm5_config_params): Delete field PROFILE.
* lib/kadm5/alt_prof.c (kadm5_get_config_params): Don't look at it.
(kadm5_free_config_params): Don't free it.
* kadmin/testing/tcl/util.t: Remove profile data from config params.
* kadmin/testing/util/tcl_kadm5.c (config_mask_flags): Deleted
KADM5_CONFIG_PROFILE entry.
(parse_config_params): Changed to require 20 parameters instead of 21.
* lib/kadm5/unit-test/api.2/init-v2.exp (test100): Deleted.

* lib/kadm5/alt_prof.c (krb5_aprof_init): Fetch the list of config files from
the library and add the caller-indicated config file to the front of the list.

* lib/kadm5/clnt/client_init.c (kadm5_init_krb5_context): New function.
* lib/kadm5/clnt/libkadm5clnt.exports: Export it.
* lib/kadm5/srv/server_init.c: Include k5-int.h, osconf.h, gssapiP_krb5.h.
(kadm5_init_krb5_context): New function.
* lib/kadm5/srv/libkadm5srv.exports: Export it.
* lib/kadm5/srv/Makefile.in (LOCAL_INCLUDES): Add gssapi directories.
* lib/kadm5/admin.h (kadm5_init_krb5_context): Declare it.
* kadmin/dbutil/kdb5_destroy.c (kdb5_destroy): Call kadm5_init_krb5_context
instead of krb5_init_context.
* kadmin/dbutil/dump.c (load_db): Likewise.
* kadmin/dbutil/kdb5_util.c (main): Likewise.
* kadmin/dbutil/kadm5_create.c (kadm5_create): Likewise.
* kadmin/dbutil/kdb5_stash.c (kdb5_stash): Likewise.
* kadmin/dbutil/loadv4.c (load_v4db): Likewise.
* kadmin/server/ovsec_kadmd.c (main): Likewise.
* kadmin/cli/kadmin.c (kadmin_startup): Likewise.
* kadmin/testing/util/tcl_ovsec_kadm.c (tcl_ovsec_kadm_init): Likewise.
* lib/kadm5/unit-test/lock-test.c (main): Likewise.
* lib/kadm5/unit-test/handle-test.c (main): Likewise.
* lib/kadm5/unit-test/randkey-test.c (main): Likewise.
* lib/kadm5/unit-test/setkey-test.c (main): Likewise.
* lib/kadm5/chpass_util.c (_kadm5_chpass_principal_util): Likewise.
* lib/kadm5/kadm_rpc_xdr.c (xdr_krb5_principal): Likewise.

* lib/krb5/os/init_os_ctx.c (add_kdc_config_file): New function.
(os_init_paths): Add new argument KDC; call add_kdc_config_file if true.
* lib/krb5/krb/init_ctx.c (krb5int_init_context_kdc): New function.
(init_common): Add new argument KDC, passed to krb5_os_init_context.
* lib/krb5/libkrb5.exports: Export krb5int_init_context_kdc.
* k5-int.h (krb5_os_init_context): Update decl.
* lib/kadm5/srv/server_init.c (kadm5_init): Call krb5int_init_context_kdc.
* krb524/krb524d.c (main): Likewise.
* lib/kadm5/unit-test/api.2/init-v2.exp: Don't run test 154 for error for
$KRB5_KDC_PROFILE file not present.

* lib/krb5/os/init_os_ctx.c (os_get_default_config_files): Rewrite KLL test so
as not to confuse Emacs indentation support.

* lib/gssapi/krb5/init_sec_context.c (kg_kdc_flag_mutex, kdc_flag): New
variables.
(krb5_gss_init_context, krb5_gss_use_kdc_context): New functions.
* lib/gssapi/krb5/gssapiP_krb5.h (kg_kdc_flag_mutex): Declare.
(krb5_gss_init_context, krb5_gss_use_kdc_context): Declare.
(krb5_init_context): Define as macro to invoke krb5_gss_init_context for now.
* lib/gssapi/gss_libinit.c (gssint_lib_init): Initialize the mutex.
(gssint_lib_fini): Destroy it.
* lib/gssapi/libgssapi_krb5.exports: Export krb5_gss_use_kdc_context.

* lib/kadm5/srv/server_init.c (kadm5_init): Don't complain if the config files
specify an admin server, since we now look at krb5.conf as well.
* lib/kadm5/unit-test/api.2/init-v2.exp: Delete test test114 for bad server
params.

* plugins/kdb/db2/adb_openclose.c (osa_adb_init_db): Use
krb5int_init_context_kdc instead of krb5_init_context.
* kdc/rtest.c (main): Likewise.
* kdc/fakeka.c (main): Likewise.
* kdc/main.c (main, init_realm): Likewise.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18009 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 18 insertions, 19 deletions

diff --git a/src/kadmin/testing/tcl/util.t b/src/kadmin/testing/tcl/util.t
index f4688aeee..0e39061f7 100644
--- a/src/kadmin/testing/tcl/util.t
+++ b/src/kadmin/testing/tcl/util.t
@@ -15,42 +15,41 @@ proc config_params {masks values} {
 	error "config_params: length of mask and values differ"
     }
 
-    set params [list $masks 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}]
+    set params [list $masks 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}]
     for {set i 0} {$i < [llength $masks]} {incr i} {
 	set mask [lindex $masks $i]
 	set value [lindex $values $i]
 	switch -glob -- $mask {
 	    "KADM5_CONFIG_REALM" {set params [lreplace $params 1 1 $value]}
-	    "KADM5_CONFIG_PROFILE" {set params [lreplace $params 2 2 $value]}
 	    "KADM5_CONFIG_KADMIND_PORT" {
-		set params [lreplace $params 3 3 $value]}
+		set params [lreplace $params 2 2 $value]}
 	    "KADM5_CONFIG_ADMIN_SERVER" {
-		set params [lreplace $params 4 4 $value]}
-	    "KADM5_CONFIG_DBNAME" {set params [lreplace $params 5 5 $value]}
-	    "KADM5_CONFIG_ADBNAME" {set params [lreplace $params 6 6 $value]}
+		set params [lreplace $params 3 3 $value]}
+	    "KADM5_CONFIG_DBNAME" {set params [lreplace $params 4 4 $value]}
+	    "KADM5_CONFIG_ADBNAME" {set params [lreplace $params 5 5 $value]}
 	    "KADM5_CONFIG_ADB_LOCKFILE" {
-		set params [lreplace $params 7 7 $value]}
+		set params [lreplace $params 6 6 $value]}
 	    "KADM5_CONFIG_ADMIN_KEYTAB" {
-		set params [lreplace $params 8 8 $value]}
-	    "KADM5_CONFIG_ACL_FILE" {set params [lreplace $params 9 9 $value]}
+		set params [lreplace $params 7 7 $value]}
+	    "KADM5_CONFIG_ACL_FILE" {set params [lreplace $params 8 8 $value]}
 	    "KADM5_CONFIG_DICT_FILE" {
-		set params [lreplace $params 10 10 $value]}
+		set params [lreplace $params 9 9 $value]}
 	    "KADM5_CONFIG_MKEY_FROM_KBD" {
-		set params [lreplace $params 11 11 $value]}
+		set params [lreplace $params 10 10 $value]}
 	    "KADM5_CONFIG_STASH_FILE" {
-		set params [lreplace $params 12 12 $value]}
+		set params [lreplace $params 11 11 $value]}
 	    "KADM5_CONFIG_MKEY_NAME" {
-		set params [lreplace $params 13 13 $value]}
-	    "KADM5_CONFIG_ENCTYPE" {set params [lreplace $params 14 14 $value]}
+		set params [lreplace $params 12 12 $value]}
+	    "KADM5_CONFIG_ENCTYPE" {set params [lreplace $params 13 13 $value]}
 	    "KADM5_CONFIG_MAX_LIFE" {
-		set params [lreplace $params 15 15 $value]}
+		set params [lreplace $params 14 14 $value]}
 	    "KADM5_CONFIG_MAX_RLIFE" {
-		set params [lreplace $params 16 16 $value]}
+		set params [lreplace $params 15 15 $value]}
 	    "KADM5_CONFIG_EXPIRATION" {
-		set params [lreplace $params 17 17 $value]}
-	    "KADM5_CONFIG_FLAGS" {set params [lreplace $params 18 18 $value]}
+		set params [lreplace $params 16 16 $value]}
+	    "KADM5_CONFIG_FLAGS" {set params [lreplace $params 17 17 $value]}
 	    "KADM5_CONFIG_ENCTYPES" {
-		set params [lreplace $params 19 20 [llength $value] $value]}
+		set params [lreplace $params 18 19 [llength $value] $value]}
 	    "*" {error "config_params: unknown mask $mask"}
 	}
     }