summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonatan Pålsson <jonatan.p@gmail.com>2020-03-25 12:43:16 +0100
committerArmin Kuster <akuster808@gmail.com>2020-03-27 16:53:25 -0700
commit52e3654d34154f2ab40faa0d9ff4e690486ad9d0 (patch)
tree3ecf0b5ace43d1edb72dd1f696f4e1814998b9b4
parent79d9fc23e29f3e45ab6b753237980905eba6e49e (diff)
downloadmeta-security-52e3654d34154f2ab40faa0d9ff4e690486ad9d0.tar.gz
sssd: Add sudo PACKAGECONFIG
sudo was previously on by default, so add it to the default PACKAGECONFIG. The systemd files are only installed when --with-sudo is passed to configure, so conditionally add them to SYSTEMD_SERVICE. Signed-off-by: Jonatan Pålsson <jonatan.p@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--recipes-security/sssd/sssd_1.16.4.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-security/sssd/sssd_1.16.4.bb b/recipes-security/sssd/sssd_1.16.4.bb
index 24cc003..99697fc 100644
--- a/recipes-security/sssd/sssd_1.16.4.bb
+++ b/recipes-security/sssd/sssd_1.16.4.bb
@@ -33,7 +33,7 @@ CACHED_CONFIGUREVARS = "ac_cv_member_struct_ldap_conncb_lc_arg=no \
33 ac_cv_path_NSUPDATE=${bindir} ac_cv_prog_HAVE_PYTHON3=${PYTHON_DIR} \ 33 ac_cv_path_NSUPDATE=${bindir} ac_cv_prog_HAVE_PYTHON3=${PYTHON_DIR} \
34 " 34 "
35 35
36PACKAGECONFIG ?="nss nscd autofs" 36PACKAGECONFIG ?="nss nscd autofs sudo"
37PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" 37PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}"
38PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 38PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
39 39
@@ -49,6 +49,7 @@ PACKAGECONFIG[python3] = "--with-python3-bindings, --without-python3-bindings"
49PACKAGECONFIG[samba] = "--with-samba, --with-samba=no, samba" 49PACKAGECONFIG[samba] = "--with-samba, --with-samba=no, samba"
50PACKAGECONFIG[selinux] = "--with-selinux, --with-selinux=no --with-semanage=no, libselinux" 50PACKAGECONFIG[selinux] = "--with-selinux, --with-selinux=no --with-semanage=no, libselinux"
51PACKAGECONFIG[ssh] = "--with-ssh, --with-ssh=no, " 51PACKAGECONFIG[ssh] = "--with-ssh, --with-ssh=no, "
52PACKAGECONFIG[sudo] = "--with-sudo, --with-sudo=no, "
52PACKAGECONFIG[systemd] = "--with-initscript=systemd,--with-initscript=sysv" 53PACKAGECONFIG[systemd] = "--with-initscript=systemd,--with-initscript=sysv"
53 54
54EXTRA_OECONF += " \ 55EXTRA_OECONF += " \
@@ -98,6 +99,7 @@ INITSCRIPT_NAME = "sssd"
98INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." 99INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
99SYSTEMD_SERVICE_${PN} = " \ 100SYSTEMD_SERVICE_${PN} = " \
100 ${@bb.utils.contains('PACKAGECONFIG', 'autofs', 'sssd-autofs.service sssd-autofs.socket', '', d)} \ 101 ${@bb.utils.contains('PACKAGECONFIG', 'autofs', 'sssd-autofs.service sssd-autofs.socket', '', d)} \
102 ${@bb.utils.contains('PACKAGECONFIG', 'sudo', 'sssd-sudo.service sssd-sudo.socket', '', d)} \
101 sssd-ifp.service \ 103 sssd-ifp.service \
102 sssd-nss.service \ 104 sssd-nss.service \
103 sssd-nss.socket \ 105 sssd-nss.socket \
@@ -107,8 +109,6 @@ SYSTEMD_SERVICE_${PN} = " \
107 sssd-secrets.service \ 109 sssd-secrets.service \
108 sssd-secrets.socket \ 110 sssd-secrets.socket \
109 sssd.service \ 111 sssd.service \
110 sssd-sudo.service \
111 sssd-sudo.socket \
112" 112"
113SYSTEMD_AUTO_ENABLE = "disable" 113SYSTEMD_AUTO_ENABLE = "disable"
114 114