From e28c59c89009203ce3fb71162ea86a86253383d6 Mon Sep 17 00:00:00 2001 From: Zhanna Tsitkov Date: Fri, 14 Oct 2011 14:25:23 +0000 Subject: [PATCH] Removed unused macros git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25328 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/osconf.hin | 7 ------- src/lib/krb5/libkrb5.exports | 3 --- src/lib/krb5/os/osconfig.c | 3 --- 3 files changed, 13 deletions(-) diff --git a/src/include/osconf.hin b/src/include/osconf.hin index 04f10ce82..f53ef1b5c 100644 --- a/src/include/osconf.hin +++ b/src/include/osconf.hin @@ -42,7 +42,6 @@ #if defined(_WIN32) #define DEFAULT_PROFILE_FILENAME "krb5.ini" -#define DEFAULT_LNAME_FILENAME "/aname" #define DEFAULT_KEYTAB_NAME "FILE:%s\\krb5kt" #else /* !_WINDOWS */ #if TARGET_OS_MAC @@ -56,7 +55,6 @@ #define DEFAULT_PROFILE_PATH DEFAULT_SECURE_PROFILE_PATH #endif #define DEFAULT_KEYTAB_NAME "FILE:/etc/krb5.keytab" -#define DEFAULT_LNAME_FILENAME "@PREFIX/lib/krb5.aname" #endif /* _WINDOWS */ #define DEFAULT_PLUGIN_BASE_DIR "@LIBDIR/krb5/plugins" @@ -90,7 +88,6 @@ #define KRB5_DEFAULT_SEC_PORT 750 #define DEFAULT_KPASSWD_PORT 464 -#define KPASSWD_PORTNAME "kpasswd" #define DEFAULT_KDC_UDP_PORTLIST "88,750" #define DEFAULT_KDC_TCP_PORTLIST "" @@ -108,9 +105,6 @@ "des3-cbc-sha1:normal arcfour-hmac-md5:normal" #define MAX_DGRAM_SIZE 4096 -#define MAX_SKDC_TIMEOUT 30 -#define SKDC_TIMEOUT_SHIFT 2 /* left shift of timeout for backoff */ -#define SKDC_TIMEOUT_1 1 /* seconds for first timeout */ #define RCTMPDIR "@KRB5RCTMPDIR" /* directory to store replay caches */ @@ -127,7 +121,6 @@ #define KPROP_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/slave_datatrans" #define KPROPD_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/from_master" #define KPROPD_DEFAULT_KDB5_UTIL "@SBINDIR/kdb5_util" -#define KPROPD_DEFAULT_KDB5_EDIT "@SBINDIR/kdb5_edit" #define KPROPD_DEFAULT_KPROP "@SBINDIR/kprop" #define KPROPD_DEFAULT_KRB_DB DEFAULT_KDB_FILE #define KPROPD_ACL_FILE "@LOCALSTATEDIR/krb5kdc/kpropd.acl" diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports index c4a0015f0..c9d1debf2 100644 --- a/src/lib/krb5/libkrb5.exports +++ b/src/lib/krb5/libkrb5.exports @@ -440,7 +440,6 @@ krb5_make_authdata_kdc_issued krb5_make_full_ipaddr krb5_make_fulladdr krb5_max_dgram_size -krb5_max_skdc_timeout krb5_mcc_ops krb5_merge_authdata krb5_mk_1cred @@ -570,8 +569,6 @@ krb5_set_principal_realm krb5_set_real_time krb5_set_time_offsets krb5_size_opaque -krb5_skdc_timeout_1 -krb5_skdc_timeout_shift krb5_sname_match krb5_sname_to_principal krb5_string_to_deltat diff --git a/src/lib/krb5/os/osconfig.c b/src/lib/krb5/os/osconfig.c index 93eafeda0..b6013c5cf 100644 --- a/src/lib/krb5/os/osconfig.c +++ b/src/lib/krb5/os/osconfig.c @@ -38,9 +38,6 @@ char *krb5_defkeyname = DEFAULT_KEYTAB_NAME; unsigned int krb5_max_dgram_size = MAX_DGRAM_SIZE; -unsigned int krb5_max_skdc_timeout = MAX_SKDC_TIMEOUT; -unsigned int krb5_skdc_timeout_shift = SKDC_TIMEOUT_SHIFT; -unsigned int krb5_skdc_timeout_1 = SKDC_TIMEOUT_1; const char *krb5_default_pwd_prompt1 = DEFAULT_PWD_STRING1; const char *krb5_default_pwd_prompt2 = DEFAULT_PWD_STRING2; -- 2.26.2