summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@fedoraproject.org>2007-04-13 19:07:25 +0000
committerNalin Dahyabhai <nalin@fedoraproject.org>2007-04-13 19:07:25 +0000
commit1739ef7213b7e3ad4f5def98a34f518a9e339d82 (patch)
tree99df47310d751e702b1ddd7fec26fe6bc86d8a18
parent471b4b51f35665cd97abfd0258fda4bf1e0d6f1e (diff)
downloadkrb5-1739ef7213b7e3ad4f5def98a34f518a9e339d82.tar.gz
krb5-1739ef7213b7e3ad4f5def98a34f518a9e339d82.tar.xz
krb5-1739ef7213b7e3ad4f5def98a34f518a9e339d82.zip
- move the default acl_file, dict_file, and admin_keytab settings to the
part of the default/example kdc.conf where they'll actually have an effect (#236417)
-rw-r--r--kdc.conf6
-rw-r--r--krb5.spec5
2 files changed, 8 insertions, 3 deletions
diff --git a/kdc.conf b/kdc.conf
index ce43458..67e4735 100644
--- a/kdc.conf
+++ b/kdc.conf
@@ -1,10 +1,10 @@
[kdcdefaults]
- acl_file = /var/kerberos/krb5kdc/kadm5.acl
- dict_file = /usr/share/dict/words
- admin_keytab = /var/kerberos/krb5kdc/kadm5.keytab
v4_mode = nopreauth
[realms]
+ acl_file = /var/kerberos/krb5kdc/kadm5.acl
+ dict_file = /usr/share/dict/words
+ admin_keytab = /var/kerberos/krb5kdc/kadm5.keytab
EXAMPLE.COM = {
#master_key_type = des3-hmac-sha1
supported_enctypes = des3-hmac-sha1:normal arcfour-hmac:normal des-hmac-sha1:normal des-cbc-md5:normal des-cbc-crc:normal des-cbc-crc:v4 des-cbc-crc:afs3
diff --git a/krb5.spec b/krb5.spec
index c5eb6c0..da49e9b 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -193,6 +193,11 @@ installed on systems which are meant provide these services.
%endif
%changelog
+* Fri Apr 13 2007 Nalin Dahyabhai <nalin@redhat.com>
+- move the default acl_file, dict_file, and admin_keytab settings to
+ the part of the default/example kdc.conf where they'll actually have
+ an effect (#236417)
+
* Tue Apr 3 2007 Nalin Dahyabhai <nalin@redhat.com> 1.6-3
- add patch to correct unauthorized access via krb5-aware telnet
daemon (#229782, CVE-2007-0956)