[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Fri Nov 6 09:37:04 UTC 2015
The branch, master has been updated
via bae51eb Fix up some aesthetics ... ie, align things as they were intended.
via 278c257 spec files: remove pam_smbpass
via 21d0082 source3/wscript: remove pam_smbpass option as it was removed
from c6ae462 doc: fix a typo in the smb.conf manpage, explanation of idmap config
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bae51eb24eaf40a3bd46420945b3a5bcca2b3099
Author: Richard Sharpe <rsharpe at samba.org>
Date: Thu Nov 5 15:30:18 2015 -0800
Fix up some aesthetics ... ie, align things as they were intended.
Signed-off-by: Richard Sharpe <rsharpe at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Fri Nov 6 10:36:37 CET 2015 on sn-devel-104
commit 278c257b6897ac507027781cdbea8201afeef543
Author: Alexander Bokovoy <ab at samba.org>
Date: Wed Nov 4 17:58:42 2015 +0200
spec files: remove pam_smbpass
Remove remaining pam_smbpass options from RHEL spec file templates.
Signed-off-by: Alexander Bokovoy <ab at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 21d0082169bb61417aa7a564050f930808764ac8
Author: Alexander Bokovoy <ab at samba.org>
Date: Wed Nov 4 17:50:15 2015 +0200
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>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/util/debug.h | 4 ++--
packaging/RHEL-CTDB/configure.rpm | 1 -
packaging/RHEL-CTDB/samba.spec.tmpl | 4 +---
packaging/RHEL/samba.spec.tmpl | 4 +---
source3/wscript | 4 ----
5 files changed, 4 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/debug.h b/lib/util/debug.h
index 2a0a05c..95b0a30 100644
--- a/lib/util/debug.h
+++ b/lib/util/debug.h
@@ -223,8 +223,8 @@ extern int *DEBUGLEVEL_CLASS;
#define DBG_ERR(...) DBG_PREFIX(DBGLVL_ERR, (__VA_ARGS__))
#define DBG_WARNING(...) DBG_PREFIX(DBGLVL_WARNING, (__VA_ARGS__))
-#define DBG_NOTICE(...) DBG_PREFIX(DBGLVL_NOTICE, (__VA_ARGS__))
-#define DBG_INFO(...) DBG_PREFIX(DBGLVL_INFO, (__VA_ARGS__))
+#define DBG_NOTICE(...) DBG_PREFIX(DBGLVL_NOTICE, (__VA_ARGS__))
+#define DBG_INFO(...) DBG_PREFIX(DBGLVL_INFO, (__VA_ARGS__))
#define DBG_DEBUG(...) DBG_PREFIX(DBGLVL_DEBUG, (__VA_ARGS__))
/* The following definitions come from lib/debug.c */
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..e76137e 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..0f51c4e 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
diff --git a/source3/wscript b/source3/wscript
index 092d8fa..4b65d88 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
#
--
Samba Shared Repository
More information about the samba-cvs
mailing list