From 278c257b6897ac507027781cdbea8201afeef543 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Wed, 4 Nov 2015 17:58:42 +0200 Subject: spec files: remove pam_smbpass Remove remaining pam_smbpass options from RHEL spec file templates. Signed-off-by: Alexander Bokovoy Reviewed-by: Jeremy Allison --- packaging/RHEL-CTDB/configure.rpm | 1 - packaging/RHEL-CTDB/samba.spec.tmpl | 4 +--- packaging/RHEL/samba.spec.tmpl | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-) (limited to 'packaging') diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm index 62a326c1dea..c36d4bdf285 100755 --- a/packaging/RHEL-CTDB/configure.rpm +++ b/packaging/RHEL-CTDB/configure.rpm @@ -51,7 +51,6 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE -O3" ./configure -C \ --with-ads \ --with-automount \ --enable-fhs \ - --with-pam_smbpass \ --with-libsmbclient \ --without-smbwrapper \ --with-pam \ diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index 75228069c4d..e76137e2630 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -169,7 +169,6 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ --with-ads \ --with-automount \ --enable-fhs \ - --with-pam_smbpass \ --with-libsmbclient \ --without-smbwrapper \ --with-pam \ @@ -199,7 +198,7 @@ fi make -j %{numcpu} %{?_smp_mflags} \ - everything modules pam_smbpass + everything modules # check that desired suppor has been compiled into smbd: export LD_LIBRARY_PATH=./bin @@ -522,7 +521,6 @@ exit 0 %attr(755,root,root) /%{_libarch}/libnss_winbind.so %attr(755,root,root) /%{_libarch}/libnss_winbind.so.2 %attr(755,root,root) /%{_libarch}/security/pam_winbind.so -%attr(755,root,root) /%{_libarch}/security/pam_smbpass.so /usr/share/locale/*/LC_MESSAGES/pam_winbind.mo /usr/share/locale/*/LC_MESSAGES/net.mo diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl index 5188fa53344..0f51c4e1b43 100644 --- a/packaging/RHEL/samba.spec.tmpl +++ b/packaging/RHEL/samba.spec.tmpl @@ -165,7 +165,6 @@ CC="$CC" CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ --with-ads \ --with-automount \ --with-fhs \ - --with-pam_smbpass \ --with-libsmbclient \ --without-smbwrapper \ --with-pam \ @@ -188,7 +187,7 @@ if [ ${CC_MAJOR} -ge 3 ]; then fi -make all modules pam_smbpass +make all modules # Remove some permission bits to avoid to many dependencies cd .. @@ -444,7 +443,6 @@ fi %attr(755,root,root) /%{_libarch}/libnss_wins.so* %attr(755,root,root) /%{_libarch}/libnss_winbind.so* %attr(755,root,root) /%{_libarch}/security/pam_winbind.so -%attr(755,root,root) /%{_libarch}/security/pam_smbpass.so /usr/share/locale/de/LC_MESSAGES/net.mo /usr/share/locale/de/LC_MESSAGES/pam_winbind.mo /usr/share/locale/ar/LC_MESSAGES/pam_winbind.mo -- cgit v1.2.1