From 192e0abb1cc96b2c1935925a2192ac14f8a4389c Mon Sep 17 00:00:00 2001 From: Barry Jaspan Date: Thu, 26 Sep 1996 21:48:11 +0000 Subject: [PATCH] * 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 --- src/kadmin/testing/proto/ChangeLog | 4 ++++ src/kadmin/testing/proto/kdc.conf.proto | 12 ++++++------ src/kadmin/testing/proto/krb5.conf.proto | 8 ++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/kadmin/testing/proto/ChangeLog b/src/kadmin/testing/proto/ChangeLog index 8223db5e2..d5a3f873b 100644 --- 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 + + * krb5.conf.proto, kdc.conf.proto: use K5ROOT instead of /krb5 + Wed Sep 25 16:20:29 1996 Barry Jaspan * 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 bfc089726..1797b5a8e 100644 --- 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 e29658c4f..3296b0d65 100644 --- 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 -- 2.26.2