mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2026-10-25 06:38:02 -05:00
krb5.conf templates: remove Kerberos 4 support
Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com> Reviewed-By: Rob Crittenden <rcritten@redhat.com> Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
This commit is contained in:
1 parent
1652e70f2c
commit
166dbfb630
8 files changed
+1
-42
No files matched your search
@@ -1244,9 +1244,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
|
||||
/bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa-pki-proxy.conf
|
||||
/bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
|
||||
/bin/touch %{buildroot}%{_usr}/share/ipa/html/ca.crt
|
||||
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.con
|
||||
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini
|
||||
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con
|
||||
|
||||
mkdir -p %{buildroot}%{_libdir}/krb5/plugins/libkrb5
|
||||
touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
|
||||
@@ -1794,9 +1791,6 @@ fi
|
||||
%ghost %attr(0644,root,root) %config(noreplace) %{_usr}/share/ipa/html/ca.crt
|
||||
%ghost %attr(0640,root,named) %config(noreplace) %{_sysconfdir}/named/ipa-ext.conf
|
||||
%ghost %attr(0640,root,named) %config(noreplace) %{_sysconfdir}/named/ipa-options-ext.conf
|
||||
%ghost %attr(0644,root,root) %{_usr}/share/ipa/html/krb.con
|
||||
%ghost %attr(0644,root,root) %{_usr}/share/ipa/html/krb5.ini
|
||||
%ghost %attr(0644,root,root) %{_usr}/share/ipa/html/krbrealm.con
|
||||
%dir %{_usr}/share/ipa/updates/
|
||||
%{_usr}/share/ipa/updates/*
|
||||
%dir %{_localstatedir}/lib/ipa
|
||||
|
||||
@@ -58,9 +58,6 @@ dist_app_DATA = \
|
||||
kdc_req.conf.template \
|
||||
krb5.conf.template \
|
||||
freeipa-server.template \
|
||||
krb5.ini.template \
|
||||
krb.con.template \
|
||||
krbrealm.con.template \
|
||||
smb.conf.template \
|
||||
smb.conf.registry.template \
|
||||
smb.conf.empty \
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
$REALM $DOMAIN
|
||||
$REALM $DOMAIN admin server
|
||||
@@ -1,20 +0,0 @@
|
||||
[libdefaults]
|
||||
default_realm = $REALM
|
||||
krb4_config = /usr/kerberos/lib/krb.conf
|
||||
krb4_realms = /usr/kerberos/lib/krb.realms
|
||||
dns_lookup_kdc = true
|
||||
|
||||
[realms]
|
||||
$REALM = {
|
||||
admin_server = $FQDN
|
||||
kdc = $FQDN
|
||||
master_kdc = $FQDN
|
||||
default_domain = $REALM
|
||||
}
|
||||
|
||||
[domain_realm]
|
||||
.$DOMAIN = $REALM
|
||||
$DOMAIN = $REALM
|
||||
|
||||
[logging]
|
||||
# kdc = CONSOLE
|
||||
@@ -1,3 +0,0 @@
|
||||
.$REALM $REALM
|
||||
.$REALM. $REALM
|
||||
$REALM $REALM
|
||||
@@ -266,8 +266,7 @@ def configure_krb5_conf(realm, kdc, filename):
|
||||
pamopts = [{'name':'debug', 'type':'option', 'value':'false'},
|
||||
{'name':'ticket_lifetime', 'type':'option', 'value':'36000'},
|
||||
{'name':'renew_lifetime', 'type':'option', 'value':'36000'},
|
||||
{'name':'forwardable', 'type':'option', 'value':'true'},
|
||||
{'name':'krb4_convert', 'type':'option', 'value':'false'}]
|
||||
{'name':'forwardable', 'type':'option', 'value':'true'}]
|
||||
appopts = [{'name':'pam', 'type':'subsection', 'value':pamopts}]
|
||||
opts.append({'name':'appdefaults', 'type':'section', 'value':appopts})
|
||||
|
||||
|
||||
@@ -296,9 +296,6 @@ class BasePathNamespace:
|
||||
CA_TOPOLOGY_ULDIF = "/usr/share/ipa/ca-topology.uldif"
|
||||
IPA_HTML_DIR = "/usr/share/ipa/html"
|
||||
CA_CRT = "/usr/share/ipa/html/ca.crt"
|
||||
KRB_CON = "/usr/share/ipa/html/krb.con"
|
||||
HTML_KRB5_INI = "/usr/share/ipa/html/krb5.ini"
|
||||
HTML_KRBREALM_CON = "/usr/share/ipa/html/krbrealm.con"
|
||||
SCHEMA_COMPAT_ULDIF = "/usr/share/ipa/updates/91-schema_compat.update"
|
||||
SCHEMA_COMPAT_POST_ULDIF = "/usr/share/ipa/schema_compat_post.uldif"
|
||||
SUBID_GENERATORS_ULDIF = "/usr/share/ipa/subid-generators.uldif"
|
||||
|
||||
@@ -379,9 +379,6 @@ class KrbInstance(service.Service):
|
||||
self.__template_file(paths.KRB5_CONF)
|
||||
self.__template_file(paths.KRB5_FREEIPA_SERVER)
|
||||
self.__template_file(paths.KRB5_FREEIPA, client_template=True)
|
||||
self.__template_file(paths.HTML_KRB5_INI)
|
||||
self.__template_file(paths.KRB_CON)
|
||||
self.__template_file(paths.HTML_KRBREALM_CON)
|
||||
|
||||
MIN_KRB5KDC_WITH_WORKERS = "1.9"
|
||||
cpus = os.sysconf('SC_NPROCESSORS_ONLN')
|
||||
|
||||
Reference in new issue
Block a user