rpms
/
samba
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix printing initialization.

This commit is contained in:
Andreas Schneider 2012-10-04 15:40:44 +02:00
parent b3f41cd906
commit 4380f14dd8
12 changed files with 192 additions and 483 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
samba-4.0.0rc2-build_idmap_manpages.patch
View File

@ -1,33 +0,0 @@
From a7a6a368f87c8b8af80511f1a3b32a457e48aa99 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 13 Sep 2012 17:52:13 +0200
Subject: [PATCH] docs: Fix generating idmap manpages.
Signed-off-by: Andreas Schneider <asn@samba.org>
---
docs-xml/wscript_build | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index 14fa152..9a17be3 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -6,6 +6,14 @@ manpages='''
manpages/libsmbclient.7
manpages/lmhosts.5
manpages/log2pcap.1
+ manpages/idmap_ad.8
+ manpages/idmap_autorid.8
+ manpages/idmap_hash.8
+ manpages/idmap_ldap.8
+ manpages/idmap_nss.8
+ manpages/idmap_rid.8
+ manpages/idmap_tdb.8
+ manpages/idmap_tdb2.8
manpages/net.8
manpages/nmbd.8
manpages/nmblookup.1
--
1.7.12

84
samba-4.0.0rc2-create_smbldaphelper.patch
View File

@ -1,84 +0,0 @@
commit be7a856f5bd251dc84a72eb56cf011facd10988f
Author: Alexander Bokovoy <ab@samba.org>
AuthorDate: Thu Sep 13 15:40:31 2012 +0300
Commit: Alexander Bokovoy <ab@samba.org>
CommitDate: Thu Sep 13 17:36:07 2012 +0200
s3: make ldapsam-related functions a smbldaphelper subsystem
Since these functions are used in pdb_ldap and idmap_ldap, and
pdb_ldap might be statically linked to libpdb (default), it is
better to keep them as separate subsystem to avoid polluting libpdb
namespace.
This is first step in refactoring libpdb. Right now I cannot move
these functions into proper libsmbldaphelper as it uses more of
libpdb-included functions and linking pdb_ldap against libsmbldaphelper
library would have created a loop if pdb_ldap is included into libpdb.
Autobuild-User(master): Alexander Bokovoy <ab@samba.org>
Autobuild-Date(master): Thu Sep 13 17:36:07 CEST 2012 on sn-devel-104
---
source3/passdb/wscript_build | 4 ++--
source3/winbindd/wscript_build | 2 +-
source3/wscript_build | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index 1dfdfd0..d26afc2 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -1,7 +1,7 @@
#!/usr/bin/env python
PDB_TDBSAM_SRC = 'pdb_tdb.c'
-PDB_LDAP_SRC = 'pdb_ldap.c pdb_nds.c pdb_ipa.c pdb_ldap_util.c'
+PDB_LDAP_SRC = 'pdb_ldap.c pdb_nds.c pdb_ipa.c'
PDB_SMBPASSWD_SRC = 'pdb_smbpasswd.c'
PDB_WBC_SAM_SRC = 'pdb_wbc_sam.c'
@@ -15,7 +15,7 @@ bld.SAMBA3_MODULE('pdb_tdbsam',
bld.SAMBA3_MODULE('pdb_ldap',
subsystem='pdb',
- deps='smbldap',
+ deps='smbldap smbldaphelper',
source=PDB_LDAP_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldap'),
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index 9f11aff..af3741b 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',
+ deps='smbldap smbldaphelper',
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 c7395e7..c534ae6 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -215,7 +215,6 @@ PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
passdb/account_pol.c ${PRIVILEGES_SRC}
lib/util_nscd.c lib/winbind_util.c
passdb/pdb_util.c passdb/pdb_interface.c
- passdb/pdb_ldap_schema.c
passdb/pdb_secrets.c
passdb/pdb_unixid.c'''
#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
@@ -733,6 +732,10 @@ bld.SAMBA3_LIBRARY('pdb',
vnum='0',
vars=locals())
+bld.SAMBA3_SUBSYSTEM('smbldaphelper',
+ source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c',
+ deps='smbldap secrets3 pdb')
+
bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
source=SERVER_MUTEX_SRC,
deps='talloc')

42
samba-4.0.0rc2-fix_panic_action.patch
View File

