svn rev #23662: trunk/src/ config/ lib/kadm5/clnt/ lib/kadm5/srv/
ghudson@MIT.EDU
ghudson at MIT.EDU
Tue Jan 19 13:44:57 EST 2010
http://src.mit.edu/fisheye/changelog/krb5/?cs=23662
Commit By: ghudson
Log Message:
ticket: 6644
subject: Change basename of libkadm5 libraries to avoid Heimdal conflict
Changed Files:
U trunk/src/config/pre.in
U trunk/src/krb5-config.in
U trunk/src/lib/kadm5/clnt/Makefile.in
D trunk/src/lib/kadm5/clnt/libkadm5clnt.exports
A trunk/src/lib/kadm5/clnt/libkadm5clnt_mit.exports
U trunk/src/lib/kadm5/srv/Makefile.in
D trunk/src/lib/kadm5/srv/libkadm5srv.exports
A trunk/src/lib/kadm5/srv/libkadm5srv_mit.exports
Modified: trunk/src/config/pre.in
===================================================================
--- trunk/src/config/pre.in 2010-01-19 17:20:45 UTC (rev 23661)
+++ trunk/src/config/pre.in 2010-01-19 18:44:57 UTC (rev 23662)
@@ -316,8 +316,8 @@
KDB5_PLUGIN_DEPLIBS = @KDB5_PLUGIN_DEPLIBS@
KDB5_PLUGIN_LIBS = @KDB5_PLUGIN_LIBS@
-KADMCLNT_DEPLIB = $(TOPLIBD)/libkadm5clnt$(DEPLIBEXT)
-KADMSRV_DEPLIB = $(TOPLIBD)/libkadm5srv$(DEPLIBEXT)
+KADMCLNT_DEPLIB = $(TOPLIBD)/libkadm5clnt_mit$(DEPLIBEXT)
+KADMSRV_DEPLIB = $(TOPLIBD)/libkadm5srv_mit$(DEPLIBEXT)
KDB5_DEPLIB = $(TOPLIBD)/libkdb5$(DEPLIBEXT)
GSSRPC_DEPLIB = $(TOPLIBD)/libgssrpc$(DEPLIBEXT)
GSS_DEPLIB = $(TOPLIBD)/libgssapi_krb5$(DEPLIBEXT)
@@ -385,8 +385,8 @@
GSSRPC_LIBS = -lgssrpc $(GSS_LIBS)
KADM_COMM_LIBS = $(GSSRPC_LIBS)
# need fixing if ever used on Mac OS X!
-KADMSRV_LIBS = -lkadm5srv $(HESIOD_LIBS) $(KDB5_LIBS) $(KADM_COMM_LIBS)
-KADMCLNT_LIBS = -lkadm5clnt $(KADM_COMM_LIBS)
+KADMSRV_LIBS = -lkadm5srv_mit $(HESIOD_LIBS) $(KDB5_LIBS) $(KADM_COMM_LIBS)
+KADMCLNT_LIBS = -lkadm5clnt_mit $(KADM_COMM_LIBS)
# libutil for NetBSD, et al. for openpty(), etc.
UTIL_LIB = @UTIL_LIB@
Modified: trunk/src/krb5-config.in
===================================================================
--- trunk/src/krb5-config.in 2010-01-19 17:20:45 UTC (rev 23661)
+++ trunk/src/krb5-config.in 2010-01-19 18:44:57 UTC (rev 23662)
@@ -194,12 +194,12 @@
fi
if test $library = 'kadm_server'; then
- lib_flags="$lib_flags -lkadm5srv -lkdb5 $KDB5_DB_LIB"
+ lib_flags="$lib_flags -lkadm5srv_mit -lkdb5 $KDB5_DB_LIB"
library=kadm_common
fi
if test $library = 'kadm_client'; then
- lib_flags="$lib_flags -lkadm5clnt"
+ lib_flags="$lib_flags -lkadm5clnt_mit"
library=kadm_common
fi
Modified: trunk/src/lib/kadm5/clnt/Makefile.in
===================================================================
--- trunk/src/lib/kadm5/clnt/Makefile.in 2010-01-19 17:20:45 UTC (rev 23661)
+++ trunk/src/lib/kadm5/clnt/Makefile.in 2010-01-19 18:44:57 UTC (rev 23662)
@@ -3,7 +3,7 @@
LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5
DEFS=
-LIBBASE=kadm5clnt
+LIBBASE=kadm5clnt_mit
LIBMAJOR=7
LIBMINOR=0
STOBJLISTS=../OBJS.ST OBJS.ST
@@ -70,6 +70,11 @@
install:: install-libs
+install-unix::
+ $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libkadm5clnt$(DEPLIBEXT)
+ (cd $(DESTDIR)$(KRB5_LIBDIR) && $(LN_S) lib$(LIBBASE)$(DEPLIBEXT) \
+ libkadm5clnt$(DEPLIBEXT))
+
depend:: includes
@lib_frag@
Copied: trunk/src/lib/kadm5/clnt/libkadm5clnt_mit.exports (from rev 23656, trunk/src/lib/kadm5/clnt/libkadm5clnt.exports)
===================================================================
--- trunk/src/lib/kadm5/clnt/libkadm5clnt_mit.exports (rev 0)
+++ trunk/src/lib/kadm5/clnt/libkadm5clnt_mit.exports 2010-01-19 18:44:57 UTC (rev 23662)
@@ -0,0 +1,109 @@
+_kadm5_check_handle
+_kadm5_chpass_principal_util
+kadm5_chpass_principal
+kadm5_chpass_principal_3
+kadm5_chpass_principal_util
+kadm5_create_policy
+kadm5_create_principal
+kadm5_create_principal_3
+kadm5_decrypt_key
+kadm5_delete_policy
+kadm5_delete_principal
+kadm5_destroy
+kadm5_flush
+kadm5_free_config_params
+kadm5_free_key_data
+kadm5_free_name_list
+kadm5_free_policy_ent
+kadm5_free_principal_ent
+kadm5_get_admin_service_name
+kadm5_get_config_params
+kadm5_get_policies
+kadm5_get_policy
+kadm5_get_principal
+kadm5_get_principals
+kadm5_get_privs
+kadm5_init
+kadm5_init_anonymous
+kadm5_init_krb5_context
+kadm5_init_with_creds
+kadm5_init_with_password
+kadm5_init_with_skey
+kadm5_lock
+kadm5_modify_policy
+kadm5_modify_principal
+kadm5_randkey_principal
+kadm5_randkey_principal_3
+kadm5_rename_principal
+kadm5_setkey_principal
+kadm5_setkey_principal_3
+kadm5_setv4key_principal
+kadm5_unlock
+krb5_aprof_finish
+krb5_aprof_get_boolean
+krb5_aprof_get_deltat
+krb5_aprof_get_int32
+krb5_aprof_get_string
+krb5_aprof_getvals
+krb5_aprof_init
+krb5_flags_to_string
+krb5_free_key_data_contents
+krb5_free_realm_params
+krb5_input_flag_to_string
+krb5_keysalt_is_present
+krb5_keysalt_iterate
+krb5_klog_close
+krb5_klog_init
+krb5_klog_reopen
+krb5_klog_syslog
+krb5_read_realm_params
+krb5_string_to_flags
+krb5_string_to_keysalts
+xdr_chpass3_arg
+xdr_chpass_arg
+xdr_chrand3_arg
+xdr_chrand_arg
+xdr_chrand_ret
+xdr_cpol_arg
+xdr_cprinc3_arg
+xdr_cprinc_arg
+xdr_dpol_arg
+xdr_dprinc_arg
+xdr_generic_ret
+xdr_getprivs_ret
+xdr_gpol_arg
+xdr_gpol_ret
+xdr_gpols_arg
+xdr_gpols_ret
+xdr_gprinc_arg
+xdr_gprinc_ret
+xdr_gprincs_arg
+xdr_gprincs_ret
+xdr_kadm5_policy_ent_rec
+xdr_kadm5_principal_ent_rec
+xdr_kadm5_ret_t
+xdr_krb5_deltat
+xdr_krb5_enctype
+xdr_krb5_flags
+xdr_krb5_int16
+xdr_krb5_key_data_nocontents
+xdr_krb5_key_salt_tuple
+xdr_krb5_keyblock
+xdr_krb5_kvno
+xdr_krb5_octet
+xdr_krb5_principal
+xdr_krb5_salttype
+xdr_krb5_timestamp
+xdr_krb5_tl_data
+xdr_krb5_ui_2
+xdr_krb5_ui_4
+xdr_mpol_arg
+xdr_mprinc_arg
+xdr_nullstring
+xdr_nulltype
+xdr_rprinc_arg
+xdr_setkey3_arg
+xdr_setkey_arg
+xdr_setv4key_arg
+xdr_ui_4
+kadm5_init_iprop
Modified: trunk/src/lib/kadm5/srv/Makefile.in
===================================================================
--- trunk/src/lib/kadm5/srv/Makefile.in 2010-01-19 17:20:45 UTC (rev 23661)
+++ trunk/src/lib/kadm5/srv/Makefile.in 2010-01-19 18:44:57 UTC (rev 23662)
@@ -9,7 +9,7 @@
##DOSBUILDTOP = ..\..\..
##DOSLIBNAME = libkadm5srv.lib
-LIBBASE=kadm5srv
+LIBBASE=kadm5srv_mit
LIBMAJOR=7
LIBMINOR=0
STOBJLISTS=../OBJS.ST OBJS.ST
@@ -87,6 +87,11 @@
install:: install-libs
+install-unix::
+ $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libkadm5srv$(DEPLIBEXT)
+ (cd $(DESTDIR)$(KRB5_LIBDIR) && $(LN_S) lib$(LIBBASE)$(DEPLIBEXT) \
+ libkadm5srv$(DEPLIBEXT))
+
depend:: includes
@lib_frag@
Copied: trunk/src/lib/kadm5/srv/libkadm5srv_mit.exports (from rev 23656, trunk/src/lib/kadm5/srv/libkadm5srv.exports)
===================================================================
--- trunk/src/lib/kadm5/srv/libkadm5srv_mit.exports (rev 0)
+++ trunk/src/lib/kadm5/srv/libkadm5srv_mit.exports 2010-01-19 18:44:57 UTC (rev 23662)
@@ -0,0 +1,145 @@
+_kadm5_check_handle
+_kadm5_chpass_principal_util
+kadm5int_acl_check
+kadm5int_acl_check_krb
+kadm5int_acl_finish
+kadm5int_acl_impose_restrictions
+kadm5int_acl_init
+adb_policy_close
+adb_policy_init
+destroy_dict
+find_word
+hist_db
+hist_key
+hist_kvno
+hist_princ
+init_dict
+kadm5_set_use_password_server
+kadm5_chpass_principal
+kadm5_chpass_principal_3
+kadm5_chpass_principal_util
+kadm5_create_policy
+kadm5_create_policy_internal
+kadm5_create_principal
+kadm5_create_principal_3
+kadm5_decrypt_key
+kadm5_delete_policy
+kadm5_delete_principal
+kadm5_destroy
+kadm5_flush
+kadm5_free_config_params
+kadm5_free_key_data
+kadm5_free_name_list
+kadm5_free_policy_ent
+kadm5_free_principal_ent
+kadm5_get_config_params
+kadm5_get_policies
+kadm5_get_policy
+kadm5_get_principal
+kadm5_get_principal_keys
+kadm5_get_principals
+kadm5_get_privs
+kadm5_init
+kadm5_init_anonymous
+kadm5_init_krb5_context
+kadm5_init_with_creds
+kadm5_init_with_password
+kadm5_init_with_skey
+kadm5_lock
+kadm5_modify_policy
+kadm5_modify_policy_internal
+kadm5_modify_principal
+kadm5_randkey_principal
+kadm5_randkey_principal_3
+kadm5_rename_principal
+kadm5_setkey_principal
+kadm5_setkey_principal_3
+kadm5_setv4key_principal
+kadm5_unlock
+kdb_delete_entry
+kdb_free_entry
+kdb_get_entry
+kdb_init_hist
+kdb_init_master
+kdb_iter_entry
+kdb_put_entry
+krb5_aprof_finish
+krb5_aprof_get_boolean
+krb5_aprof_get_deltat
+krb5_aprof_get_int32
+krb5_aprof_get_string
+krb5_aprof_get_string_all
+krb5_aprof_getvals
+krb5_aprof_init
+krb5_copy_key_data_contents
+krb5_flags_to_string
+krb5_free_key_data_contents
+krb5_free_realm_params
+krb5_input_flag_to_string
+krb5_keysalt_is_present
+krb5_keysalt_iterate
+krb5_klog_close
+krb5_klog_init
+krb5_klog_reopen
+krb5_klog_syslog
+krb5_read_realm_params
+krb5_string_to_flags
+krb5_string_to_keysalts
+krb5_match_config_pattern
+master_db
+master_keyblock
+master_keylist
+master_princ
+osa_free_princ_ent
+passwd_check
+xdr_chpass3_arg
+xdr_chpass_arg
+xdr_chrand3_arg
+xdr_chrand_arg
+xdr_chrand_ret
+xdr_cpol_arg
+xdr_cprinc3_arg
+xdr_cprinc_arg
+xdr_dpol_arg
+xdr_dprinc_arg
+xdr_generic_ret
+xdr_getprivs_ret
+xdr_gpol_arg
+xdr_gpol_ret
+xdr_gpols_arg
+xdr_gpols_ret
+xdr_gprinc_arg
+xdr_gprinc_ret
+xdr_gprincs_arg
+xdr_gprincs_ret
+xdr_kadm5_policy_ent_rec
+xdr_kadm5_principal_ent_rec
+xdr_kadm5_ret_t
+xdr_krb5_deltat
+xdr_krb5_enctype
+xdr_krb5_flags
+xdr_krb5_int16
+xdr_krb5_key_data
+xdr_krb5_key_data_nocontents
+xdr_krb5_key_salt_tuple
+xdr_krb5_keyblock
+xdr_krb5_kvno
+xdr_krb5_octet
+xdr_krb5_principal
+xdr_krb5_salttype
+xdr_krb5_timestamp
+xdr_krb5_tl_data
+xdr_krb5_ui_2
+xdr_krb5_ui_4
+xdr_mpol_arg
+xdr_mprinc_arg
+xdr_nullstring
+xdr_nulltype
+xdr_osa_princ_ent_rec
+xdr_osa_pw_hist_ent
+xdr_rprinc_arg
+xdr_setkey3_arg
+xdr_setkey_arg
+xdr_setv4key_arg
+xdr_ui_4
+kadm5_init_iprop
More information about the cvs-krb5
mailing list