[PATCH] remove pam_smbpass configure option

[Alexander Bokovoy]

Hi,

please review & commit.

We still have section on pam_smbpass in
docs-xml/Samba3-HOWTO/TOSHARG-PAM.xml but I'm not sure whether it makes
sense to remove it completely as well.

-- 
/ Alexander Bokovoy
-------------- next part --------------
>From 0cdc01631432be88ff8d6aea3b535ce153405f50 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab at samba.org>
Date: Wed, 4 Nov 2015 17:50:15 +0200
Subject: [PATCH 1/2] source3/wscript: remove pam_smbpass option as it was
 removed

pam_smbpass module was removed in 3c00e8d76a2ef6194a8ce522c15853e5b8e9262b
but corresponding configure option wasn't removed.

Signed-off-by: Alexander Bokovoy <ab at samba.org>
---
 source3/wscript | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/source3/wscript b/source3/wscript
index 3118f59..fac10a8 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -42,7 +42,6 @@ def set_options(opt):
     opt.SAMBA3_ADD_OPTION('cups', with_name="enable", without_name="disable")
     opt.SAMBA3_ADD_OPTION('iprint', with_name="enable", without_name="disable")
     opt.SAMBA3_ADD_OPTION('pam')
-    opt.SAMBA3_ADD_OPTION('pam_smbpass')
     opt.SAMBA3_ADD_OPTION('quotas')
     opt.SAMBA3_ADD_OPTION('sendfile-support')
     opt.SAMBA3_ADD_OPTION('utmp')
@@ -966,9 +965,6 @@ int i; i = PAM_RADIO_TYPE;
             conf.DEFINE('WITH_PAM', 1)
             conf.DEFINE('WITH_PAM_MODULES', 1)
 
-    if Options.options.with_pam_smbpass:
-        conf.env.with_pam_smbpass = True
-
     seteuid = False
 
 #
-- 
2.5.0

-------------- next part --------------
>From c5d15dba1c2a5e4cd5c1087ad554d4394668a1c3 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab at samba.org>
Date: Wed, 4 Nov 2015 17:58:42 +0200
Subject: [PATCH 2/2] spec files: remove pam_smbpass

Remove remaining pam_smbpass options from RHEL spec file templates.

Signed-off-by: Alexander Bokovoy <ab at samba.org>
---
 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(-)

diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index 62a326c..c36d4bd 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 7522806..5324868 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 5188fa5..df14236 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
-- 
2.5.0