[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Tue Sep 28 01:41:58 MDT 2010
The branch, master has been updated
via 2a1891a s3-waf: fix dependencies in most of our module subsystems.
via 5fcd047 s3-waf: add pam_smbpass.
from 07697fa s3-auth_util: make sure the system server info actually contains S-1-5-18.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2a1891a9d67d547847b233dec85925d726696e7f
Author: Günther Deschner <gd at samba.org>
Date: Tue Sep 28 09:27:54 2010 +0200
s3-waf: fix dependencies in most of our module subsystems.
Guenther
commit 5fcd0471e59c35d0769628fa8d1a021bf78b714c
Author: Günther Deschner <gd at samba.org>
Date: Tue Sep 28 08:54:39 2010 +0200
s3-waf: add pam_smbpass.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/auth/wscript_build | 8 ++------
source3/libgpo/gpext/wscript_build | 1 -
source3/modules/wscript_build | 16 +---------------
source3/pam_smbpass/wscript_build | 13 +++++++++++++
source3/winbindd/wscript_build | 1 -
source3/wscript | 4 ++++
source3/wscript_build | 7 +------
7 files changed, 21 insertions(+), 29 deletions(-)
create mode 100644 source3/pam_smbpass/wscript_build
Changeset truncated at 500 lines:
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index bdfa582..af5b984 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -10,8 +10,7 @@ AUTH_WBC_SRC = 'auth_wbc.c'
AUTH_SCRIPT_SRC = 'auth_script.c'
AUTH_NETLOGOND_SRC = 'auth_netlogond.c'
-AUTH_STATIC = ''
-AUTH_SRC = '''${AUTH_STATIC} auth.c auth_util.c token_util.c
+AUTH_SRC = '''auth.c auth_util.c token_util.c
server_info.c
server_info_sam.c
user_info.c
@@ -21,10 +20,7 @@ AUTH_SRC = '''${AUTH_STATIC} auth.c auth_util.c token_util.c
bld.SAMBA_SUBSYSTEM('AUTH',
source=AUTH_SRC,
- deps='''AUTH_SAM AUTH_UNIX AUTH_WINBIND AUTH_WBC
- AUTH_SERVER AUTH_DOMAIN AUTH_BUILTIN
- AUTH_NETLOGOND
- PLAINTEXT_AUTH SLCACHE DCUTIL''',
+ deps='''PLAINTEXT_AUTH SLCACHE DCUTIL''',
vars=locals())
bld.SAMBA_MODULE('AUTH_SAM',
diff --git a/source3/libgpo/gpext/wscript_build b/source3/libgpo/gpext/wscript_build
index c2cca3d..8f7164a 100644
--- a/source3/libgpo/gpext/wscript_build
+++ b/source3/libgpo/gpext/wscript_build
@@ -8,7 +8,6 @@ GPEXT_SRC = '''../../../libgpo/gpext/gpext.c'''
bld.SAMBA_SUBSYSTEM('GPEXT',
source=GPEXT_SRC,
- deps='''GPEXT_REGISTRY GPEXT_SCRIPTS GPEXT_SECURITY''',
vars=locals())
bld.SAMBA_MODULE('GPEXT_REGISTRY',
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 8f0e547..eebac9d 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -59,19 +59,7 @@ bld.SAMBA_SUBSYSTEM('VFS_AIXACL_UTIL',
bld.SAMBA_SUBSYSTEM('VFS',
source='',
- deps='''VFS_DEFAULT VFS_AUDIT VFS_EXTD_AUDIT
- VFS_FULL_AUDIT VFS_FAKE_PERMS VFS_RECYCLE
- VFS_NETATALK VFS_DEFAULT_QUOTA VFS_READONLY
- VFS_CAP VFS_EXPAND_MSDFS VFS_SHADOW_COPY VFS_SHADOW_COPY2
- VFS_AFSACL VFS_XATTR_TDB VFS_POSIXACL VFS_AIXACL VFS_AIXACL2
- VFS_SOLARISACL VFS_ZFSACL VFS_HPUXACL VFS_IRIXACL
- VFS_TRU64ACL VFS_CATIA VFS_STREAMS_XATTR VFS_STREAMS_DEPOT
- VFS_CACHEPRIME VFS_PREALLOC VFS_COMMIT VFS_GPFS
- VFS_NOTIFY_FAM VFS_READAHEAD VFS_TSMSM VFS_FILEID
- VFS_AIO_FORK VFS_PREOPEN VFS_SYNCOPS VFS_ACL_XATTR
- VFS_ACL_TDB VFS_SMB_TRAFFIC_ANALYZER VFS_ONEFS
- VFS_ONEFS_SHADOW_COPY VFS_DIRSORT VFS_SCANNEDONLY
- VFS_CROSSRENAME VFS_LINUX_XFS_SGID''',
+ deps='''VFS_DEFAULT''',
vars=locals())
bld.SAMBA_MODULE('VFS_DEFAULT',
@@ -414,7 +402,6 @@ CHARSET_MACOSXFS_SRC = 'charset_macosxfs.c'
bld.SAMBA_SUBSYSTEM('CHARSET',
source='',
- deps='''CHARSET_WEIRD CHARSET_CP850 CHARSET_CP437 CHARSET_MACOSXFS''',
vars=locals())
bld.SAMBA_MODULE('CHARSET_WEIRD',
@@ -451,7 +438,6 @@ PERFCOUNT_TEST_SRC = 'perfcount_test.c'
bld.SAMBA_SUBSYSTEM('PERFCOUNT',
source='',
- deps='''PERFCOUNT_ONEFS PERFCOUNT_TEST''',
vars=locals())
bld.SAMBA_MODULE('PERFCOUNT_ONEFS',
diff --git a/source3/pam_smbpass/wscript_build b/source3/pam_smbpass/wscript_build
new file mode 100644
index 0000000..39e615e
--- /dev/null
+++ b/source3/pam_smbpass/wscript_build
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+if bld.CONFIG_SET('HAVE_PAM_START'):
+ bld.SAMBA_LIBRARY('pamsmbpass',
+ source='''pam_smb_auth.c
+ pam_smb_passwd.c
+ pam_smb_acct.c
+ support.c''',
+ deps='''tdb talloc pam libwbclient cap ASN1_UTIL PARAM LIB_NONSMBD PASSDB GROUPDB SMBLDAP
+ LIBSAMBA LIBTSOCKET''',
+ cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
+ realname='pam_smbpass.so',
+ )
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index 3f215e7..5a9aa2a 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -23,7 +23,6 @@ IDMAP_SRC = 'idmap.c idmap_util.c ${IDMAP_RW_SRC}'
bld.SAMBA_SUBSYSTEM('IDMAP',
source=IDMAP_SRC,
- deps='''IDMAP_AD IDMAP_RID IDMAP_PASSDB IDMAP_LDAP IDMAP_TDB2 IDMAP_HASH IDMAP_ADEX''',
vars=locals())
bld.SAMBA_MODULE('IDMAP_AD',
diff --git a/source3/wscript b/source3/wscript
index d9b4646..706b932 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -660,6 +660,10 @@ return 0;
if conf.env.with_iconv:
conf.DEFINE('HAVE_ICONV', 1)
+ if Options.options.with_pam:
+ conf.CHECK_HEADERS('security/pam_appl.h security/pam_modules.h pam/pam_modules.h', together=True)
+ conf.CHECK_FUNCS_IN('pam_start', 'pam', checklibc=True, headers='security/pam_appl.h')
+
seteuid = False
if not seteuid:
seteuid = conf.CHECK_CODE('''
diff --git a/source3/wscript_build b/source3/wscript_build
index c44485f..183eac1 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -944,12 +944,6 @@ SMBFILTER_SRC = '''utils/smbfilter.c'''
WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c ${PARAM_SRC}
${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC} ${LIBNMB_SRC}'''
-PAM_SMBPASS_SRC_0 = '''pam_smbpass/pam_smb_auth.c pam_smbpass/pam_smb_passwd.c
- pam_smbpass/pam_smb_acct.c pam_smbpass/support.c ../lib/util/asn1.c'''
-PAM_SMBPASS_SRC = '''${PAM_SMBPASS_SRC_0} ${PARAM_SRC} ${LIB_NONSMBD_SRC} ${PASSDB_SRC} ${GROUPDB_SRC} \
- ${SMBLDAP_SRC} ${LIBSAMBA_SRC} \
- ${LIBTSOCKET_SRC}'''
-
WBINFO_SRC = '''../nsswitch/wbinfo.c'''
WINBIND_NSS_SRC = '''${WBCOMMON_SRC} ${LIBREPLACE_SRC}'''
@@ -1619,6 +1613,7 @@ bld.RECURSE('auth')
bld.RECURSE('passdb')
bld.RECURSE('winbindd')
bld.RECURSE('libgpo/gpext')
+bld.RECURSE('pam_smbpass')
bld.ENFORCE_GROUP_ORDERING()
bld.CHECK_PROJECT_RULES()
--
Samba Shared Repository
More information about the samba-cvs
mailing list