IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

client: remove hard dependency on pam_krb5

Browse Source 
If ipa-client-install is executed with --no-sssd, check if pam_krb5 is
available before proceeding with the install.

https://fedorahosted.org/freeipa/ticket/5557

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
Jan Cholasta
2016-08-01 10:51:24 +02:00
parent 0c4a91348a
commit 984ae3858d
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/ipa-client-install
View File

@@ -2289,6 +2289,10 @@ def install(options, env, fstore, statestore):
# when installing with '--no-sssd' option, check whether nss-ldap is installed # when installing with '--no-sssd' option, check whether nss-ldap is installed
if not options.sssd: if not options.sssd:
if not os.path.exists(paths.PAM_KRB5_SO):
root_logger.error("The pam_krb5 package must be installed")
return CLIENT_INSTALL_ERROR
(nssldap_installed, nosssd_files) = nssldap_exists() (nssldap_installed, nosssd_files) = nssldap_exists()
if not nssldap_installed: if not nssldap_installed:
root_logger.error("One of these packages must be installed: " + root_logger.error("One of these packages must be installed: " +

1
freeipa.spec.in
View File

@@ -326,7 +326,6 @@ Requires: cyrus-sasl-gssapi%{?_isa}
Requires: ntp Requires: ntp
Requires: krb5-workstation Requires: krb5-workstation
Requires: authconfig Requires: authconfig
Requires: pam_krb5
Requires: curl Requires: curl
# NIS domain name config: /usr/lib/systemd/system/*-domainname.service # NIS domain name config: /usr/lib/systemd/system/*-domainname.service
Requires: initscripts Requires: initscripts

2
ipaplatform/base/paths.py
View File

@@ -191,11 +191,13 @@ class BasePathNamespace(object):
USR_LIB_DIRSRV = "/usr/lib/dirsrv" USR_LIB_DIRSRV = "/usr/lib/dirsrv"
LIB_FIREFOX = "/usr/lib/firefox" LIB_FIREFOX = "/usr/lib/firefox"
LIBSOFTHSM2_SO = "/usr/lib/pkcs11/libsofthsm2.so" LIBSOFTHSM2_SO = "/usr/lib/pkcs11/libsofthsm2.so"
PAM_KRB5_SO = "/usr/lib/security/pam_krb5.so"
LIB_SYSTEMD_SYSTEMD_DIR = "/usr/lib/systemd/system/" LIB_SYSTEMD_SYSTEMD_DIR = "/usr/lib/systemd/system/"
BIND_LDAP_SO_64 = "/usr/lib64/bind/ldap.so" BIND_LDAP_SO_64 = "/usr/lib64/bind/ldap.so"
USR_LIB_DIRSRV_64 = "/usr/lib64/dirsrv" USR_LIB_DIRSRV_64 = "/usr/lib64/dirsrv"
LIB64_FIREFOX = "/usr/lib64/firefox" LIB64_FIREFOX = "/usr/lib64/firefox"
LIBSOFTHSM2_SO_64 = "/usr/lib64/pkcs11/libsofthsm2.so" LIBSOFTHSM2_SO_64 = "/usr/lib64/pkcs11/libsofthsm2.so"
PAM_KRB5_SO_64 = "/usr/lib64/security/pam_krb5.so"
DOGTAG_IPA_CA_RENEW_AGENT_SUBMIT = "/usr/libexec/certmonger/dogtag-ipa-ca-renew-agent-submit" DOGTAG_IPA_CA_RENEW_AGENT_SUBMIT = "/usr/libexec/certmonger/dogtag-ipa-ca-renew-agent-submit"
DOGTAG_IPA_RENEW_AGENT_SUBMIT = "/usr/libexec/certmonger/dogtag-ipa-renew-agent-submit" DOGTAG_IPA_RENEW_AGENT_SUBMIT = "/usr/libexec/certmonger/dogtag-ipa-renew-agent-submit"
IPA_SERVER_GUARD = "/usr/libexec/certmonger/ipa-server-guard" IPA_SERVER_GUARD = "/usr/libexec/certmonger/ipa-server-guard"

1
ipaplatform/redhat/paths.py
View File

@@ -32,6 +32,7 @@ class RedHatPathNamespace(BasePathNamespace):
# https://docs.python.org/2/library/platform.html#cross-platform # https://docs.python.org/2/library/platform.html#cross-platform
if sys.maxsize > 2**32: if sys.maxsize > 2**32:
LIBSOFTHSM2_SO = BasePathNamespace.LIBSOFTHSM2_SO_64 LIBSOFTHSM2_SO = BasePathNamespace.LIBSOFTHSM2_SO_64
PAM_KRB5_SO = BasePathNamespace.PAM_KRB5_SO_64
paths = RedHatPathNamespace() paths = RedHatPathNamespace()