svn rev #21818: trunk/src/ config-files/ tests/dejagnu/config/ util/profile/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21818
Commit By: raeburn
Log Message:
remove some remnants of krb4-related config file options


Changed Files:
U   trunk/src/config-files/krb5.conf
U   trunk/src/config-files/krb5.conf.M
U   trunk/src/tests/dejagnu/config/default.exp
U   trunk/src/util/profile/krb5.conf
Modified: trunk/src/config-files/krb5.conf
===================================================================
--- trunk/src/config-files/krb5.conf	2009-01-28 02:18:28 UTC (rev 21817)
+++ trunk/src/config-files/krb5.conf	2009-01-28 05:37:10 UTC (rev 21818)
@@ -1,7 +1,5 @@
 [libdefaults]
 	default_realm = ATHENA.MIT.EDU
-	krb4_config = /usr/kerberos/lib/krb.conf
-	krb4_realms = /usr/kerberos/lib/krb.realms
 
 [realms]
 	ATHENA.MIT.EDU = {

Modified: trunk/src/config-files/krb5.conf.M
===================================================================
--- trunk/src/config-files/krb5.conf.M	2009-01-28 02:18:28 UTC (rev 21817)
+++ trunk/src/config-files/krb5.conf.M	2009-01-28 05:37:10 UTC (rev 21818)
@@ -176,18 +176,6 @@
 Kerberos. Use a value of 1 on DCE 1.0.3a systems, and a value of 2 on
 DCE 1.1 systems.
 
-.IP krb4_srvtab 
-Specifies the location of the Kerberos V4 srvtab file.  Default is
-"/etc/srvtab".
-
-.IP krb4_config
-Specifies the location of the Kerberos V4 configuration file.  Default
-is "/etc/krb.conf".
-
-.IP krb4_realms
-Specifies the location of the Kerberos V4 domain/realm translation
-file.  Default is "/etc/krb.realms".
-
 .IP dns_lookup_kdc
 Indicate whether DNS SRV records shoud be used to locate the KDCs and 
 other servers for a realm, if they are not listed in the information 

Modified: trunk/src/tests/dejagnu/config/default.exp
===================================================================
--- trunk/src/tests/dejagnu/config/default.exp	2009-01-28 02:18:28 UTC (rev 21817)
+++ trunk/src/tests/dejagnu/config/default.exp	2009-01-28 05:37:10 UTC (rev 21818)
@@ -1036,8 +1036,6 @@
 	    puts $conffile \
 		    "	permitted_enctypes = $permitted_enctypes($type)"
 	}
-	puts $conffile "	krb4_config = $tmppwd/krb.conf"
-	puts $conffile "	krb4_realms = $tmppwd/krb.realms"
 	if { $mode == "tcp" } {
 	    puts $conffile "	udp_preference_limit = 1"
 	}

Modified: trunk/src/util/profile/krb5.conf
===================================================================
--- trunk/src/util/profile/krb5.conf	2009-01-28 02:18:28 UTC (rev 21817)
+++ trunk/src/util/profile/krb5.conf	2009-01-28 05:37:10 UTC (rev 21818)
@@ -2,8 +2,6 @@
 	default_realm = ATHENA.MIT.EDU 
 	default_tgs_enctypes = des-cbc-crc
 	default_tkt_enctypes = des-cbc-crc
-	krb4_config = /etc/athena/krb.conf
-	krb4_realms = /etc/athena/krb.realms
 	default_keytab_name = FILE:/etc/krb5.keytab
 	kdc_timesync = 1
 	ccache_type = 4