[SCM] Samba Shared Repository - branch v4-0-test updated
Karolin Seeger
kseeger at samba.org
Mon Oct 1 05:09:03 MDT 2012
The branch, v4-0-test has been updated
via a92e4e5 docs-xml: fix build of winbindd- and krb5 locator-related manpages
via 08cb895 docs-xml: convert smb.conf.5 build to waf
via de953ff build: Fix build on systems without ldap development headers
via 6f07216 s3: make smbldaphelper subsystem an internal library
via aeac5ef WHATSNEW: Start release notes for Samba 4.0.0rc2.
from c10debd s3-smbd: Don't segfault if user specified ports out for range.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit a92e4e5a09d2665c0e22a0a11cd3ecc67a94f2a7
Author: Alexander Bokovoy <ab at samba.org>
Date: Mon Sep 17 19:09:35 2012 +0300
docs-xml: fix build of winbindd- and krb5 locator-related manpages
These manpages depend on docs-xml infrastructure (samba DTDs)
Autobuild-User(master): Alexander Bokovoy <ab at samba.org>
Autobuild-Date(master): Mon Sep 17 19:52:53 CEST 2012 on sn-devel-104
The last 2 patches address bug #9229 - make man pages buildable via WAF.
Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-0-test): Mon Oct 1 13:08:28 CEST 2012 on sn-devel-104
commit 08cb89527925e7460c4ada5cd72f576eb344d1b6
Author: Alexander Bokovoy <ab at samba.org>
Date: Mon Sep 17 13:07:26 2012 +0300
docs-xml: convert smb.conf.5 build to waf
smb.conf(5) is different from other manpages because before it is
built, it gets merged together from a number of smaller files, one
per parameter. So we first create a parameters.all.xml file that
references all these files and then include it into master smb.conf.5.xml
One small issue is how to handle generated files in WAF build
from xi:include perspective as the files are generated in bin/default/docs-xml
rather than in docs-xml. We solve this by further expanding use of XML catalogs
and rewriting virtual path http://www.samba.org/samba/smbdotconf/ to proper
location.
Both docs-xml autoconf and waf builds work correctly now.
Autobuild-User(master): Alexander Bokovoy <ab at samba.org>
Autobuild-Date(master): Mon Sep 17 14:18:31 CEST 2012 on sn-devel-104
commit de953ff43f0c42b2cf494309bdabf74bd2509eb3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 14 11:58:02 2012 -0700
build: Fix build on systems without ldap development headers
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Fri Sep 14 22:53:30 CEST 2012 on sn-devel-104
The last 2 patches address bug #9228 - libpdb/pdb_ldap/idmap_ldap build
dependencies cleanup (for 4.0RC2).
commit 6f0721610f02b0fea15d8f01f1defc1dcac6c6ab
Author: Alexander Bokovoy <ab at samba.org>
Date: Thu Sep 13 20:29:25 2012 +0300
s3: make smbldaphelper subsystem an internal library
Break pdb_ldap -> smbldaphelper -> pdb -> pdb_ldap loop by
making smbldaphelp intentionally underlinked internal library.
It means that libsmbldaphelp is not usable unless its user is
also linked to libpdb (that is the case for both its users,
idmap_ldap and pdb_ldap, already) but gives us a break of
the circular dependency in case pdb_ldap statically linked
into pdb (default).
This should solve case when idmap_ldap and pdb_ldap are dynamically
loaded modules
Autobuild-User(master): Alexander Bokovoy <ab at samba.org>
Autobuild-Date(master): Fri Sep 14 01:02:21 CEST 2012 on sn-devel-104
commit aeac5ef7f70236950f971fc64f02efa2e120847b
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Sep 28 11:30:06 2012 +0200
WHATSNEW: Start release notes for Samba 4.0.0rc2.
To be continued...
Karolin
(cherry picked from commit e30937e2826b43ebb3a77b621a6de8bf272b02d0)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 213 +++++++++++++++++++++++++-------------
buildtools/wafsamba/wafsamba.py | 6 +-
docs-xml/build/catalog.xml.in | 7 +-
docs-xml/manpages/smb.conf.5.xml | 5 +-
docs-xml/wscript_build | 29 +++++-
source3/passdb/ABI/pdb-0.sigs | 7 --
source3/winbindd/wscript_build | 2 +-
source3/wscript_build | 13 ++-
wscript_build | 6 +-
9 files changed, 195 insertions(+), 93 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index b594e0e..c62676e 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,33 +1,24 @@
-What's new in Samba 4.0.0 rc1
-=============================
+Release Announcements
+=====================
+
+This is the second release candidate of Samba 4.0. This is *not*
+intended for production environments and is designed for testing
+purposes only. Please report any defects via the Samba bug reporting
+system at https://bugzilla.samba.org/.
Samba 4.0 will be the next version of the Samba suite and incorporates
-all the technology found in both the Samba4 alpha series and the
+all the technology found in both the Samba4 series and the
stable 3.x series. The primary additional features over Samba 3.6 are
support for the Active Directory logon protocols used by Windows 2000
and above.
-
-WARNINGS
-========
-
-Samba 4.0.0 rc1 is not a final Samba release, however we are now making
-good progress towards a Samba 4.0 release. However, this is expected to be the
-last beta release before we start on our release candidate series.
-
This release contains the best of all of Samba's
technology parts, both a file server (that you can reasonably expect
to upgrade existing Samba 3.x releases to) and the AD domain
controller work previously known as 'samba4'.
-Samba 4.0 is subjected to an awesome battery of tests on an automated
-basis, we have found Samba 4.0 to be very stable in it's behaviour.
-However, as with all our pre-releases we still recommend against
-upgrading production servers from Samba 3.x release to Samba 4.0 beta
-at this stage.
-
If you are upgrading, or looking to develop, test or deploy Samba 4.0
-beta releases, you should backup all configuration and data.
+releases candidates, you should backup all configuration and data.
UPGRADING
@@ -36,7 +27,7 @@ UPGRADING
Users upgrading from Samba 3.x domain controllers and wanting to use
Samba 4.0 as an AD DC should use the 'samba-tool domain
classicupgrade' command. See the wiki for more details:
-https://wiki.samba.org/index.php/Samba4/samba3upgrade/HOWTO
+https://wiki.samba.org/index.php/Samba4/samba3upgrade/HOWTO.
Users upgrading from Samba 4.0 alpha and beta releases since alpha15
should run 'samba-tool dbcheck --cross-ncs --fix' before re-starting
@@ -53,6 +44,7 @@ If you used the BIND9_FLATFILE or BIND9_DLZ features,
you'll have to add '-dns' to the 'server services' option,
as the internal dns server (SAMBA_INTERNAL) is the default now.
+
NEW FEATURES
============
@@ -66,17 +58,17 @@ Samba3-like logon services provided over CIFS. We correctly generate
the infamous Kerberos PAC, and include it with the Kerberos tickets we
issue.
-Samba 4.0 beta ships with two distinct file servers. We now use the
+Samba 4.0.0rc2 ships with two distinct file servers. We now use the
file server from the Samba 3.x series 'smbd' for all file serving by
default.
Samba 4.0 also ships with the 'NTVFS' file server. This file server
-is what was used in all previous alpha releases of Samba 4.0, and is
+is what was used in all previous releases of Samba 4.0, and is
tuned to match the requirements of an AD domain controller. We
continue to support this, not only to provide continuity to
installations that have deployed it as part of an AD DC, but also as a
running example of the NT-FSA architecture we expect to move smbd to in
-the longer term.
+the longer term.
For pure file server work, the binaries users would expect from that
series (nmbd, winbindd, smbpasswd) continue to be available. When
@@ -102,53 +94,132 @@ Finally, a new scripting interface has been added to Samba 4, allowing
Python programs to interface to Samba's internals, and many tools and
internal workings of the DC code is now implemented in python.
-CHANGES SINCE beta8
-===================
-
-For a list of changes since beta8, please see the git log.
-
-$ git clone git://git.samba.org/samba.git
-$ cd samba.git
-$ git log samba-4.0.0beta8..samba-4.0.0rc1
-
-Some major user-visible changes include:
-
-- The smbd file server now offers SMB3 as the maximum protocol
- by default. Samba can negotiate version 3 of the SMB protocol
- and supports the required features, including all required
- features of SMB 2.1 and SMB 2.0. Note that this does not imply
- that Samba implements all features of SMB3 since many of them
- are optional capabilities. Examples of features that Samba does
- not implement yet are leases (SMB 2.1) and multi-channel (SMB 3).
-
- Samba now offers an initial support for SMB2 durable file handles.
- These are enabled by default and can be turned off on a per share
- basis by setting "durable handles = no" on the share configuration.
- Note that in order to prevent conflicts with other applications
- accessing the same files, durable handles are only granted on
- shares that are configured for CIFS/SMB2-only access, i.e. more
- explicitly shares that are configured for minimal interoperability
- with these settings:
-
- kernel oplocks = no
- kernel share modes = no
- posix locking = no
-
- The option "kernel share modes" has been introduced to be able
- to turn the translation of SMB share modes into kernel flocks
- off.
-
-- The 'provision' script was merged into 'samba-tool'
- as 'samba-tool domain provision' the arguments are still
- the same.
-- The 'updateprovision' script was renamed to 'samba_upgradeprovision'.
+######################################################################
+Changes
+#######
+
+smb.conf changes
+----------------
+
+ Parameter Name Description Default
+ -------------- ----------- -------
+
+ allow dns updates New disabled
+ announce as Removed
+ announce version Removed
+ cldap port New 0
+ client max protocol New
+ client min protocol New
+ client signing Changed default default
+ dcerpc endpoint servers New
+ dgram port New 0
+ display charset Removed
+ dns forwarder New
+ dns update command New
+ homedir map Changed default auto.home
+ kernel share modes New Yes
+ kpasswd port New 0
+ krb5 port New 0
+ max protocol Removed
+ min protocol Removed
+ nbt client socket address New 0.0.0.0
+ nbt port New 0
+ nsupdate command New
+ ntp signd socket directory New
+ ntvfs handler New
+ paranoid server security Removed
+ pid directory New
+ printer admin Removed
+ rndc command New
+ rpc big endian New No
+ samba kcc command New
+ send spnego principal Removed
+ server max protocol New SMB3
+ server min protocol New LANMAN1
+ server role New auto
+ server services New
+ server signing Changed default default
+ share backend New
+ share modes Removed
+ smb2 max read Changed default 1048576
+ smb2 max write Changed default 1048576
+ smb2 max trans Changed default 1048576
+ socket address Removed
+ spn update command New
+ time offset Removed
+ tls cafile New
+ tls certfile New
+ tls crlfile New
+ tls dh params file New
+ tls enabled New No
+ tls keyfile New
+ unicode New Yes
+ web port New 0
+ winbindd privileged socket directory New
+ winbind sealed pipes New No
+ winbindd socket directory New
+
+
+CHANGES SINCE 4.0.0rc1
+======================
+
+o Michael Adam <obnox at samba.org>
+ * BUG 9173: Make the SMB2 compound request create/delete_on_close/
+ close work as Windows.
+
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 9161: Re-add the vfs_Chdir() cache.
+ * BUG 9189: SMB2 Create doesn't return correct MAX ACCESS access mask in
+ blob.
+ * BUG 9213: Bad ASN.1 NegTokenInit packet can cause invalid free.
+
+
+o Christian Ambach <ambi at samba.org>
+ * BUG 9162: Fix the build of the GPFS VFS module.
+ * BUG 9197: Only do 'printing_subsystem_update' when printing is enabled.
+
+
+o Alexander Bokovoy <ab at samba.org>
+ * BUG 9157: Cleanup idmap_ldap build dependencies.
+
+
+o Ira Cooper <ira at samba.org>
+ * BUG 9162: Fix build on Illumos/Solaris using '--with-acl'.
+ * BUG 9173: Compound requests should continue processing.
+
+
+o Björn Jacke <bj at sernet.de>
+ * BUG 9162: Fix the build of the ACL VFS modules.
+ * BUG 9172: Fix reporting of gfs2 quotas.
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 9217: CreateFile with FILE_DIRECTORY_FILE can create directories
+ on read-only shares.
+
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 9173: Make the SMB2 compound request create/delete_on_close/
+ close work as Windows.
+ * BUG 9184: Fix receiving of UDP packets from 0 bytes.
+ * BUG 9191: Release the share mode lock before calling exit_server().
+ * BUG 9193: Fix usage of invalid memory in smb2_signing_check_pdu().
+ * BUG 9194: Disallow '--prefix=/usr' and '--prefix=/usr/local' without
+ '--enable-fhs'.
+ * BUG 9198: Fix RHEL-CTDB packaging.
+
+
+o Matthieu Patou <mat at matws.net>
+ * BUG 9199: Fix usage of "panic action".
+
+
+o Andreas Schneider <asn at samba.org>
+ * BUG 8632: Fix builtin forms order to match Windows again.
+ * BUG 9159: Fix generating idmap manpages.
+ * BUG 9218: Don't segfault if user specified ports out for range.
-- We changed the default dns implementation to the internal dns server
- (SAMBA_INTERNAL). BIND9_FLATFILE and BIND9_DLZ are still available,
- but you'll have to add '-dns' to the 'server services' option
- to disable the internal dns server.
- The default for 'allow dns updates' has changed to 'secure only'.
KNOWN ISSUES
============
@@ -179,17 +250,17 @@ KNOWN ISSUES
this partition is not yet reliable.
- Replication may fail on FreeBSD due to getaddrinfo() rejecting names
- containing _. A workaround will be in a future beta.
+ containing _. A workaround will be in a future release.
- samba_upgradeprovision should not be run when upgrading to this release
from a recent release. No important database format changes have
- been made since alpha16.
+ been made since alpha16.
- Installation on systems without a system iconv (and developer
headers at compile time) is known to cause errors when dealing with
non-ASCII characters.
-- Domain member support in the 'samba' binary is in it's infancy, and
+- Domain member support in the 'samba' binary is in its infancy, and
is not comparable to the support found in winbindd. As such, do not
use the 'samba' binary (provided for the AD server) on a member
server.
@@ -205,7 +276,7 @@ KNOWN ISSUES
- The DRS replication code may fail. Please contact the team if you
experience issues with DRS replication, as we have fixed many issues
- here in response to feedback from our production users.
+ here in response to feedback from our production users.
RUNNING Samba 4.0 as an AD DC
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 1f71bd3..50bd4fa 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -789,14 +789,16 @@ def SAMBAMANPAGES(bld, manpages):
'''build and install manual pages'''
bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
- os.environ["XML_CATALOG_FILES"] = 'file:///etc/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
+ bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
for m in manpages.split():
source = m + '.xml'
bld.SAMBA_GENERATOR(m,
source=source,
target=m,
group='final',
- rule='${XSLTPROC} --xinclude --stringparam noreference 0 -o ${TGT}.xml --nonet ${SAMBA_EXPAND_XSL} ${SRC} && ${XSLTPROC} --nonet -o ${TGT} ${SAMBA_MAN_XSL} ${TGT}.xml'
+ rule='''export XML_CATALOG_FILES="${SAMBA_CATALOGS}"
+ ${XSLTPROC} --xinclude --stringparam noreference 0 -o ${TGT}.xml --nonet ${SAMBA_EXPAND_XSL} ${SRC}
+ ${XSLTPROC} --nonet -o ${TGT} ${SAMBA_MAN_XSL} ${TGT}.xml'''
)
bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
Build.BuildContext.SAMBAMANPAGES = SAMBAMANPAGES
diff --git a/docs-xml/build/catalog.xml.in b/docs-xml/build/catalog.xml.in
index 4b99cf5..56d13a6 100644
--- a/docs-xml/build/catalog.xml.in
+++ b/docs-xml/build/catalog.xml.in
@@ -6,9 +6,12 @@
<rewriteURI
uriStartString="http://www.samba.org/samba/DTD/"
- rewritePrefix="file://@abs_top_builddir@/build/DTD/"/>
+ rewritePrefix="file://@abs_top_srcdir@/build/DTD/"/>
<rewriteURI
uriStartString="http://www.gnu.org/licenses/"
- rewritePrefix="file://@abs_top_builddir@/Samba3-ByExample/"/>
+ rewritePrefix="file://@abs_top_srcdir@/Samba3-ByExample/"/>
+ <rewriteURI
+ uriStartString="http://www.samba.org/samba/smbdotconf/"
+ rewritePrefix="file://@abs_top_builddir@/smbdotconf/"/>
</catalog>
diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index e09eee0..a73382f 100644
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -757,7 +757,10 @@ chmod 1770 /usr/local/samba/lib/usershares
<title>EXPLANATION OF EACH PARAMETER</title>
<samba:parameterlist>
- <xi:include href="../smbdotconf/parameters.all.xml" parse="xml"/>
+ <!-- The URI below is resolved to local generated version of parameters.all.xml //-->
+ <!-- WAF build places it in bin/default/docs-xml/smbdotconf/parameters.all.xml //-->
+ <!-- and we redirect there via use of XML_CATALOG_FILES, see docs-xml/build/catalog.xml.in //-->
+ <xi:include href="http://www.samba.org/samba/smbdotconf/parameters.all.xml" parse="xml"/>
</samba:parameterlist>
</refsect1>
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index 011854b..32cf9be 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
+from samba_utils import save_file
manpages='''
manpages/eventlogadm.8
manpages/findsmb.1
@@ -23,7 +23,6 @@ manpages='''
manpages/rpcclient.1
manpages/samba.7
manpages/sharesec.1
- manpages/smb.conf.5
manpages/smbcacls.1
manpages/smbclient.1
manpages/smbcontrol.1
@@ -87,12 +86,34 @@ pam_winbind_manpages = '''
krb5_locator_manpages = 'manpages/winbind_krb5_locator.7'
+def smbdotconf_generate_parameter_list(task):
+ parameter_all = task.outputs[0].bldpath(task.env)
+ articles = task.inputs
+
+ t = '<section xmlns:xi="http://www.w3.org/2003/XInclude">\n'
+ for article in articles:
+ t += "<xi:include href='file://" + article.abspath(task.env) + "' parse='xml'/>\n"
+ t += "</section>\n"
+ save_file(parameter_all, t , create_dir=True)
+ return 0
+
+def SMBDOTCONF_MANPAGE(bld, target):
+ ''' assemble and build smb.conf.5 manual page'''
+ articles = bld.path.ant_glob("smbdotconf/**/*.xml")
+ parameter_all = 'smbdotconf/parameters.all.xml'
+ bld.SAMBA_GENERATOR(parameter_all,
+ source=articles,
+ target=parameter_all,
+ rule=smbdotconf_generate_parameter_list)
+ bld.SAMBAMANPAGES(target)
+
if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
+ SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
bld.SAMBAMANPAGES(manpages)
if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
- bld.MANPAGES(pam_winbind_manpages)
+ bld.SAMBAMANPAGES(pam_winbind_manpages)
if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
- bld.MANPAGES(krb5_locator_manpages)
+ bld.SAMBAMANPAGES(krb5_locator_manpages)
diff --git a/source3/passdb/ABI/pdb-0.sigs b/source3/passdb/ABI/pdb-0.sigs
index 2b57301..bc82ff3 100644
--- a/source3/passdb/ABI/pdb-0.sigs
+++ b/source3/passdb/ABI/pdb-0.sigs
@@ -16,19 +16,14 @@ algorithmic_pdb_rid_is_user: bool (uint32_t)
algorithmic_pdb_uid_to_user_rid: uint32_t (uid_t)
algorithmic_pdb_user_rid_to_uid: uid_t (uint32_t)
algorithmic_rid_base: int (void)
-attrib_map_to_delete_v30: {attrib = 5, name = 0xXXXX "sambaPwdLastSet"}, {attrib = 6, name = 0xXXXX "sambaPwdCanChange"}, {attrib = 7, name = 0xXXXX "sambaPwdMustChange"}, {attrib = 8, name = 0xXXXX "sambaLogonTime"}, {attrib = 9, name = 0xXXXX "sambaLogoffTime"}, {attrib = 10, name = 0xXXXX "sambaKickoffTime"}, {attrib = 12, name = 0xXXXX "displayName"}, {attrib = 29, name = 0xXXXX "sambaHomeDrive"}, {attrib = 13, name = 0xXXXX "sambaHomePath"}, {attrib = 14, name = 0xXXXX "sambaLogonScript"}, {attrib = 15, name = 0xXXXX "sambaProfilePath"}, {attrib = 17, name = 0xXXXX "sambaUserWorkstations"}, {attrib = 18, name = 0xXXXX "sambaSID"}, {attrib = 19, name = 0xXXXX "sambaPrimaryGroupSID"}, {attrib = 21, name = 0xXXXX "sambaLMPassword"}, {attrib = 22, name = 0xXXXX "sambaNTPassword"}, {attrib = 23, name = 0xXXXX "sambaDomainName"}, {attrib = 25, name = 0xXXXX "sambaAcctFlags"}, {attrib = 37, name = 0xXXXX "sambaMungedDial"}, {attrib = 35, name = 0xXXXX "sambaBadPasswordCount"},
{attrib = 38, name = 0xXXXX "sambaBadPasswordTime"}, {attrib = 39, name = 0xXXXX "sambaPasswordHistory"}, {attrib = 42, name = 0xXXXX "sambaLogonHours"}, {attrib = 0, name = 0xXXXX}
-attrib_map_v30: {attrib = 1, name = 0xXXXX "uid"}, {attrib = 2, name = 0xXXXX "uidNumber"}, {attrib = 3, name = 0xXXXX "gidNumber"}, {attrib = 4, name = 0xXXXX "homeDirectory"}, {attrib = 5, name = 0xXXXX "sambaPwdLastSet"}, {attrib = 6, name = 0xXXXX "sambaPwdCanChange"}, {attrib = 7, name = 0xXXXX "sambaPwdMustChange"}, {attrib = 8, name = 0xXXXX "sambaLogonTime"}, {attrib = 9, name = 0xXXXX "sambaLogoffTime"}, {attrib = 10, name = 0xXXXX "sambaKickoffTime"}, {attrib = 11, name = 0xXXXX "cn"}, {attrib = 44, name = 0xXXXX "sn"}, {attrib = 12, name = 0xXXXX "displayName"}, {attrib = 29, name = 0xXXXX "sambaHomeDrive"}, {attrib = 13, name = 0xXXXX "sambaHomePath"}, {attrib = 14, name = 0xXXXX "sambaLogonScript"}, {attrib = 15, name = 0xXXXX "sambaProfilePath"}, {attrib = 16, name = 0xXXXX "description"}, {attrib = 17, name = 0xXXXX "sambaUserWorkstations"}, {attrib = 18, name = 0xXXXX "sambaSID"}, {attrib = 19, name = 0xXXXX "sambaPrimaryGroupSID"}, {attrib = 21, name = 0xXXX
X "sambaLMPassword"}, {attrib = 22, name = 0xXXXX "sambaNTPassword"}, {attrib = 23, name = 0xXXXX "sambaDomainName"}, {attrib = 24, name = 0xXXXX "objectClass"}, {attrib = 25, name = 0xXXXX "sambaAcctFlags"}, {attrib = 37, name = 0xXXXX "sambaMungedDial"}, {attrib = 35, name = 0xXXXX "sambaBadPasswordCount"}, {attrib = 38, name = 0xXXXX "sambaBadPasswordTime"}, {attrib = 39, name = 0xXXXX "sambaPasswordHistory"}, {attrib = 41, name = 0xXXXX "modifyTimestamp"}, {attrib = 42, name = 0xXXXX "sambaLogonHours"}, {attrib = 0, name = 0xXXXX}
builtin_domain_name: const char *(void)
cache_account_policy_get: bool (enum pdb_policy_type, uint32_t *)
cache_account_policy_set: bool (enum pdb_policy_type, uint32_t)
create_builtin_administrators: NTSTATUS (const struct dom_sid *)
create_builtin_users: NTSTATUS (const struct dom_sid *)
decode_account_policy_name: const char *(enum pdb_policy_type)
-dominfo_attr_list: {attrib = 23, name = 0xXXXX "sambaDomainName"}, {attrib = 34, name = 0xXXXX "sambaNextRid"}, {attrib = 26, name = 0xXXXX "sambaNextUserRid"}, {attrib = 27, name = 0xXXXX "sambaNextGroupRid"}, {attrib = 28, name = 0xXXXX "sambaSID"}, {attrib = 33, name = 0xXXXX "sambaAlgorithmicRidBase"}, {attrib = 24, name = 0xXXXX "objectClass"}, {attrib = 0, name = 0xXXXX}
get_account_pol_db: struct db_context *(void)
get_account_policy_attr: const char *(enum pdb_policy_type)
-get_attr_key2string: const char *(ATTRIB_MAP_ENTRY *, int)
-get_attr_list: const char **(TALLOC_CTX *, ATTRIB_MAP_ENTRY *)
get_domain_group_from_sid: bool (struct dom_sid, GROUP_MAP *)
get_primary_group_sid: NTSTATUS (TALLOC_CTX *, const char *, struct passwd **, struct dom_sid **)
get_privileges_for_sid_as_set: NTSTATUS (TALLOC_CTX *, PRIVILEGE_SET **, struct dom_sid *)
@@ -42,7 +37,6 @@ grant_all_privileges: bool (const struct dom_sid *)
grant_privilege_by_name: bool (const struct dom_sid *, const char *)
grant_privilege_set: bool (const struct dom_sid *, struct lsa_PrivilegeSet *)
groupdb_tdb_init: const struct mapping_backend *(void)
-idpool_attr_list: {attrib = 2, name = 0xXXXX "uidNumber"}, {attrib = 3, name = 0xXXXX "gidNumber"}, {attrib = 24, name = 0xXXXX "objectClass"}, {attrib = 0, name = 0xXXXX}
init_account_policy: bool (void)
init_buffer_from_samu: uint32_t (uint8_t **, struct samu *, bool)
init_samu_from_buffer: bool (struct samu *, uint32_t, uint8_t *, uint32_t)
@@ -272,7 +266,6 @@ sid_check_is_wellknown_builtin: bool (const struct dom_sid *)
sid_check_is_wellknown_domain: bool (const struct dom_sid *, const char **)
sid_to_gid: bool (const struct dom_sid *, gid_t *)
sid_to_uid: bool (const struct dom_sid *, uid_t *)
-sidmap_attr_list: {attrib = 32, name = 0xXXXX "sambaSID"}, {attrib = 2, name = 0xXXXX "uidNumber"}, {attrib = 3, name = 0xXXXX "gidNumber"}, {attrib = 24, name = 0xXXXX "objectClass"}, {attrib = 0, name = 0xXXXX}
sids_to_unixids: bool (const struct dom_sid *, uint32_t, struct unixid *)
smb_add_user_group: int (const char *, const char *)
smb_create_group: int (const char *, gid_t *)
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index af3741b..302b9ee 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -62,7 +62,7 @@ bld.SAMBA3_MODULE('idmap_passdb',
bld.SAMBA3_MODULE('idmap_ldap',
subsystem='idmap',
source=IDMAP_LDAP_SRC,
- deps='smbldap smbldaphelper',
+ deps='smbldap smbldaphelper pdb',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ldap'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ldap') and bld.env.HAVE_LDAP)
diff --git a/source3/wscript_build b/source3/wscript_build
index c534ae6..7e39ec3 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -710,7 +710,11 @@ private_pdb_match.append('!idmap_xids_to_sids')
# ldap module is actually three modules merged together: ldapsam, ipa, and nds
static_pdb_match = static_pdb_match + ['ldap', 'ipa', 'nds']
-ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_domain_info', '!ldapsam_*', '!groupmap_attr_list*', '!get_userattr_list']
+ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_domain_info',
+ '!ldapsam_*', '!groupmap_attr_list*', '!get_userattr_list',
+ '!dominfo_attr_list', '!get_attr_key2string',
+ '!sidmap_attr_list', '!attrib_map_*', '!idpool_attr_list',
+ '!get_attr_list']
private_pdb_match.append('!pdb_nds_*')
private_pdb_match.append('!pdb_init_ldapsam')
private_pdb_match = private_pdb_match + ldapsam_pdb_match
@@ -732,9 +736,12 @@ bld.SAMBA3_LIBRARY('pdb',
vnum='0',
vars=locals())
-bld.SAMBA3_SUBSYSTEM('smbldaphelper',
+bld.SAMBA3_LIBRARY('smbldaphelper',
source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c',
- deps='smbldap secrets3 pdb')
+ deps='smbldap secrets3',
+ allow_undefined_symbols=True,
+ enabled=bld.env.HAVE_LDAP,
+ private_library=True)
bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
source=SERVER_MUTEX_SRC,
diff --git a/wscript_build b/wscript_build
index 5434056..0098036 100755
--- a/wscript_build
+++ b/wscript_build
@@ -144,7 +144,9 @@ bld.RECURSE('testsuite/headers')
bld.SYMBOL_CHECK()
bld.DUP_SYMBOL_CHECK()
--
Samba Shared Repository
More information about the samba-cvs
mailing list