@ -1,42 +0,0 @@
commit 2a7484eb7286a6896826ad1ed15aa7b1760a451c
Author: Matthieu Patou <mat@matws.net>
AuthorDate: Mon Sep 17 16:51:02 2012 -0700
Commit: Stefan Metzmacher <metze@samba.org>
CommitDate: Tue Sep 18 06:12:00 2012 +0200
panic action is defined as GLOBAL_VAR(szPanicAction) not GLOBAL_VAR(panic_action)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Sep 18 06:12:00 CEST 2012 on sn-devel-104
---
lib/param/loadparm.c | 2 +-
source3/param/loadparm.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 990dd29..b2e4218 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2295,7 +2295,7 @@ static bool lpcfg_update(struct loadparm_context *lp_ctx)
return true;
}
- panic_action = lp_ctx->globals->panic_action;
+ panic_action = lp_ctx->globals->szPanicAction;
reload_charcnv(lp_ctx);
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index f1999ad..61606ce 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -131,7 +131,6 @@ static bool defaults_saved = false;
char *tls_cafile; \
char *tls_crlfile; \
char *tls_dhpfile; \
- char *panic_action; \
int bPreferredMaster;
#include "param/param_global.h"

155
samba-4.0.0rc2-fix_smb.conf_manpage_build.patch
View File

@ -1,155 +0,0 @@
commit 73ed1533105ac3f90813e5a0e7888a095eff4b75
Author: Alexander Bokovoy <ab@samba.org>
AuthorDate: Mon Sep 17 13:07:26 2012 +0300
Commit: Alexander Bokovoy <ab@samba.org>
CommitDate: Mon Sep 17 14:18:31 2012 +0200
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@samba.org>
Autobuild-Date(master): Mon Sep 17 14:18:31 CEST 2012 on sn-devel-104
---
buildtools/wafsamba/wafsamba.py | 6 ++++--
docs-xml/build/catalog.xml.in | 7 +++++--
docs-xml/manpages/smb.conf.5.xml | 5 ++++-
docs-xml/wscript_build | 25 +++++++++++++++++++++++--
wscript_build | 6 ++++--
5 files changed, 40 insertions(+), 9 deletions(-)
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..c5d5839 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,8 +86,30 @@ 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'):
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()
-bld.env.ABS_TOP_BUILDDIR = bld.srcnode.abspath() + '/docs-xml'
+bld.env.ABS_TOP_SRCDIR = bld.srcnode.abspath() + '/docs-xml'
+bld.env.ABS_TOP_BUILDDIR = bld.srcnode.abspath() + '/bin/default/docs-xml'
bld.CONFIGURE_FILE('docs-xml/build/catalog.xml',
- ABS_TOP_BUILDDIR = bld.env.ABS_TOP_BUILDDIR)
+ ABS_TOP_BUILDDIR = bld.env.ABS_TOP_BUILDDIR,
+ ABS_TOP_SRCDIR=bld.env.ABS_TOP_SRCDIR)
bld.RECURSE('docs-xml')

26
samba-4.0.0rc2-fix_smbldaphelper_without_ldap.patch
View File

@ -1,26 +0,0 @@
commit 35a4a1ed1f0fc6f1cbccd31bb7db9431b2518a5b
Author: Andrew Bartlett <abartlet@samba.org>
AuthorDate: Fri Sep 14 11:58:02 2012 -0700
Commit: Andrew Bartlett <abartlet@samba.org>
CommitDate: Fri Sep 14 22:53:30 2012 +0200
build: Fix build on systems without ldap development headers
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Sep 14 22:53:30 CEST 2012 on sn-devel-104
---
source3/wscript_build | 1 +
1 file changed, 1 insertion(+)
diff --git a/source3/wscript_build b/source3/wscript_build
index 60965ef..7e39ec3 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -740,6 +740,7 @@ bld.SAMBA3_LIBRARY('smbldaphelper',
source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c',
deps='smbldap secrets3',
allow_undefined_symbols=True,
+ enabled=bld.env.HAVE_LDAP,
private_library=True)
bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',

112
samba-4.0.0rc2-make_smbldaphelper_lib.patch
View File

@ -1,112 +0,0 @@
commit 86a4ca28649141f77556208b833db2e076c0125d
Author: Alexander Bokovoy <ab@samba.org>
AuthorDate: Thu Sep 13 20:29:25 2012 +0300
Commit: Alexander Bokovoy <ab@samba.org>
CommitDate: Fri Sep 14 01:02:21 2012 +0200
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@samba.org>
Autobuild-Date(master): Fri Sep 14 01:02:21 CEST 2012 on sn-devel-104
---
source3/passdb/ABI/pdb-0.sigs | 7 -------
source3/winbindd/wscript_build | 2 +-
source3/wscript_build | 12 +++++++++---
3 files changed, 10 insertions(+), 11 deletions(-)
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 = 0xXXXX "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..60965ef 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,11 @@ 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,
+ private_library=True)
bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
source=SERVER_MUTEX_SRC,

