* krb5.conf.proto, kdc.conf.proto: use K5ROOT instead of /krb5

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

diff --git a/src/kadmin/testing/proto/ChangeLog b/src/kadmin/testing/proto/ChangeLog
index 8223db5e2dc167beb9dd4f8795d955ccac8bb4f6..d5a3f873bdf7bc565e009b0c0a962e9527d565c5 100644 (file)
--- a/src/kadmin/testing/proto/ChangeLog
+++ b/src/kadmin/testing/proto/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 26 17:47:23 1996  Barry Jaspan  <bjaspan@mit.edu>
+
+       * krb5.conf.proto, kdc.conf.proto: use K5ROOT instead of /krb5
+
 Wed Sep 25 16:20:29 1996  Barry Jaspan  <bjaspan@mit.edu>
 
        * kdc.conf.proto: remove admin_dbname and admin_lockfile

diff --git a/src/kadmin/testing/proto/kdc.conf.proto b/src/kadmin/testing/proto/kdc.conf.proto
index bfc0897261ad91e8f9ce9f55ddcdb44a453b92fb..1797b5a8e8dd9f641d1a9ad720e9e7c917ece08d 100644 (file)
--- a/src/kadmin/testing/proto/kdc.conf.proto
+++ b/src/kadmin/testing/proto/kdc.conf.proto
@@ -3,12 +3,12 @@
 
 [realms]
        __REALM__ = {
-               profile = /krb5/krb5.conf
-               database_name = /krb5/kdb5
-               admin_keytab = /krb5/ovsec_adm.srvtab
-               key_stash_file = /krb5/.k5.__REALM__
-               acl_file = /krb5/ovsec_adm.acl
-               dict_file = /krb5/ovsec_adm.dict
+               profile = __K5ROOT__/krb5.conf
+               database_name = __K5ROOT__/kdb5
+               admin_keytab = __K5ROOT__/ovsec_adm.srvtab
+               key_stash_file = __K5ROOT__/.k5.__REALM__
+               acl_file = __K5ROOT__/ovsec_adm.acl
+               dict_file = __K5ROOT__/ovsec_adm.dict
                kadmind_port = 1751
                master_key_type = des-cbc-crc
                supported_enctypes = des-cbc-crc:normal des-cbc-crc:v4

diff --git a/src/kadmin/testing/proto/krb5.conf.proto b/src/kadmin/testing/proto/krb5.conf.proto
index e29658c4fe6a3bcd53184be60be5acd354e340a0..3296b0d658568e40ef6e0d58bd1eeb77c1bc4a7d 100644 (file)
--- a/src/kadmin/testing/proto/krb5.conf.proto
+++ b/src/kadmin/testing/proto/krb5.conf.proto
@@ -1,6 +1,6 @@
 [libdefaults]
        default_realm = __REALM__
-       default_keytab_name = FILE:/krb5/v5srvtab
+       default_keytab_name = FILE:__K5ROOT__/v5srvtab
 
 [realms]
        __REALM__ = {
@@ -12,6 +12,6 @@
        localhost = __REALM__
 
 [logging]
-       admin_server = FILE:/krb5/syslog
-       kdc = FILE:/krb5/syslog
-       default = FILE:/krb5/syslog
+       admin_server = FILE:__K5ROOT__/syslog
+       kdc = FILE:__K5ROOT__/syslog
+       default = FILE:__K5ROOT__/syslog