diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2000-07-01 00:51:58 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2000-07-01 00:51:58 +0000 |
| commit | b63a75c40310afc82e4af5372f92bec2e0a4c67e (patch) | |
| tree | 21afaf6fefb69b3e9692ac78785e8023904713c1 /src/kadmin/testing/proto | |
| parent | 7d348b141e39e286d544f0d72173a1a60f6ce434 (diff) | |
| download | krb5-b63a75c40310afc82e4af5372f92bec2e0a4c67e.tar.gz krb5-b63a75c40310afc82e4af5372f92bec2e0a4c67e.tar.xz krb5-b63a75c40310afc82e4af5372f92bec2e0a4c67e.zip | |
pullup from 1.2-beta4
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12497 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/testing/proto')
| -rw-r--r-- | src/kadmin/testing/proto/ChangeLog | 10 | ||||
| -rw-r--r-- | src/kadmin/testing/proto/kdc.conf.proto | 5 | ||||
| -rw-r--r-- | src/kadmin/testing/proto/krb5.conf.proto | 1 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/kadmin/testing/proto/ChangeLog b/src/kadmin/testing/proto/ChangeLog index e1fedafaa..a69cf3003 100644 --- a/src/kadmin/testing/proto/ChangeLog +++ b/src/kadmin/testing/proto/ChangeLog @@ -1,3 +1,13 @@ +2000-05-31 Ken Raeburn <raeburn@mit.edu> + + * kdc.conf.proto: Use des3 master key. + +2000-05-09 Ken Raeburn <raeburn@mit.edu> + + * krb5.conf.proto: Set dns_fallback=no. + + * kdc.conf.proto: Add des3 to supported_enctypes. + Wed Jan 21 12:44:25 1998 Ezra Peisach <epeisach@kangaroo.mit.edu> * kdc.conf.proto: Add kpasswd_port line so kadmind can start as diff --git a/src/kadmin/testing/proto/kdc.conf.proto b/src/kadmin/testing/proto/kdc.conf.proto index 69d604106..6f9edeb5b 100644 --- a/src/kadmin/testing/proto/kdc.conf.proto +++ b/src/kadmin/testing/proto/kdc.conf.proto @@ -11,7 +11,6 @@ dict_file = __K5ROOT__/ovsec_adm.dict kadmind_port = 1751 kpasswd_port = 1752 - master_key_type = des-cbc-crc - supported_enctypes = des-cbc-crc:normal des-cbc-crc:v4 des-cbc-md5:normal des-cbc-raw:normal + master_key_type = des3-hmac-sha1 + supported_enctypes = des3-hmac-sha1:normal des-cbc-crc:normal des-cbc-crc:v4 des-cbc-md5:normal des-cbc-raw:normal } - diff --git a/src/kadmin/testing/proto/krb5.conf.proto b/src/kadmin/testing/proto/krb5.conf.proto index a06381570..5521267c7 100644 --- a/src/kadmin/testing/proto/krb5.conf.proto +++ b/src/kadmin/testing/proto/krb5.conf.proto @@ -1,6 +1,7 @@ [libdefaults] default_realm = __REALM__ default_keytab_name = FILE:__K5ROOT__/v5srvtab + dns_fallback = no [realms] __REALM__ = { |