30
samba-4.0.0rc2-use_smb_man_style.patch
View File

@ -1,30 +0,0 @@
commit e7a58bc251bd74c3c7c64ee4f5cb85ec76852a8d
Author: Alexander Bokovoy <ab@samba.org>
AuthorDate: Mon Sep 17 19:09:35 2012 +0300
Commit: Alexander Bokovoy <ab@samba.org>
CommitDate: Mon Sep 17 19:52:53 2012 +0200
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@samba.org>
Autobuild-Date(master): Mon Sep 17 19:52:53 CEST 2012 on sn-devel-104
---
docs-xml/wscript_build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index c5d5839..32cf9be 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -113,7 +113,7 @@ if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
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)

64
samba-4.0.0rc3-add_aes_enctypes_to_krb5_conf.patch Normal file
View File

@ -0,0 +1,64 @@
commit 06f3b1f0b0dcf9355a8d634cdb62f1f0a8ea4dbe
Author: Günther Deschner <gd@samba.org>
AuthorDate: Mon Dec 19 10:52:58 2011 +0100
Commit: Günther Deschner <gd@samba.org>
CommitDate: Tue Oct 2 16:22:31 2012 +0200
s3-kerberos: add aes enctypes to generated krb5.conf.
Guenther
---
source3/libads/kerberos.c | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index fd39394..3183e26 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -831,6 +831,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
int fd;
char *realm_upper = NULL;
bool result = false;
+ char *aes_enctypes = NULL;
if (!lp_create_krb5_conf()) {
return false;
@@ -870,15 +871,33 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
goto done;
}
- /* FIXME: add aes here - gd */
+ aes_enctypes = talloc_strdup(fname, "");
+ if (aes_enctypes == NULL) {
+ goto done;
+ }
+
+#ifdef HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96
+ aes_enctypes = talloc_asprintf_append(aes_enctypes, "%s", "aes256-cts-hmac-sha1-96 ");
+ if (aes_enctypes == NULL) {
+ goto done;
+ }
+#endif
+#ifdef HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96
+ aes_enctypes = talloc_asprintf_append(aes_enctypes, "%s", "aes128-cts-hmac-sha1-96");
+ if (aes_enctypes == NULL) {
+ goto done;
+ }
+#endif
+
file_contents = talloc_asprintf(fname,
"[libdefaults]\n\tdefault_realm = %s\n"
- "\tdefault_tgs_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
- "\tdefault_tkt_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
- "\tpreferred_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n\n"
+ "\tdefault_tgs_enctypes = %s RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
+ "\tdefault_tkt_enctypes = %s RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
+ "\tpreferred_enctypes = %s RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n\n"
"[realms]\n\t%s = {\n"
"\t%s\t}\n",
- realm_upper, realm_upper, kdc_ip_string);
+ realm_upper, aes_enctypes, aes_enctypes, aes_enctypes,
+ realm_upper, kdc_ip_string);
if (!file_contents) {
goto done;

38
samba-4.0.0rc3-fix_pam_smbpass_option.patch Normal file
View File

@ -0,0 +1,38 @@
commit fb3cf6c24270d22dad8ac9a1c12e8d77c8189f11
Author: Andreas Schneider <asn@samba.org>
AuthorDate: Tue Oct 2 14:25:40 2012 +0200
Commit: Andreas Schneider <asn@samba.org>
CommitDate: Thu Oct 4 10:20:35 2012 +0200
waf: Build pam_smbpass module only if enabled.
---
source3/pam_smbpass/wscript_build | 3 ++-
source3/wscript | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/source3/pam_smbpass/wscript_build b/source3/pam_smbpass/wscript_build
index 70b21d5..a2a2d01 100644
--- a/source3/pam_smbpass/wscript_build
+++ b/source3/pam_smbpass/wscript_build
@@ -10,5 +10,6 @@ if bld.CONFIG_SET('WITH_PAM_MODULES'):
LIBNTLMSSP LIBTSOCKET''',
cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
realname='pam_smbpass.so',
- install_path='${PAMMODULESDIR}'
+ install_path='${PAMMODULESDIR}',
+ enabled=bld.env.with_pam_smbpass
)
diff --git a/source3/wscript b/source3/wscript
index 765f761..e4898ef 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -762,6 +762,9 @@ 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
#

40
samba-4.0.0rc3-fix_printing_init.patch Normal file
View File

@ -0,0 +1,40 @@
commit 50de2c9bbbc25074f022b4b2cf9d49f8e9a53e01
Author: Andreas Schneider <asn@samba.org>
AuthorDate: Tue Oct 2 15:51:08 2012 +0200
Commit: Andreas Schneider <asn@cryptomilk.org>
CommitDate: Thu Oct 4 12:06:29 2012 +0200
s3fs-smbd: Make sure the registry is set up before we init printing.
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Oct 4 12:06:29 CEST 2012 on sn-devel-104
---
source3/smbd/server.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 90bbb62..7dad13b 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1471,6 +1471,10 @@ extern void build_options(bool screen);
}
}
+ if (!dcesrv_ep_setup(ev_ctx, msg_ctx)) {
+ exit(1);
+ }
+
/* only start other daemons if we are running as a daemon
* -- bad things will happen if smbd is launched via inetd
* and we fork a copy of ourselves here */
@@ -1495,10 +1499,6 @@ extern void build_options(bool screen);
}
}
- if (!dcesrv_ep_setup(ev_ctx, msg_ctx)) {
- exit(1);
- }
-
if (!is_daemon) {
int sock;

35
samba-4.0.0rc3-request_aes_krb_keys.patch Normal file
View File

@ -0,0 +1,35 @@
commit 1bf209dd7e5a0f0001b3d1e3798093772bbd3fd3
Author: Karolin Seeger <kseeger@samba.org>
AuthorDate: Thu Oct 4 11:43:20 2012 +0200
Commit: Karolin Seeger <kseeger@samba.org>
CommitDate: Thu Oct 4 13:48:00 2012 +0200
html docs: Remove link to Using Samba.
Thanks to Christian Perrier <bubulle@debian.org> for reporting!
Fix bug #7826 - HTML docs index file still points to Using Samba.
Karolin
Autobuild-User(master): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(master): Thu Oct 4 13:48:00 CEST 2012 on sn-devel-104
---
docs-xml/htmldocs.html | 4 ----
1 file changed, 4 deletions(-)
diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html
index 44fcc0f..6fb9e73 100644
--- a/docs-xml/htmldocs.html
+++ b/docs-xml/htmldocs.html
@@ -23,10 +23,6 @@
<td valign="top">This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework.</td>
</tr>
<tr>
- <td valign="top"><a href="using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
- <td valign="top"><i>Using Samba</i>, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients.</td>
-</tr>
-<tr>
<td valign="top"><a href="manpages/index.html">Man pages</a></td>
<td valign="top">The Samba man pages in HTML.</td>
</tr>

16
samba.spec
View File

@ -1,4 +1,4 @@
%define main_release 151
%define main_release 152
%define samba_version 4.0.0
%define talloc_version 2.0.7
@ -65,6 +65,11 @@ Source100: smbprint
Source200: README.dc
Source201: README.downgrade
Patch0: samba-4.0.0rc3-request_aes_krb_keys.patch
Patch1: samba-4.0.0rc3-add_aes_enctypes_to_krb5_conf.patch
Patch2: samba-4.0.0rc3-fix_pam_smbpass_option.patch
Patch3: samba-4.0.0rc3-fix_printing_init.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(pre): /usr/sbin/groupadd
@ -377,6 +382,11 @@ link against the SMB, RPC and other protocols.
%prep
%setup -q -n samba-%{version}%{pre_release}
%patch0 -p1 -b .request_aes_krb_keys
%patch1 -p1 -b .add_aes_enctypes_to_krb5_conf
%patch2 -p1 -b .fix_pam_smbpass_option
%patch3 -p1 -b .fix_printing_init
%build
%global _talloc_lib ,talloc,pytalloc,pytalloc-util
%global _tevent_lib ,tevent,pytevent
@ -1245,6 +1255,10 @@ rm -rf %{buildroot}
%endif # with_libwbclient
%changelog
* Thu Oct 04 2012 - Andreas Schneider <asn@redhat.com> - 2:4.0.0-152.rc1
- Add kerberos AES support.
- Fix printing initialization.
* Tue Oct 02 2012 - Andreas Schneider <asn@redhat.com> - 2:4.0.0-151.rc1
- Update to 4.0.0rc2.