summaryrefslogtreecommitdiffstats
path: root/src/kadmin/testing/proto
diff options
context:
space:
mode:
authorBarry Jaspan <bjaspan@mit.edu>1996-09-18 16:38:13 +0000
committerBarry Jaspan <bjaspan@mit.edu>1996-09-18 16:38:13 +0000
commitf3ca77f7fe76f964de3fad01d334b3d6ced1358d (patch)
tree53d18cedf05c7f17f4521a8b0bf015992c43b4e0 /src/kadmin/testing/proto
parenta5803e21fa147252913f5cea4b563aa642cf8887 (diff)
downloadkrb5-f3ca77f7fe76f964de3fad01d334b3d6ced1358d.tar.gz
krb5-f3ca77f7fe76f964de3fad01d334b3d6ced1358d.tar.xz
krb5-f3ca77f7fe76f964de3fad01d334b3d6ced1358d.zip
* kdc.conf.proto: remove max_life spec, use default
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9093 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/testing/proto')
-rw-r--r--src/kadmin/testing/proto/ChangeLog4
-rw-r--r--src/kadmin/testing/proto/kdc.conf.proto2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/kadmin/testing/proto/ChangeLog b/src/kadmin/testing/proto/ChangeLog
index 71959a3b05..2b63f48d49 100644
--- a/src/kadmin/testing/proto/ChangeLog
+++ b/src/kadmin/testing/proto/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 18 12:37:46 1996 Barry Jaspan <bjaspan@mit.edu>
+
+ * kdc.conf.proto: remove max_life spec, use default
+
Mon Jul 15 17:11:35 1996 Marc Horowitz <marc@mit.edu>
* krb5.conf.proto: specify a default_keytab_name in /krb5
diff --git a/src/kadmin/testing/proto/kdc.conf.proto b/src/kadmin/testing/proto/kdc.conf.proto
index 798d6c51bd..af182c150b 100644
--- a/src/kadmin/testing/proto/kdc.conf.proto
+++ b/src/kadmin/testing/proto/kdc.conf.proto
@@ -12,8 +12,6 @@
acl_file = /krb5/ovsec_adm.acl
dict_file = /krb5/ovsec_adm.dict
kadmind_port = 1751
- max_life = 10h 0m 0s
- max_renewable_life = 7d 0h 0m 0s
master_key_type = des-cbc-crc
supported_enctypes = des-cbc-crc:normal des-cbc-crc:v4
}