Skip to content

Commit 561a38b

Browse files
SPEC: build and package SSSD without any file capabilities
1 parent 7a25230 commit 561a38b

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

Makefile.am

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ SUBDIRS += . src/tests/cwrap src/tests/intg src/tests/test_CA \
3030
# Some old versions of automake don't define builddir
3131
builddir ?= .
3232

33-
SETCAP = @SETCAP@
3433
DOXYGEN = @DOXYGEN@
3534

3635
DISTSETUPOPTS =
@@ -5511,19 +5510,15 @@ endif
55115510
if SSSD_USER
55125511
-chgrp $(SSSD_USER) $(DESTDIR)$(sssdlibexecdir)/ldap_child
55135512
chmod 750 $(DESTDIR)$(sssdlibexecdir)/ldap_child
5514-
-$(SETCAP) cap_dac_read_search=p $(DESTDIR)$(sssdlibexecdir)/ldap_child
55155513
-chgrp $(SSSD_USER) $(DESTDIR)$(sssdlibexecdir)/krb5_child
55165514
chmod 750 $(DESTDIR)$(sssdlibexecdir)/krb5_child
5517-
-$(SETCAP) cap_dac_read_search,cap_setuid,cap_setgid=p $(DESTDIR)$(sssdlibexecdir)/krb5_child
55185515
-chgrp $(SSSD_USER) $(DESTDIR)$(sssdlibexecdir)/proxy_child
55195516
chmod 750 $(DESTDIR)$(sssdlibexecdir)/proxy_child
55205517
-chgrp $(SSSD_USER) $(DESTDIR)$(sssdlibexecdir)/sssd_pam
55215518
chmod 750 $(DESTDIR)$(sssdlibexecdir)/sssd_pam
5522-
-$(SETCAP) cap_dac_read_search=p $(DESTDIR)$(sssdlibexecdir)/sssd_pam
55235519
if BUILD_SELINUX
55245520
-chgrp $(SSSD_USER) $(DESTDIR)$(sssdlibexecdir)/selinux_child
55255521
chmod 750 $(DESTDIR)$(sssdlibexecdir)/selinux_child
5526-
-$(SETCAP) cap_setuid,cap_setgid=p $(DESTDIR)$(sssdlibexecdir)/selinux_child
55275522
endif
55285523
endif
55295524

contrib/sssd.spec.in

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ BuildRequires: libfido2-devel
9090
BuildRequires: libini_config-devel >= 1.3
9191
BuildRequires: libldb-devel
9292
BuildRequires: libnfsidmap-devel
93-
BuildRequires: libselinux-devel
9493
BuildRequires: libsmbclient-devel
9594
BuildRequires: libtalloc-devel
9695
BuildRequires: libtdb-devel
@@ -118,7 +117,6 @@ BuildRequires: python3-setuptools
118117
BuildRequires: samba-devel
119118
# required for idmap_sss.so
120119
BuildRequires: samba-winbind
121-
BuildRequires: selinux-policy-targeted
122120
BuildRequires: bc
123121
BuildRequires: uid_wrapper
124122
BuildRequires: po4a
@@ -512,6 +510,7 @@ autoreconf -ivf
512510
--with-id-provider-idp=no \
513511
%endif
514512
--without-libnl \
513+
--without-selinux \
515514
%{nil}
516515

517516
%make_build all docs runstatedir=%{_rundir}
@@ -673,7 +672,7 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
673672
%dir %{_libexecdir}/%{servicename}
674673
%{_libexecdir}/%{servicename}/sssd_be
675674
%{_libexecdir}/%{servicename}/sssd_nss
676-
%attr(0750,root,sssd) %caps(cap_dac_read_search=p) %{_libexecdir}/%{servicename}/sssd_pam
675+
%attr(0750,root,sssd) %{_libexecdir}/%{servicename}/sssd_pam
677676
%{_libexecdir}/%{servicename}/sssd_autofs
678677
%{_libexecdir}/%{servicename}/sssd_ssh
679678
%{_libexecdir}/%{servicename}/sssd_sudo
@@ -751,8 +750,8 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
751750
%files krb5-common
752751
%license COPYING
753752
%attr(775,sssd,sssd) %dir %{pubconfpath}/krb5.include.d
754-
%attr(0750,root,sssd) %caps(cap_dac_read_search=p) %{_libexecdir}/%{servicename}/ldap_child
755-
%attr(0750,root,sssd) %caps(cap_dac_read_search,cap_setuid,cap_setgid=p) %{_libexecdir}/%{servicename}/krb5_child
753+
%attr(0750,root,sssd) %{_libexecdir}/%{servicename}/ldap_child
754+
%attr(0750,root,sssd) %{_libexecdir}/%{servicename}/krb5_child
756755
%config(noreplace) %{_sysconfdir}/krb5.conf.d/enable_sssd_conf_dir
757756
%dir %{_datadir}/sssd/krb5-snippets
758757
%{_datadir}/sssd/krb5-snippets/enable_sssd_conf_dir
@@ -770,7 +769,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
770769
%license COPYING
771770
%attr(770,sssd,sssd) %dir %{keytabdir}
772771
%{_libdir}/%{name}/libsss_ipa.so
773-
%attr(0750,root,sssd) %caps(cap_setuid,cap_setgid=p) %{_libexecdir}/%{servicename}/selinux_child
774772
%{_mandir}/man5/sssd-ipa.5*
775773

776774
%files ad -f sssd_ad.lang

0 commit comments

Comments
 (0)