[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via bf9c3ee s3: Attempt to please autobuild
via 45a44dd s3: Fix a typo
via 538ed07 s3: Attempt to fix the shadow_copy2 module
from b7172e7 s4-drs: cope with invalid NTDS DNs from DsReplicaInfo()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit bf9c3eedf834e5637a23f051e0c8db6687c6dcf1
Author: Volker Lendecke
Date: Wed Dec 1 07:57:38 2010 +0100
s3: Attempt to please autobuild
Autobuild-User: Volker Lendecke
Autobuild-Date: Wed Dec 1 08:43:37 CET 2010 on sn-devel-104
commit 45a44dd5880ba70423835cd834435751b90e31b1
Author: Volker Lendecke
Date: Tue Nov 30 22:59:13 2010 +0100
s3: Fix a typo
commit 538ed076a91c49edb7d11b73927f1e330b9abd79
Author: Volker Lendecke
Date: Tue Nov 30 22:57:00 2010 +0100
s3: Attempt to fix the shadow_copy2 module
This module is from hell. Please make 100% sure that you did test it
properly when touching it! This module has probably given me more grey
hair than any other piece of Samba, so PLEASE PLEASE PLEASE be careful
here!!!
---
Summary of changes:
source3/locale/net/de.po |2 +-
source3/modules/vfs_default.c |2 +-
source3/modules/vfs_shadow_copy2.c |4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/locale/net/de.po b/source3/locale/net/de.po
index 85b195e..a12fabd 100644
--- a/source3/locale/net/de.po
+++ b/source3/locale/net/de.po
@@ -3066,7 +3066,7 @@ msgstr "\t-e oder --encrypt\t\t\tSMB Ãbertragung
verschlüsseln (nur UNIX erwe
#: ../../utils/net_help_common.c:54
msgid "\t-k or --kerberos\t\tUse kerberos (active directory) authentication\n"
-msgstr "\t-k oder --kerberos\t\tKerberos Authentifizierung benutzen (Active
Directory)\n"y
+msgstr "\t-k oder --kerberos\t\tKerberos Authentifizierung benutzen (Active
Directory)\n"
#: ../../utils/net_idmap.c:26
msgid "Out of memory!\n"
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index eb0e0b9..977a563 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1078,7 +1078,7 @@ static char *vfswrap_realpath(vfs_handle_struct *handle,
const char *path)
if (!resolved_path) {
SAFE_FREE(result);
} else {
- /* SMB_ASSERT(result == resovled_path) ? */
+ /* SMB_ASSERT(result == resolved_path) ? */
result = resolved_path;
}
}
diff --git a/source3/modules/vfs_shadow_copy2.c
b/source3/modules/vfs_shadow_copy2.c
index ba6b344..f47b287 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -671,10 +671,10 @@ static char *shadow_copy2_realpath(vfs_handle_struct
*handle,
copy[gmt - fname + 1] = '\0';
DEBUG(10, ("calling NEXT_REALPATH with %s\n", copy));
- SHADOW2_NEXT(REALPATH, (handle, copy), char *,
+ SHADOW2_NEXT(REALPATH, (handle, fname), char *,
NULL);
}
-SHADOW2_NEXT(REALPATH, (handle, name), char *, NULL);
+SHADOW2_NEXT(REALPATH, (handle, fname), char *, NULL);
}
static const char *shadow_copy2_connectpath(struct vfs_handle_struct *handle,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via b7172e7 s4-drs: cope with invalid NTDS DNs from DsReplicaInfo() via 00ecbdb wintest: cope with w2k3 form of dcdiag output via 06fd5b7 wintest Move stopping of BIND into a new step via c5bea98 s4:heimdal: import lorikeet-heimdal-201012010201 (commit 81fe27bcc0148d410ca4617f8759b9df1a5e935c) from 9c84f98 wintest: make command matching case insensitive by default http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b7172e7a71b152be687fe5045565c8cd99a73a18 Author: Andrew Tridgell Date: Wed Dec 1 16:40:17 2010 +1100 s4-drs: cope with invalid NTDS DNs from DsReplicaInfo() w2k3 sometimes returns a deleted DN Autobuild-User: Andrew Tridgell Autobuild-Date: Wed Dec 1 07:48:19 CET 2010 on sn-devel-104 commit 00ecbdbbd13ba191400c6f4185df2dd8e72d1459 Author: Andrew Tridgell Date: Wed Dec 1 16:34:16 2010 +1100 wintest: cope with w2k3 form of dcdiag output commit 06fd5b70037728800cfeb2d1989ad8e851f604df Author: Andrew Bartlett Date: Wed Dec 1 15:34:19 2010 +1100 wintest Move stopping of BIND into a new step We must run this early, to ensure that BIND isn't alive to write to the zone file after provision has cleaned it up. Andrew Bartlett commit c5bea98ddb2f7967df572160f639da3cba381a87 Author: Andrew Bartlett Date: Mon Nov 29 11:24:08 2010 +1100 s4:heimdal: import lorikeet-heimdal-201012010201 (commit 81fe27bcc0148d410ca4617f8759b9df1a5e935c) --- Summary of changes: source4/heimdal/base/baselocl.h | 52 +- source4/heimdal/base/heimbase.c | 15 +- source4/heimdal/cf/make-proto.pl |1 + source4/heimdal/kdc/default_config.c |3 +- source4/heimdal/kdc/kaserver.c| 955 source4/heimdal/kdc/misc.c| 21 +- source4/heimdal/kdc/process.c | 77 -- source4/heimdal/kuser/kinit.c | 14 +- source4/heimdal/kuser/kuser_locl.h|3 + source4/heimdal/lib/asn1/asn1parse.c | 724 + source4/heimdal/lib/asn1/asn1parse.y |4 + source4/heimdal/lib/asn1/gen_template.c |4 +- source4/heimdal/lib/com_err/com_err.h | 20 - source4/heimdal/lib/com_err/com_right.h | 35 +- source4/heimdal/lib/com_err/error.c |8 +- source4/heimdal/lib/com_err/lex.c | 83 +-- source4/heimdal/lib/com_err/lex.h |2 +- source4/heimdal/lib/com_err/lex.l |5 +- source4/heimdal/lib/com_err/parse.c | 265 --- source4/heimdal/lib/com_err/parse.y |5 +- source4/heimdal/lib/gssapi/gssapi/gssapi.h| 85 ++- source4/heimdal/lib/gssapi/gssapi/gssapi_krb5.h | 73 -- source4/heimdal/lib/gssapi/gssapi/gssapi_oid.h| 231 + source4/heimdal/lib/gssapi/gssapi_mech.h | 80 ++- source4/heimdal/lib/gssapi/krb5/acquire_cred.c| 14 +- source4/heimdal/lib/gssapi/krb5/external.c| 238 +++--- source4/heimdal/lib/gssapi/krb5/set_cred_option.c |9 - source4/heimdal/lib/gssapi/mech/gss_mech_switch.c |2 +- source4/heimdal/lib/gssapi/mech/gss_mo.c | 464 ++ source4/heimdal/lib/gssapi/mech/gss_oid.c | 253 ++ source4/heimdal/lib/gssapi/mech/gss_oid_equal.c |2 +- source4/heimdal/lib/gssapi/mech/gss_oid_to_str.c | 31 + source4/heimdal/lib/gssapi/mech/gss_wrap.c| 15 + source4/heimdal/lib/gssapi/mech/mech_locl.h | 15 +- source4/heimdal/lib/gssapi/spnego/external.c | 49 +- source4/heimdal/lib/hcrypto/rsa-ltm.c |3 +- source4/heimdal/lib/hcrypto/validate.c|1 - source4/heimdal/lib/hdb/db.c |2 +- source4/heimdal/lib/hdb/hdb-keytab.c | 10 +- source4/heimdal/lib/hdb/hdb.c |2 +- source4/heimdal/lib/hdb/hdb.h | 22 +- source4/heimdal/lib/hdb/keytab.c | 15 +- source4/heimdal/lib/hdb/ndbm.c|2 +- source4/heimdal/lib/hx509/sel-gram.c | 248 --- source4/heimdal/lib/krb5/cache.c | 49 +- source4/heimdal/lib/krb5/changepw.c | 46 +- source4/heimdal/lib/krb5/config_file.c| 73 ++- source4/heimdal/lib/krb5/constants.c | 17 +- source4/heimdal/lib/krb5/context.c| 70 ++- source4/heimdal/lib/krb5/convert_creds.c | 134 +--- source4/heimdal/lib/krb5/creds.c |2 +- source4/heimdal/lib/krb5/crypto.c |6 +- source4/heimdal/lib/krb5/error_string.c |4 +- source4/heim
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 9c84f98 wintest: make command matching case insensitive by default via 60e1a2c wintest: we don't need the WIN_BASEDN vars any more via bd86dda wintest: fixed formatting of wintest in emacs python mode via 4072455 wintest Wipe the BIND data directory just before we restart bind via d48b66e wintest Another way to work out if a Windows machine is a DC via ca79bc7 wintest Add more retries and fix up RODC handling after auto-dcpromo via a565eff9 wintest Allow 'samba-tool newuser' to run a few times waiting for the RID Set via c1fa6be s4-samba-tool Show when we have created the user successfully via 0b2ec0a wintest Make the new --vms option default to running all tests. via 86c3c42 wintest Set WIN_LCREALM and WIN_BASEDN automatically via 7ecf6b2 wintest Add a function to shut down all the managed VMs at the start via b5bab49 wintest Fix case of BASEDN variables via f5382d5 wintest Add automatic dcpromo is the host isn't a DC yet via b0ed6c2 wintest Add more VMs and correct titles via 2b1c259 wintest: cope with delays in w2k3 starting its DRS server via c2fb350 s4-drs: the options attribute is optional on NTDSDSA objects via 90215c5 wintest: wait for the windows DC to register its DNS name via a940d5d s4-provision: remove the disabled bit in the dns-$HOSTNAME account via a36e4b2 wintest: fixed casefold handling in expect calls via 380739e waf: less verbose message for failing to resolve a syslib path via bbf9534 waf: use Logs.warn() instead of print() in the symbol check code from 8428311 pygensec: Fix initialization. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 9c84f987acb5ffc97a612839e13e8b8042e6120e Author: Andrew Tridgell Date: Wed Dec 1 16:07:56 2010 +1100 wintest: make command matching case insensitive by default the new BASEDN changes break the RODC join otherwise Autobuild-User: Andrew Tridgell Autobuild-Date: Wed Dec 1 06:54:13 CET 2010 on sn-devel-104 commit 60e1a2c8cb49b774952b86ae8cdd4a5d6473c3ea Author: Andrew Tridgell Date: Wed Dec 1 15:08:33 2010 +1100 wintest: we don't need the WIN_BASEDN vars any more they are based on the realm now commit bd86dda8e66438617205f74468123703deddc350 Author: Andrew Tridgell Date: Wed Dec 1 15:08:15 2010 +1100 wintest: fixed formatting of wintest in emacs python mode commit 4072455c00f183fd50291f1447343e56766793f9 Author: Andrew Bartlett Date: Wed Dec 1 10:07:38 2010 +1100 wintest Wipe the BIND data directory just before we restart bind This will hopefully mean we don't end up with stale zone info in the new server. Andrew Bartlett commit d48b66e1e8228918ff8a6330da93caeea8bdc762 Author: Andrew Bartlett Date: Tue Nov 30 21:18:34 2010 +1100 wintest Another way to work out if a Windows machine is a DC it's not perfect (may fail on member servers) but it's picks up the difference between standalone and DC OK. Andrew Bartlett commit ca79bc7373d86f5ef6e87527203f13d902889ec3 Author: Andrew Bartlett Date: Tue Nov 30 16:00:15 2010 +1100 wintest Add more retries and fix up RODC handling after auto-dcpromo The extra looping allows some time for the system to settle down while we connect to the server for the first time. Andrew Bartlett commit a565eff9699b7061236b753b6dc09bc36b837563 Author: Andrew Bartlett Date: Tue Nov 30 12:48:51 2010 +1100 wintest Allow 'samba-tool newuser' to run a few times waiting for the RID Set Pair-Programmed-With: Andrew Tridgell commit c1fa6be92514cec35033fa8486e30316de13319a Author: Andrew Bartlett Date: Tue Nov 30 12:48:30 2010 +1100 s4-samba-tool Show when we have created the user successfully commit 0b2ec0abb98d6ce1198a2addb802afae2711eaad Author: Andrew Bartlett Date: Tue Nov 30 12:37:01 2010 +1100 wintest Make the new --vms option default to running all tests. Andrew Bartlett commit 86c3c427456431d49529a358e3f754b1fa812b6e Author: Andrew Bartlett Date: Tue Nov 30 11:58:05 2010 +1100 wintest Set WIN_LCREALM and WIN_BASEDN automatically Also this uppper cases WIN_REALM, to avoid this being sensitive based on the configuration file. Andrew Bartlett commit 7ecf6b245113ada9d1c572b059e61db2b61e23cd Author: Andrew Bartlett Date: Tue Nov 30 11:55:32 2010 +1100 wintest Add a function to shut down all the managed VMs at the start This helps ensure that old virtual machines don't interfer with a new test run. Andrew Bartlett commit b5bab49dc965bbda2dc5a8a2608b34808d7dfae8 Author: Andrew Bartlett Date: Mon Nov 29 22:30:41 2010 +1100 wintest Fix case of BASEDN variables Th
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8428311 pygensec: Fix initialization.
via efd8fc0 pytalloc: Make py_talloc_default_cmp private.
via b8dc3c8 pytalloc: Make py_talloc_dealloc private.
via 4f0436f pytalloc: Make py_talloc_default_repr private (now exposed
by talloc.Object).
via a9fb47b pyparam: Use talloc.Object.
via 1f0cc6f pyregistry: Use talloc.Object.
via f43ffed pyauth: Use talloc.Object.
via fce73d7 pygensec: Use talloc.Object.
via 00251d9 pycredentials: Use talloc.Object.
via 5891e98 pytalloc: Expose PyTalloc_GetObjectType
via 3bff037 pidl/python: Allow import of talloc, even though it doesn't
live in the samba.dcerpc. namespace.
via ba2110d pidl: Allow more flexibility importing modules using
convenience function.
via 36bdb3b pytalloc: Add convenience function for checking if
something is a talloc object.
via dd0fbc4 pidl: Base new objects off of talloc object.
from 0acc93c waf: added a help target for the other waf builds
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8428311ce5c0fab9c5bbb3fbcbecd37fca472d93
Author: Jelmer Vernooij
Date: Wed Dec 1 01:13:20 2010 +0100
pygensec: Fix initialization.
Autobuild-User: Jelmer Vernooij
Autobuild-Date: Wed Dec 1 02:33:06 CET 2010 on sn-devel-104
commit efd8fc0672ee48a40f5e302353ca63590a6d7b45
Author: Jelmer Vernooij
Date: Wed Dec 1 00:19:37 2010 +0100
pytalloc: Make py_talloc_default_cmp private.
commit b8dc3c8a83af38adf0ee5874331b04692f2dec8d
Author: Jelmer Vernooij
Date: Wed Dec 1 00:14:27 2010 +0100
pytalloc: Make py_talloc_dealloc private.
commit 4f0436f107422826f93d194370b256b6d278502f
Author: Jelmer Vernooij
Date: Wed Dec 1 00:07:11 2010 +0100
pytalloc: Make py_talloc_default_repr private (now exposed by
talloc.Object).
commit a9fb47b5d6b06d2a528c17803e64b980f1f38805
Author: Jelmer Vernooij
Date: Wed Dec 1 00:05:05 2010 +0100
pyparam: Use talloc.Object.
commit 1f0cc6f0816abc15a24a8aa5f97e09c069e29927
Author: Jelmer Vernooij
Date: Wed Dec 1 00:03:08 2010 +0100
pyregistry: Use talloc.Object.
commit f43ffed781196d25a7230f6cfd6abcaf6e5d85f6
Author: Jelmer Vernooij
Date: Wed Dec 1 00:03:00 2010 +0100
pyauth: Use talloc.Object.
commit fce73d7eff516a981795efa902339cd5bfb19810
Author: Jelmer Vernooij
Date: Wed Dec 1 00:02:53 2010 +0100
pygensec: Use talloc.Object.
commit 00251d9e5627f041b9585dbe6c380f88f796e3b9
Author: Jelmer Vernooij
Date: Wed Dec 1 00:02:19 2010 +0100
pycredentials: Use talloc.Object.
commit 5891e9863c87c8a03fef2671be0572187404afa5
Author: Jelmer Vernooij
Date: Wed Dec 1 00:01:51 2010 +0100
pytalloc: Expose PyTalloc_GetObjectType
commit 3bff03723d8920faece76dd57bcf5d19b84d7b02
Author: Jelmer Vernooij
Date: Tue Nov 30 23:48:46 2010 +0100
pidl/python: Allow import of talloc, even though it doesn't live in the
samba.dcerpc. namespace.
commit ba2110d19060c4d84656917eb6be7b78afc6df6b
Author: Jelmer Vernooij
Date: Tue Nov 30 23:06:32 2010 +0100
pidl: Allow more flexibility importing modules using convenience function.
commit 36bdb3b9af271a8dcde23d40737117d7ce5daef8
Author: Jelmer Vernooij
Date: Tue Nov 30 22:59:51 2010 +0100
pytalloc: Add convenience function for checking if something is a talloc
object.
commit dd0fbc47c798acfb003e37afbee5f0748e30ad1b
Author: Jelmer Vernooij
Date: Tue Nov 30 22:59:32 2010 +0100
pidl: Base new objects off of talloc object.
---
Summary of changes:
lib/talloc/pytalloc.c| 38
lib/talloc/pytalloc.h|8 +---
lib/talloc/pytalloc_util.c | 57 -
pidl/lib/Parse/Pidl/Samba4/Python.pm | 54 ++--
source4/auth/credentials/pycredentials.c |7 +++-
source4/auth/gensec/pygensec.c |5 ++-
source4/auth/pyauth.c|8 +++--
source4/lib/registry/pyregistry.c| 13 +--
source4/param/pyparam.c |8 +++-
9 files changed, 127 insertions(+), 71 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index 7bdebb0..262ba49 100644
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -74,6 +74,44 @@ static PyMethodDef talloc_methods[] = {
{ NULL }
};
+/**
+ * Default (but only slightly more useful than the default) implementation of
Repr().
+ */
+static PyObject *py_talloc_default_repr(PyObject *obj)
+{
+ py_talloc_Object *talloc_obj = (py_talloc_Object *)obj;
+ PyTypeObject *type = (PyTypeObject*)PyObject_Type(obj);
+
+ return PyString_FromFormat("<%s talloc object at 0x%p>",
+ t
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0acc93c waf: added a help target for the other waf builds
via 557401b s4-build: added a 'make help' target
via 062378c s4-provision: fixed check for missing
msDS-SupportedEncryptionTypes
via 7526171 wintest: make expect calls case insensitive by default
via 1079195 wintest: added --vms option
from 47e8cbe heimdal: fix for w2000 from lha
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0acc93cc2c8baa9a693066835ff1a1ba1e0ed50b
Author: Andrew Tridgell
Date: Wed Dec 1 09:57:50 2010 +1100
waf: added a help target for the other waf builds
this lets the s3 waf build use "make help"
Autobuild-User: Andrew Tridgell
Autobuild-Date: Wed Dec 1 01:47:50 CET 2010 on sn-devel-104
commit 557401b68d0d96f8a21037c917cad77c0e6e2a89
Author: Andrew Tridgell
Date: Wed Dec 1 09:56:29 2010 +1100
s4-build: added a 'make help' target
commit 062378c1b4ba4f199cee6d4368e87f1e0ba820a6
Author: Andrew Tridgell
Date: Tue Nov 30 13:24:01 2010 +1100
s4-provision: fixed check for missing msDS-SupportedEncryptionTypes
thanks to Jelmer for spotting this
commit 7526171ce596daf008798bd2ab63bb57c08b184a
Author: Andrew Tridgell
Date: Tue Nov 30 11:55:48 2010 +1100
wintest: make expect calls case insensitive by default
commit 1079195a7652e890d6e683f4f29d0454d72141e6
Author: Andrew Tridgell
Date: Tue Nov 30 11:54:55 2010 +1100
wintest: added --vms option
this allows you to run tests associated with a specified list of VMs
---
Summary of changes:
buildtools/scripts/Makefile.waf|7 -
source4/Makefile |7 -
.../scripting/python/samba/provision/__init__.py |5 +--
wintest/test-s4-howto.py | 21 --
wintest/wintest.py | 29 +++-
5 files changed, 48 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf
index c07f859..716ab93 100644
--- a/buildtools/scripts/Makefile.waf
+++ b/buildtools/scripts/Makefile.waf
@@ -1,6 +1,7 @@
# simple makefile wrapper to run waf
-WAF=WAF_MAKE=1 BUILDTOOLS/bin/waf
+WAF_BINARY=BUILDTOOLS/bin/waf
+WAF=WAF_MAKE=1 $(WAF_BINARY)
all:
$(WAF) build
@@ -14,6 +15,10 @@ uninstall:
test:
$(WAF) test $(TEST_OPTIONS)
+help:
+ @echo NOTE: to run extended waf options use $(WAF_BINARY) or modify
your PATH
+ $(WAF) --help
+
testenv:
$(WAF) test --testenv $(TEST_OPTIONS)
diff --git a/source4/Makefile b/source4/Makefile
index 838f0a9..77b3189 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -1,6 +1,7 @@
# simple makefile wrapper to run waf
-WAF=WAF_MAKE=1 ../buildtools/bin/waf
+WAF_BINARY=../buildtools/bin/waf
+WAF=WAF_MAKE=1 $(WAF_BINARY)
all:
$(WAF) build
@@ -14,6 +15,10 @@ uninstall:
test:
$(WAF) test $(TEST_OPTIONS)
+help:
+ @echo NOTE: to run extended waf options use $(WAF_BINARY) or modify
your PATH
+ $(WAF) --help
+
subunit-test:
$(WAF) test --filtered-subunit $(TEST_OPTIONS)
diff --git a/source4/scripting/python/samba/provision/__init__.py
b/source4/scripting/python/samba/provision/__init__.py
index e184ad8..7f19699 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -1642,10 +1642,9 @@ def provision(setup_dir, logger, session_info,
credentials, smbconf=None,
name="msDS-SupportedEncryptionTypes")
samdb.modify(msg)
except ldb.LdbError, (enum, estr):
-if enum == ldb.ERR_NO_SUCH_ATTRIBUTE:
+if enum != ldb.ERR_NO_SUCH_ATTRIBUTE:
# It might be that this attribute does not exist in this
schema
-pass
-raise
+raise
if serverrole == "domain controller":
secretsdb_setup_dns(secrets_ldb, setup_path, names,
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 8f57553..185a86d 100755
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -668,30 +668,30 @@ def test_howto(t):
if not t.skip("dyndns"):
test_dyndns(t)
-if t.have_var('WINDOWS7_VM') and not t.skip("windows7"):
+if t.have_vm('WINDOWS7') and not t.skip("windows7"):
run_winjoin(t, "WINDOWS7")
test_winjoin(t, "WINDOWS7")
-if t.have_var('WINXP_VM') and not t.skip("winxp"):
+if t.have_vm('WINXP') and not t.skip("winxp"):
run_winjoin(t, "WINXP")
test_winjoin(t, "WINXP")
-if t.have_var('W2K8R2C_VM') and not t.skip("dcpromo_rodc"):
+if t.have_
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 47e8cbe heimdal: fix for w2000 from lha
via 1286f53 s4-dns: catch all DNS exceptions in samba_dnsupdate
via 29c4f3f s4-smb_server Return why the ntvfs_connect() failed.
via 4ea840c s4-librpc Handle all types of GUID in the GUID() initialiser
from 2b0905a s3-waf: convert RPC_LSARPC into a subsystem.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 47e8cbe3d630bef40e2564963177e08b65102aff
Author: Andrew Tridgell
Date: Tue Nov 30 09:56:30 2010 +1100
heimdal: fix for w2000 from lha
Autobuild-User: Andrew Bartlett
Autobuild-Date: Wed Dec 1 00:59:59 CET 2010 on sn-devel-104
commit 1286f5345515bec5295497b1370db830262c3890
Author: Andrew Tridgell
Date: Tue Nov 30 15:23:39 2010 +1100
s4-dns: catch all DNS exceptions in samba_dnsupdate
commit 29c4f3fa61c7bea39abecbd52f7170b97a9d53d3
Author: Andrew Bartlett
Date: Tue Nov 30 18:04:42 2010 +1100
s4-smb_server Return why the ntvfs_connect() failed.
Andrew Bartlett
commit 4ea840c3a50557a5c084694d5d30fc3d0532f4ff
Author: Andrew Bartlett
Date: Tue Nov 30 15:59:04 2010 +1100
s4-librpc Handle all types of GUID in the GUID() initialiser
By taking a length-limited string, we can parse binary and string GUID
values, which is particularly useful when reading from ldb.
Andrew Bartlett
---
Summary of changes:
source4/heimdal/lib/krb5/get_cred.c | 16 ++--
source4/librpc/ndr/py_misc.c | 14 +++---
source4/scripting/bin/samba_dnsupdate | 12
source4/smb_server/smb2/tcon.c|2 +-
4 files changed, 34 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/heimdal/lib/krb5/get_cred.c
b/source4/heimdal/lib/krb5/get_cred.c
index 9e06770..9011821 100644
--- a/source4/heimdal/lib/krb5/get_cred.c
+++ b/source4/heimdal/lib/krb5/get_cred.c
@@ -323,10 +323,11 @@ static krb5_error_code KRB5_CALLCONV
decrypt_tkt_with_subkey (krb5_context context,
krb5_keyblock *key,
krb5_key_usage usage,
-krb5_const_pointer subkey,
+krb5_const_pointer skey,
krb5_kdc_rep *dec_rep)
{
-krb5_error_code ret;
+const krb5_keyblock *subkey = skey;
+krb5_error_code ret = 0;
krb5_data data;
size_t size;
krb5_crypto crypto;
@@ -345,6 +346,17 @@ decrypt_tkt_with_subkey (krb5_context context,
KRB5_KU_TGS_REP_ENC_PART_SUB_KEY,
&dec_rep->kdc_rep.enc_part,
&data);
+ /*
+* If the is Windows 2000 DC, we need to retry with key usage
+* 8 when doing ARCFOUR.
+*/
+ if (ret && subkey->keytype == ETYPE_ARCFOUR_HMAC_MD5) {
+ ret = krb5_decrypt_EncryptedData(context,
+crypto,
+8,
+&dec_rep->kdc_rep.enc_part,
+&data);
+ }
krb5_crypto_destroy(context, crypto);
}
if (subkey == NULL || ret) {
diff --git a/source4/librpc/ndr/py_misc.c b/source4/librpc/ndr/py_misc.c
index 5d5b881..184029b 100644
--- a/source4/librpc/ndr/py_misc.c
+++ b/source4/librpc/ndr/py_misc.c
@@ -61,16 +61,24 @@ static PyObject *py_GUID_repr(PyObject *py_self)
static int py_GUID_init(PyObject *self, PyObject *args, PyObject *kwargs)
{
- char *str = NULL;
+ PyObject *str = NULL;
NTSTATUS status;
struct GUID *guid = py_talloc_get_ptr(self);
const char *kwnames[] = { "str", NULL };
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s",
discard_const_p(char *, kwnames), &str))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O",
discard_const_p(char *, kwnames), &str))
return -1;
if (str != NULL) {
- status = GUID_from_string(str, guid);
+ DATA_BLOB guid_val;
+
+ if (!PyString_Check(str)) {
+ PyErr_SetString(PyExc_TypeError, "Expected a string
argument to GUID()");
+ return -1;
+ }
+ guid_val.data = (uint8_t *)PyString_AsString(str);
+ guid_val.length = PyString_Size(str);
+ status = GUID_from_data_blob(&guid_val, guid);
if (!NT_STATUS_IS_OK(status)) {
PyErr_SetNTSTATUS(status);
return -1;
diff --git a/source4/scripting/bin/samba_dnsupdate
b/source4/scripting/bin/samba_dnsupdate
index 8f04895..faba124 100755
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/s
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 695f070 s3-waf: convert RPC_LSARPC into a subsystem.
via 3b0181c s3-waf: convert RPC_SAMR into a subsystem.
via da46020 s3-waf: convert INIT_SAMR into a subsystem.
via ec297bd s3-waf: convert INIT_NETLOGON into a subsystem.
via 29cb25e s3-waf: convert INIT_LSA into a subsystem.
via cc9e7c9 s3-waf: fix LIBNBT deps.
via 03e298e s3-waf: convert IDMAP_AD into a subsystem.
via c6b82f8 s3-waf: convert IDMAP_HASH into a subsystem.
via b0e3255 s3-waf: convert IDMAP_ADEX into a subsystem.
from 22fc5f2 s3: Fix a typo
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 695f070ccd6517cd0fc944e2a3d7dc8cc8a9dc30
Author: Günther Deschner
Date: Tue Nov 30 23:06:53 2010 +0100
s3-waf: convert RPC_LSARPC into a subsystem.
Guenther
Autobuild-User: Günther Deschner
Autobuild-Date: Wed Dec 1 00:13:58 CET 2010 on sn-devel-104
(cherry picked from commit 2b0905aeaecdc7fabad5661b4c726500f613be39)
commit 3b0181cb60f2addcbab1115b1f27f2388fb49b56
Author: Günther Deschner
Date: Tue Nov 30 23:04:23 2010 +0100
s3-waf: convert RPC_SAMR into a subsystem.
Guenther
(cherry picked from commit c2911952519089ed472d33143511d55d10752304)
commit da46020dac8a163d4ce6789e410864fe38b667ca
Author: Günther Deschner
Date: Tue Nov 30 22:41:41 2010 +0100
s3-waf: convert INIT_SAMR into a subsystem.
Guenther
(cherry picked from commit ef129716a4d0d44df5fcb5039398c6e5d9c0e589)
commit ec297bd22dc53b1c5ba90ae248c5382c3e2d7710
Author: Günther Deschner
Date: Tue Nov 30 22:37:37 2010 +0100
s3-waf: convert INIT_NETLOGON into a subsystem.
Guenther
(cherry picked from commit f5e1f5f1259c1a02a9e839f0d9e8ca78ea48cf4a)
commit 29cb25eb0c739659983ac223e2eebd7aa86b2dd0
Author: Günther Deschner
Date: Tue Nov 30 22:34:54 2010 +0100
s3-waf: convert INIT_LSA into a subsystem.
Guenther
(cherry picked from commit 42fe021f560649064d058ac4d9efc28fd97d9403)
commit cc9e7c991f2d860e613f109d075733ab17905474
Author: Günther Deschner
Date: Tue Nov 30 21:50:56 2010 +0100
s3-waf: fix LIBNBT deps.
Guenther
Autobuild-User: Günther Deschner
Autobuild-Date: Tue Nov 30 22:39:05 CET 2010 on sn-devel-104
(cherry picked from commit 783264e97c5230063abc601bc7f90c752141a9d6)
commit 03e298ec7098837a28dc327b7c101c0b550a0e62
Author: Günther Deschner
Date: Tue Nov 30 21:46:31 2010 +0100
s3-waf: convert IDMAP_AD into a subsystem.
Guenther
(cherry picked from commit c5559bb7ea6ea95ef333f1deb0bedfec10be39b7)
commit c6b82f8af0c562ddffe8f8eae5bd1fc079bbdb12
Author: Günther Deschner
Date: Tue Nov 30 21:44:25 2010 +0100
s3-waf: convert IDMAP_HASH into a subsystem.
Guenther
(cherry picked from commit 3a91e407cb4034442150559980ba87db55ba6739)
commit b0e325507424708919dc8a6c3fa860288ffa3b0e
Author: Günther Deschner
Date: Tue Nov 30 21:42:17 2010 +0100
s3-waf: convert IDMAP_ADEX into a subsystem.
Guenther
(cherry picked from commit e702b54cf83cde07512e1fea151b589fc07638c6)
---
Summary of changes:
source3/rpc_server/wscript_build | 18 --
source3/winbindd/wscript_build | 36
source3/wscript_build| 66 ++
3 files changed, 73 insertions(+), 47 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index 59c19d5..0e0d1c6 100644
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-RPC_LSARPC_SRC = '''srv_lsa_nt.c ../../librpc/gen_ndr/srv_lsa.c'''
+RPC_LSARPC_SRC = '''srv_lsa_nt.c'''
RPC_NETLOGON_SRC = '''srv_netlog_nt.c ../../librpc/gen_ndr/srv_netlogon.c'''
-RPC_SAMR_SRC = '''srv_samr_nt.c ../../librpc/gen_ndr/srv_samr.c
+RPC_SAMR_SRC = '''srv_samr_nt.c
srv_samr_util.c
srv_samr_chgpasswd.c'''
RPC_INITSHUTDOWN_SRC = '''srv_initshutdown_nt.c
../../librpc/gen_ndr/srv_initshutdown.c'''
@@ -22,16 +22,26 @@ bld.SAMBA_SUBSYSTEM('rpc',
source='srv_pipe_register.c',
vars=locals())
+bld.SAMBA_SUBSYSTEM('RPC_SAMR',
+source=RPC_SAMR_SRC,
+vars=locals())
+
+bld.SAMBA_SUBSYSTEM('RPC_LSARPC',
+source=RPC_LSARPC_SRC,
+vars=locals())
+
bld.SAMBA_MODULE('rpc_lsarpc',
subsystem='rpc',
- source=RPC_LSARPC_SRC,
+ source='../../librpc/gen_ndr/srv_lsa.c',
+ deps='RPC_LSARPC',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_LSARPC
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2b0905a s3-waf: convert RPC_LSARPC into a subsystem.
via c291195 s3-waf: convert RPC_SAMR into a subsystem.
via ef12971 s3-waf: convert INIT_SAMR into a subsystem.
via f5e1f5f s3-waf: convert INIT_NETLOGON into a subsystem.
via 42fe021 s3-waf: convert INIT_LSA into a subsystem.
from e8aa266 talloc: Add talloc object.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2b0905aeaecdc7fabad5661b4c726500f613be39
Author: Günther Deschner
Date: Tue Nov 30 23:06:53 2010 +0100
s3-waf: convert RPC_LSARPC into a subsystem.
Guenther
Autobuild-User: Günther Deschner
Autobuild-Date: Wed Dec 1 00:13:58 CET 2010 on sn-devel-104
commit c2911952519089ed472d33143511d55d10752304
Author: Günther Deschner
Date: Tue Nov 30 23:04:23 2010 +0100
s3-waf: convert RPC_SAMR into a subsystem.
Guenther
commit ef129716a4d0d44df5fcb5039398c6e5d9c0e589
Author: Günther Deschner
Date: Tue Nov 30 22:41:41 2010 +0100
s3-waf: convert INIT_SAMR into a subsystem.
Guenther
commit f5e1f5f1259c1a02a9e839f0d9e8ca78ea48cf4a
Author: Günther Deschner
Date: Tue Nov 30 22:37:37 2010 +0100
s3-waf: convert INIT_NETLOGON into a subsystem.
Guenther
commit 42fe021f560649064d058ac4d9efc28fd97d9403
Author: Günther Deschner
Date: Tue Nov 30 22:34:54 2010 +0100
s3-waf: convert INIT_LSA into a subsystem.
Guenther
---
Summary of changes:
source3/rpc_server/wscript_build | 18 --
source3/wscript_build| 62 +
2 files changed, 43 insertions(+), 37 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index 59c19d5..0e0d1c6 100644
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -1,8 +1,8 @@
#!/usr/bin/env python
-RPC_LSARPC_SRC = '''srv_lsa_nt.c ../../librpc/gen_ndr/srv_lsa.c'''
+RPC_LSARPC_SRC = '''srv_lsa_nt.c'''
RPC_NETLOGON_SRC = '''srv_netlog_nt.c ../../librpc/gen_ndr/srv_netlogon.c'''
-RPC_SAMR_SRC = '''srv_samr_nt.c ../../librpc/gen_ndr/srv_samr.c
+RPC_SAMR_SRC = '''srv_samr_nt.c
srv_samr_util.c
srv_samr_chgpasswd.c'''
RPC_INITSHUTDOWN_SRC = '''srv_initshutdown_nt.c
../../librpc/gen_ndr/srv_initshutdown.c'''
@@ -22,16 +22,26 @@ bld.SAMBA_SUBSYSTEM('rpc',
source='srv_pipe_register.c',
vars=locals())
+bld.SAMBA_SUBSYSTEM('RPC_SAMR',
+source=RPC_SAMR_SRC,
+vars=locals())
+
+bld.SAMBA_SUBSYSTEM('RPC_LSARPC',
+source=RPC_LSARPC_SRC,
+vars=locals())
+
bld.SAMBA_MODULE('rpc_lsarpc',
subsystem='rpc',
- source=RPC_LSARPC_SRC,
+ source='../../librpc/gen_ndr/srv_lsa.c',
+ deps='RPC_LSARPC',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_LSARPC'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_LSARPC'))
bld.SAMBA_MODULE('rpc_samr',
subsystem='rpc',
- source=RPC_SAMR_SRC,
+ source='../../librpc/gen_ndr/srv_samr.c',
+ deps='RPC_SAMR',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_SAMR'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_SAMR'))
diff --git a/source3/wscript_build b/source3/wscript_build
index 18ecf3c..876b4be 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -44,8 +44,7 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c
rpc_client/init_spoolss.c'''
-LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c
- rpc_client/init_lsa.c'''
+LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c'''
LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c'
@@ -416,11 +415,8 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
WINBINDD_SRC = '''${WINBINDD_SRC1}
${RPC_NCACN_NP}
${TDB_VALIDATE_SRC}
- rpc_client/init_netlogon.c
- rpc_server/srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c
- rpc_server/srv_samr_nt.c ../librpc/gen_ndr/srv_samr.c
- rpc_server/srv_samr_util.c
- rpc_server/srv_samr_chgpasswd.c
+ ../librpc/gen_ndr/srv_lsa.c
+ ../librpc/gen_ndr/srv_samr.c
rpc_server/srv_pipe_register.c'''
MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
@@ -476,9 +472,7 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c
smbd/connection.c
SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
${
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e8aa266 talloc: Add talloc object.
from 783264e s3-waf: fix LIBNBT deps.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e8aa266c97d7f5175f657f1b8d2c995bf879ae3d
Author: Jelmer Vernooij
Date: Tue Nov 30 22:22:15 2010 +0100
talloc: Add talloc object.
Autobuild-User: Jelmer Vernooij
Autobuild-Date: Tue Nov 30 23:26:56 CET 2010 on sn-devel-104
---
Summary of changes:
lib/talloc/pytalloc.c | 15 +++
1 files changed, 15 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index 96a6122..7bdebb0 100644
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -74,11 +74,26 @@ static PyMethodDef talloc_methods[] = {
{ NULL }
};
+static PyTypeObject TallocObject_Type = {
+ .tp_name = "talloc.Object",
+ .tp_basicsize = sizeof(py_talloc_Object),
+ .tp_dealloc = (destructor)py_talloc_dealloc,
+ .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+ .tp_repr = py_talloc_default_repr,
+ .tp_compare = py_talloc_default_cmp,
+};
+
void inittalloc(void)
{
PyObject *m;
+ if (PyType_Ready(&TallocObject_Type) < 0)
+ return;
+
m = Py_InitModule3("talloc", talloc_methods, "Debug utilities for
talloc-wrapped objects.");
if (m == NULL)
return;
+
+ Py_INCREF(&TallocObject_Type);
+ PyModule_AddObject(m, "Object", (PyObject *)&TallocObject_Type);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 22fc5f2 s3: Fix a typo
via edee50f s3: Attempt to fix the shadow_copy2 module
from 7d3e3e8 s3-waf: no need to compile ../librpc/ndr/ndr_compression.c
twice.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 22fc5f27b80b3eb597508126447cde74bae7ac5e
Author: Volker Lendecke
Date: Tue Nov 30 22:59:13 2010 +0100
s3: Fix a typo
commit edee50f9a9672684ec5e855cbdbd3400fd9e94e5
Author: Volker Lendecke
Date: Tue Nov 30 22:57:00 2010 +0100
s3: Attempt to fix the shadow_copy2 module
This module is from hell. Please make 100% sure that you did test it
properly when touching it! This module has probably given me more grey
hair than any other piece of Samba, so PLEASE PLEASE PLEASE be careful
here!!!
---
Summary of changes:
source3/modules/vfs_default.c |2 +-
source3/modules/vfs_shadow_copy2.c |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index eb0e0b9..977a563 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1078,7 +1078,7 @@ static char *vfswrap_realpath(vfs_handle_struct *handle,
const char *path)
if (!resolved_path) {
SAFE_FREE(result);
} else {
- /* SMB_ASSERT(result == resovled_path) ? */
+ /* SMB_ASSERT(result == resolved_path) ? */
result = resolved_path;
}
}
diff --git a/source3/modules/vfs_shadow_copy2.c
b/source3/modules/vfs_shadow_copy2.c
index ba6b344..f47b287 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -671,10 +671,10 @@ static char *shadow_copy2_realpath(vfs_handle_struct
*handle,
copy[gmt - fname + 1] = '\0';
DEBUG(10, ("calling NEXT_REALPATH with %s\n", copy));
- SHADOW2_NEXT(REALPATH, (handle, copy), char *,
+ SHADOW2_NEXT(REALPATH, (handle, fname), char *,
NULL);
}
-SHADOW2_NEXT(REALPATH, (handle, name), char *, NULL);
+SHADOW2_NEXT(REALPATH, (handle, fname), char *, NULL);
}
static const char *shadow_copy2_connectpath(struct vfs_handle_struct *handle,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 783264e s3-waf: fix LIBNBT deps.
via c5559bb s3-waf: convert IDMAP_AD into a subsystem.
via 3a91e40 s3-waf: convert IDMAP_HASH into a subsystem.
via e702b54 s3-waf: convert IDMAP_ADEX into a subsystem.
from 88b61a3 s3-waf: no need to compile ../librpc/ndr/ndr_compression.c
twice.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 783264e97c5230063abc601bc7f90c752141a9d6
Author: Günther Deschner
Date: Tue Nov 30 21:50:56 2010 +0100
s3-waf: fix LIBNBT deps.
Guenther
Autobuild-User: Günther Deschner
Autobuild-Date: Tue Nov 30 22:39:05 CET 2010 on sn-devel-104
commit c5559bb7ea6ea95ef333f1deb0bedfec10be39b7
Author: Günther Deschner
Date: Tue Nov 30 21:46:31 2010 +0100
s3-waf: convert IDMAP_AD into a subsystem.
Guenther
commit 3a91e407cb4034442150559980ba87db55ba6739
Author: Günther Deschner
Date: Tue Nov 30 21:44:25 2010 +0100
s3-waf: convert IDMAP_HASH into a subsystem.
Guenther
commit e702b54cf83cde07512e1fea151b589fc07638c6
Author: Günther Deschner
Date: Tue Nov 30 21:42:17 2010 +0100
s3-waf: convert IDMAP_ADEX into a subsystem.
Guenther
---
Summary of changes:
source3/winbindd/wscript_build | 36
source3/wscript_build |4 ++--
2 files changed, 30 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index da0c189..4ad898c 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -26,9 +26,22 @@ bld.SAMBA_SUBSYSTEM('idmap',
source=IDMAP_SRC,
vars=locals())
+bld.SAMBA_SUBSYSTEM('IDMAP_ADEX',
+source=IDMAP_ADEX_SRC,
+vars=locals())
+
+bld.SAMBA_SUBSYSTEM('IDMAP_HASH',
+source=IDMAP_HASH_SRC,
+vars=locals())
+
+bld.SAMBA_SUBSYSTEM('IDMAP_AD',
+source=IDMAP_AD_SRC,
+vars=locals())
+
bld.SAMBA_MODULE('idmap_ad',
subsystem='idmap',
- source=IDMAP_AD_SRC,
+ source='',
+ deps='IDMAP_AD',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
@@ -77,14 +90,16 @@ bld.SAMBA_MODULE('idmap_tdb2',
bld.SAMBA_MODULE('idmap_hash',
subsystem='idmap',
- source=IDMAP_HASH_SRC,
+ source='',
+ deps='IDMAP_HASH',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_HASH'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_HASH'))
bld.SAMBA_MODULE('idmap_adex',
subsystem='idmap',
- source=IDMAP_ADEX_SRC,
+ source='',
+ deps='IDMAP_ADEX',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_ADEX'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_ADEX'))
@@ -113,35 +128,40 @@ bld.SAMBA_MODULE('nss_info_template',
bld.SAMBA_MODULE('nss_info_adex',
subsystem='nss_info',
- source=IDMAP_ADEX_SRC,
+ source='',
+ deps='IDMAP_ADEX',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_ADEX'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_ADEX'))
bld.SAMBA_MODULE('nss_info_hash',
subsystem='nss_info',
- source=IDMAP_HASH_SRC,
+ source='',
+ deps='IDMAP_HASH',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_HASH'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_HASH'))
bld.SAMBA_MODULE('nss_info_rfc2307',
subsystem='nss_info',
- source=IDMAP_AD_SRC,
+ source='',
+ deps='IDMAP_AD',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
bld.SAMBA_MODULE('nss_info_sfu20',
subsystem='nss_info',
- source=IDMAP_AD_SRC,
+ source='',
+ deps='IDMAP_AD',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
bld.SAMBA_MODULE('nss_info_sfu',
subsystem='nss_info',
-
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 7d3e3e8 s3-waf: no need to compile ../librpc/ndr/ndr_compression.c twice. via 911a067 s3-waf: use LIBCLI_NDR_NETLOGON. via dfa4baf s3-waf: convert LIBNBT into a subsystem. via 2eef9ce s3-waf: convert SPNEGO_PARSE into a subsystem. via e5730ea s3-waf: use SLCACHE in ntlm_auth. via ea37b47 s3-waf: use TLDAP in smbtorture. via a8b61b2 s3-waf: convert NPA_TSTREAM into a subsystem. via 2ee0df4 s3-waf: add LIBDRSUAPI subsystem. via 53cba28 s3-waf: let SMBD_BASE depend on NDR_NOTIFY. via 27709de s3-waf: let LIBSMB (in fact LIBNBT) depend on NDR_NBT. via 846a879 s3-waf: let LIBSMB (in fact LIBNBT) depend on NDR_SVCCTL. via abf9acc s3-waf: convert LIBCLI_SPOOLSS into a subsystem. via 4592d69 s3-waf: convert RPCCLI_EPMAPPER into a subsystem. via 63a3119 s3-waf: convert RPCCLI_EVENTLOG into a subsystem. via 6e61e84 s3-waf: convert RPCCLI_NTSVCS into a subsystem. via 9131ebf s3-waf: convert RPCCLI_DRSUAPI into a subsystem. via 74f2b03 s3-waf: convert RPCCLI_DFS into a subsystem. via 7b38f01 s3-waf: convert RPCCLI_INITSHUTDOWN into a subsystem. via cd6b180 s3-waf: convert RPCCLI_DSSETUP into a subsystem. via dbc3713 s3-waf: convert RPCCLI_SVCCTL into a subsystem. via 6fa22f2 s3-waf: convert RPCCLI_WKSSVC into a subsystem. via 1585a2c s3-waf: convert RPCCLI_SRVSVC into a subsystem. via 74d129c s3-waf: convert LIBCLI_NETLOGON into a subsystem. via 2733c70 s3-waf: convert LIBCLI_LSA into a subsystem. via e635a95 s3-waf: convert LIBCLI_SAMR into a subsystem. via 4466ab2 s3-waf: convert PARAM_UTIL into a subsystem. via 41a538f s3-waf: convert TOKEN_UTIL into a subsystem. via 1cb441b s3-waf: convert REG_EVENTLOG into a subsystem. via d394701 s3-waf: convert LIBNMB into a subsystem. via 36aea8c s3-waf: convert FNAME_UTIL into a subsystem. from 8268e03 s3 docs: Reword posix locking text to answer a common question http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 7d3e3e8a031dd7b48d683bd6d41f37f23872e54f Author: Günther Deschner Date: Tue Nov 30 19:05:36 2010 +0100 s3-waf: no need to compile ../librpc/ndr/ndr_compression.c twice. Guenther Autobuild-User: Günther Deschner Autobuild-Date: Tue Nov 30 19:52:59 CET 2010 on sn-devel-104 (cherry picked from commit 88b61a3b295f83e18d3e3b8900e39b741d2c6b86) commit 911a067a305a35587fb2e137b8b8a1aa6781c47f Author: Günther Deschner Date: Tue Nov 30 19:00:09 2010 +0100 s3-waf: use LIBCLI_NDR_NETLOGON. Guenther (cherry picked from commit 9d6bfdf92d06bd3420299aee2e5c2445c62d70a5) commit dfa4baf301f77b9dddb03699c5e70ed6acd9a458 Author: Günther Deschner Date: Tue Nov 30 18:56:26 2010 +0100 s3-waf: convert LIBNBT into a subsystem. Guenther (cherry picked from commit 8333b029eaf9f7582cd2c9b928db40bf0c3b571d) commit 2eef9ce18d3456bafc01f9861848746957897fe1 Author: Günther Deschner Date: Tue Nov 30 18:52:21 2010 +0100 s3-waf: convert SPNEGO_PARSE into a subsystem. Guenther (cherry picked from commit 72b6936534d38d333fc518de14270d8048ab4541) commit e5730ea247fd615b9626f237c4555e91ec418820 Author: Günther Deschner Date: Tue Nov 30 18:48:38 2010 +0100 s3-waf: use SLCACHE in ntlm_auth. Guenther (cherry picked from commit b31c0e41045b90e4f1593c762a0ce07f06676a48) commit ea37b47244d40562c3fa930d150b6c175158f6e0 Author: Günther Deschner Date: Tue Nov 30 18:40:30 2010 +0100 s3-waf: use TLDAP in smbtorture. Guenther (cherry picked from commit 313123705be011334654ce0c8ebaaf21d8ced8cb) commit a8b61b2f07413e39e9e02245e75c885754304ef5 Author: Günther Deschner Date: Tue Nov 30 18:17:40 2010 +0100 s3-waf: convert NPA_TSTREAM into a subsystem. Guenther (cherry picked from commit 67f2d4f45c2f0b3f0845f7c688fdc8a230d3e1f9) commit 2ee0df47ab4f1844ed130f33a3b91ab637a17d05 Author: Günther Deschner Date: Tue Nov 30 18:07:21 2010 +0100 s3-waf: add LIBDRSUAPI subsystem. Guenther Autobuild-User: Günther Deschner Autobuild-Date: Tue Nov 30 18:58:42 CET 2010 on sn-devel-104 (cherry picked from commit d245ec848280f2120626e984dea2756c033c93f1) commit 53cba28e842fa6cdc389b07bc41fa17c12a51b9c Author: Günther Deschner Date: Tue Nov 30 18:01:13 2010 +0100 s3-waf: let SMBD_BASE depend on NDR_NOTIFY. Guenther (cherry picked from commit 193daf857729073d3166ea5e377ed1743cd2b26b) commit 27709de90a5c09f8081281a72a4020eeddc12f30 Author: Günther Deschner Date: Tue Nov 30 17:58:13 2010 +0100 s3-waf: let LIBSMB (in fact LIBNBT) depend on NDR_NBT. Guenther (cherry picked from commit a5ede16bb7462eed6f709ab2b4118
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 88b61a3 s3-waf: no need to compile ../librpc/ndr/ndr_compression.c
twice.
via 9d6bfdf s3-waf: use LIBCLI_NDR_NETLOGON.
via 8333b02 s3-waf: convert LIBNBT into a subsystem.
via 72b6936 s3-waf: convert SPNEGO_PARSE into a subsystem.
via b31c0e4 s3-waf: use SLCACHE in ntlm_auth.
via 3131237 s3-waf: use TLDAP in smbtorture.
via 67f2d4f s3-waf: convert NPA_TSTREAM into a subsystem.
from d245ec8 s3-waf: add LIBDRSUAPI subsystem.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 88b61a3b295f83e18d3e3b8900e39b741d2c6b86
Author: Günther Deschner
Date: Tue Nov 30 19:05:36 2010 +0100
s3-waf: no need to compile ../librpc/ndr/ndr_compression.c twice.
Guenther
Autobuild-User: Günther Deschner
Autobuild-Date: Tue Nov 30 19:52:59 CET 2010 on sn-devel-104
commit 9d6bfdf92d06bd3420299aee2e5c2445c62d70a5
Author: Günther Deschner
Date: Tue Nov 30 19:00:09 2010 +0100
s3-waf: use LIBCLI_NDR_NETLOGON.
Guenther
commit 8333b029eaf9f7582cd2c9b928db40bf0c3b571d
Author: Günther Deschner
Date: Tue Nov 30 18:56:26 2010 +0100
s3-waf: convert LIBNBT into a subsystem.
Guenther
commit 72b6936534d38d333fc518de14270d8048ab4541
Author: Günther Deschner
Date: Tue Nov 30 18:52:21 2010 +0100
s3-waf: convert SPNEGO_PARSE into a subsystem.
Guenther
commit b31c0e41045b90e4f1593c762a0ce07f06676a48
Author: Günther Deschner
Date: Tue Nov 30 18:48:38 2010 +0100
s3-waf: use SLCACHE in ntlm_auth.
Guenther
commit 313123705be011334654ce0c8ebaaf21d8ced8cb
Author: Günther Deschner
Date: Tue Nov 30 18:40:30 2010 +0100
s3-waf: use TLDAP in smbtorture.
Guenther
commit 67f2d4f45c2f0b3f0845f7c688fdc8a230d3e1f9
Author: Günther Deschner
Date: Tue Nov 30 18:17:40 2010 +0100
s3-waf: convert NPA_TSTREAM into a subsystem.
Guenther
---
Summary of changes:
source3/wscript_build | 48 ++--
1 files changed, 26 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript_build b/source3/wscript_build
index fc1796a..7e8af30 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -29,12 +29,9 @@ SERVER_MUTEX_SRC = 'lib/server_mutex.c'
PASSCHANGE_SRC = '''libsmb/passchange.c'''
-LIBNDR_DRSUAPI_SRC = '../librpc/ndr/ndr_compression.c'
-
COMPRESSION_SRC = '../lib/compression/mszip.c'
-DRSUAPI_SRC = '''${LIBNDR_DRSUAPI_SRC}
- ${COMPRESSION_SRC}'''
+DRSUAPI_SRC = '''${COMPRESSION_SRC}'''
LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
../librpc/ndr/ndr.c
@@ -150,9 +147,7 @@ LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
passdb/machine_sid.c'''
-LIBNBT_SRC = '''../libcli/nbt/nbtname.c
- ../libcli/netlogon.c
- ../libcli/ndr_netlogon.c'''
+LIBNBT_SRC = '''../libcli/netlogon.c'''
LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
@@ -195,14 +190,12 @@ SCHANNEL_SRC = '''../libcli/auth/credentials.c
LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
libsmb/clikrb5.c libsmb/clispnego.c
- ../libcli/auth/spnego_parse.c
libsmb/clirap.c libsmb/clierror.c libsmb/climessage.c
libsmb/clireadwrite.c libsmb/clilist.c libsmb/cliprint.c
libsmb/clitrans.c libsmb/clisecdesc.c libsmb/clidgram.c
libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c
libsmb/clidfs.c
libsmb/clioplock.c libsmb/clirap2.c
- libsmb/smb_seal.c libsmb/async_smb.c
- ${LIBNBT_SRC}'''
+ libsmb/smb_seal.c libsmb/async_smb.c'''
LIBMSRPC_SRC = '''
${SCHANNEL_SRC}
@@ -278,8 +271,7 @@ SERVICES_SRC = '''services/svc_spoolss.c
LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
-NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c
- ../librpc/gen_ndr/ndr_named_pipe_auth.c'''
+NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c'''
RPC_NCACN_NP = '''rpc_server/rpc_ncacn_np.c
rpc_server/rpc_handles.c'''
@@ -293,7 +285,7 @@ RPC_CRYPTO = '''rpc_server/dcesrv_ntlmssp.c
RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c rpc_server/srv_pipe.c
${RPC_NCACN_NP} ${RPC_SERVICE} ${RPC_CRYPTO}'''
-RPC_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC}'''
+RPC_SERVER_SRC = '''${RPC_PIPE_SRC}'''
RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
@@ -422,7 +414,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
../nsswitch/libwbclient/wb_reqtrans.c''
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via d245ec8 s3-waf: add LIBDRSUAPI subsystem. via 193daf8 s3-waf: let SMBD_BASE depend on NDR_NOTIFY. via a5ede16 s3-waf: let LIBSMB (in fact LIBNBT) depend on NDR_NBT. via 4ca43d9 s3-waf: let LIBSMB (in fact LIBNBT) depend on NDR_SVCCTL. via 5db1a39 s3-waf: convert LIBCLI_SPOOLSS into a subsystem. via e80e5c5 s3-waf: convert RPCCLI_EPMAPPER into a subsystem. via aaa31e7 s3-waf: convert RPCCLI_EVENTLOG into a subsystem. via d29f9e4 s3-waf: convert RPCCLI_NTSVCS into a subsystem. via d37f54d s3-waf: convert RPCCLI_DRSUAPI into a subsystem. via ac29057 s3-waf: convert RPCCLI_DFS into a subsystem. via 5cedef3 s3-waf: convert RPCCLI_INITSHUTDOWN into a subsystem. via 82b4408 s3-waf: convert RPCCLI_DSSETUP into a subsystem. via 2013c9c s3-waf: convert RPCCLI_SVCCTL into a subsystem. via a8d005d s3-waf: convert RPCCLI_WKSSVC into a subsystem. via f9f9b79 s3-waf: convert RPCCLI_SRVSVC into a subsystem. via 75f088f s3-waf: convert LIBCLI_NETLOGON into a subsystem. via 656e849 s3-waf: convert LIBCLI_LSA into a subsystem. via d16e77e s3-waf: convert LIBCLI_SAMR into a subsystem. via 2beab2d s3-waf: convert PARAM_UTIL into a subsystem. via 33c82cd s3-waf: convert TOKEN_UTIL into a subsystem. from b2a1c1e s3-waf: convert REG_EVENTLOG into a subsystem. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d245ec848280f2120626e984dea2756c033c93f1 Author: Günther Deschner Date: Tue Nov 30 18:07:21 2010 +0100 s3-waf: add LIBDRSUAPI subsystem. Guenther Autobuild-User: Günther Deschner Autobuild-Date: Tue Nov 30 18:58:42 CET 2010 on sn-devel-104 commit 193daf857729073d3166ea5e377ed1743cd2b26b Author: Günther Deschner Date: Tue Nov 30 18:01:13 2010 +0100 s3-waf: let SMBD_BASE depend on NDR_NOTIFY. Guenther commit a5ede16bb7462eed6f709ab2b4118db3e498d6a3 Author: Günther Deschner Date: Tue Nov 30 17:58:13 2010 +0100 s3-waf: let LIBSMB (in fact LIBNBT) depend on NDR_NBT. Guenther commit 4ca43d9bc1295e3bc28fb8b11ce8746c5af6524e Author: Günther Deschner Date: Tue Nov 30 17:56:03 2010 +0100 s3-waf: let LIBSMB (in fact LIBNBT) depend on NDR_SVCCTL. Guenther commit 5db1a399d586fd665382e625a5cdd0d1b995df27 Author: Günther Deschner Date: Tue Nov 30 17:50:32 2010 +0100 s3-waf: convert LIBCLI_SPOOLSS into a subsystem. Guenther commit e80e5c5b8a88a23d3fdf11e52d5f3bef2cdeb31b Author: Günther Deschner Date: Tue Nov 30 17:46:56 2010 +0100 s3-waf: convert RPCCLI_EPMAPPER into a subsystem. Guenther commit aaa31e7b22342157c9982107a6af67c06b01ef93 Author: Günther Deschner Date: Tue Nov 30 17:45:25 2010 +0100 s3-waf: convert RPCCLI_EVENTLOG into a subsystem. Guenther commit d29f9e4846d86002732f37703a5b21b759be745a Author: Günther Deschner Date: Tue Nov 30 17:44:25 2010 +0100 s3-waf: convert RPCCLI_NTSVCS into a subsystem. Guenther commit d37f54d8807166b9008c9d3fa11789e1936f4c0e Author: Günther Deschner Date: Tue Nov 30 17:43:09 2010 +0100 s3-waf: convert RPCCLI_DRSUAPI into a subsystem. Guenther commit ac290574e2ff49c9be880e545d1255f687dcc9ec Author: Günther Deschner Date: Tue Nov 30 17:40:38 2010 +0100 s3-waf: convert RPCCLI_DFS into a subsystem. Guenther commit 5cedef39d7f4208d22ce3c7fd48c19d5f8a8e4d1 Author: Günther Deschner Date: Tue Nov 30 17:38:44 2010 +0100 s3-waf: convert RPCCLI_INITSHUTDOWN into a subsystem. Guenther commit 82b440835dfc24be114f08ee1f2824aba7ac7260 Author: Günther Deschner Date: Tue Nov 30 17:36:13 2010 +0100 s3-waf: convert RPCCLI_DSSETUP into a subsystem. Guenther commit 2013c9c391ee0324039842ec2f8acd4addd33d85 Author: Günther Deschner Date: Tue Nov 30 17:21:38 2010 +0100 s3-waf: convert RPCCLI_SVCCTL into a subsystem. Guenther commit a8d005d439489c939051436eb8dbb75ff1cf9fbe Author: Günther Deschner Date: Tue Nov 30 17:19:12 2010 +0100 s3-waf: convert RPCCLI_WKSSVC into a subsystem. Guenther commit f9f9b798599262390cdec14d410fd3c8b94cd871 Author: Günther Deschner Date: Tue Nov 30 17:15:43 2010 +0100 s3-waf: convert RPCCLI_SRVSVC into a subsystem. Guenther commit 75f088f898993f7417520f2623611c689a58563b Author: Günther Deschner Date: Tue Nov 30 17:27:37 2010 +0100 s3-waf: convert LIBCLI_NETLOGON into a subsystem. Guenther commit 656e849ce84c4b35e6f93ae8f4fe8780a4109e34 Author: Günther Deschner Date: Tue Nov 30 17:09:34 2010 +0100 s3-waf: convert LIBCLI_LSA into a subsystem. Guenther commit d16e77e1233b912d90d4c586176529d3361cc85e Author: Günther Deschner Date: Tue Nov 30 16:43:34 2010 +0100 s3-waf
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b2a1c1e s3-waf: convert REG_EVENTLOG into a subsystem.
via 254dea0 s3-waf: convert LIBNMB into a subsystem.
via 12d73f2 s3-waf: convert FNAME_UTIL into a subsystem.
from d6337bb s3: Fix bug 7832
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b2a1c1e425411eb1a12ddb3a230cbcd5240f771e
Author: Günther Deschner
Date: Tue Nov 30 15:12:52 2010 +0100
s3-waf: convert REG_EVENTLOG into a subsystem.
Guenther
Autobuild-User: Günther Deschner
Autobuild-Date: Tue Nov 30 16:25:51 CET 2010 on sn-devel-104
commit 254dea0596b32431b70f48a8a9413c54b66c9925
Author: Günther Deschner
Date: Tue Nov 30 14:56:26 2010 +0100
s3-waf: convert LIBNMB into a subsystem.
Guenther
commit 12d73f2cb8aec5e54fb21c0844624ab0b02c6228
Author: Günther Deschner
Date: Tue Nov 30 14:29:31 2010 +0100
s3-waf: convert FNAME_UTIL into a subsystem.
Guenther
---
Summary of changes:
source3/wscript_build | 59
1 files changed, 34 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript_build b/source3/wscript_build
index 56d7198..89f16c4 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -259,7 +259,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c
libsmb/clifile.c
libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c
libsmb/clidfs.c
libsmb/clioplock.c libsmb/clirap2.c
libsmb/smb_seal.c libsmb/async_smb.c
- ${LIBNMB_SRC}
${LIBNBT_SRC}
${DRSUAPI_SRC}'''
@@ -322,10 +321,11 @@ REG_SMBCONF_SRC = '''
registry/reg_util_token.c
registry/reg_api_util.c'''
+REG_EVENTLOG_SRC = '''registry/reg_eventlog.c'''
+
REG_FULL_SRC = '''
${REG_BACKENDS_EXTRA_SRC}
${REG_INIT_FULL_SRC}
- registry/reg_eventlog.c
registry/reg_perfcount.c'''
SERVICES_SRC = '''services/svc_spoolss.c
@@ -548,7 +548,7 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c
smbd/connection.c
SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
${RPC_SERVER_SRC}
-${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
+${OPLOCK_SRC} ${NOTIFY_SRC}
${BUILDOPT_SRC}
${LIBCLI_SPOOLSS_SRC}
${LIBCLI_SRVSVC_SRC}
@@ -591,12 +591,11 @@ SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c
web/statuspage.c
web/swat.c web/neg_lang.c'''
SWAT_SRC = '''${SWAT_SRC1}
- ${PASSCHANGE_SRC} ${FNAME_UTIL_SRC}
+ ${PASSCHANGE_SRC}
${LIBCLI_SAMR_SRC}
rpc_client/init_lsa.c'''
-STATUS_SRC = '''utils/status.c utils/status_profile.c
- ${FNAME_UTIL_SRC}'''
+STATUS_SRC = '''utils/status.c utils/status_profile.c'''
SMBCONTROL_SRC = '''utils/smbcontrol.c'''
@@ -605,7 +604,7 @@ SMBTREE_SRC = '''utils/smbtree.c
TESTPARM_SRC = 'utils/testparm.c'
-SMBTA_UTIL_SRC = '''utils/smbta-util.c ${FNAME_UTIL_SRC}'''
+SMBTA_UTIL_SRC = '''utils/smbta-util.c'''
TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
@@ -769,7 +768,7 @@ NET_SRC = '''${NET_SRC1}
CUPS_SRC = '''client/smbspool.c'''
-NMBLOOKUP_SRC = '''utils/nmblookup.c ${LIBNMB_SRC}'''
+NMBLOOKUP_SRC = '''utils/nmblookup.c'''
SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c
torture/utable.c
torture/denytest.c torture/mangle_test.c
@@ -785,7 +784,7 @@ MASKTEST_SRC = '''torture/masktest.c'''
MSGTEST_SRC = '''torture/msgtest.c'''
-LOCKTEST_SRC = '''torture/locktest.c ${FNAME_UTIL_SRC}'''
+LOCKTEST_SRC = '''torture/locktest.c'''
NSSTEST_SRC = '''../nsswitch/nsstest.c ${LIBSAMBAUTIL_SRC}'''
@@ -797,7 +796,7 @@ SMBICONV_SRC = '''torture/smbiconv.c'''
LOG2PCAP_SRC = '''utils/log2pcaphex.c'''
-LOCKTEST2_SRC = '''torture/locktest2.c ${FNAME_UTIL_SRC}'''
+LOCKTEST2_SRC = '''torture/locktest2.c'''
SMBCACLS_SRC = '''utils/smbcacls.c
${LIBCLI_LSA_SRC}'''
@@ -807,8 +806,7 @@ SMBCQUOTAS_SRC = '''utils/smbcquotas.c
EVTLOGADM_SRC0 = 'utils/eventlogadm.c'
-EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}
-registry/reg_eventlog.c'''
+EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}'''
SHARESEC_SRC0 = 'utils/sharesec.c'
SHARESEC_SRC = '''${SHARESEC_SRC0}'''
@@ -818,7 +816,7 @@ DEBUG2HTML_SRC = '''utils/debug2html.c utils/debugparse.c'''
SMBFILTER_SRC = '''utils/smbfilter.c'''
WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c ${PARAM_SRC}
-${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC} ${LIBNMB_SRC}'''
+${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC}'''
WBINFO_SRC = '''../nsswitch/wbinfo.c'''
@@ -834,8 +832,7 @@ NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c
utils/ntlm_auth_diagn
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 8268e03 s3 docs: Reword posix locking text to answer a common question from e6d3146 s3: Fix bug 7832 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 8268e030235b6cb5e6288a53133bba1faa9e63b1 Author: Kai Blin Date: Tue Nov 30 15:58:05 2010 +0100 s3 docs: Reword posix locking text to answer a common question vl recently pointed me to a valid reason to use posix locking = no. Fix the smb.conf manpage to explain this reason, as this question comes up on the samba mailing list from time to time as well. (cherry picked from commit fd17979293ecb37bdb16c5078fefb3f63cfb3730) --- Summary of changes: docs-xml/smbdotconf/locking/posixlocking.xml |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/locking/posixlocking.xml b/docs-xml/smbdotconf/locking/posixlocking.xml index e5a89f5..25476f0 100644 --- a/docs-xml/smbdotconf/locking/posixlocking.xml +++ b/docs-xml/smbdotconf/locking/posixlocking.xml @@ -8,7 +8,8 @@ daemon maintains an database of file locks obtained by SMB clients. The default behavior is to map this internal database to POSIX locks. This means that file locks obtained by SMB clients are consistent with those seen by POSIX compliant applications accessing the files via a non-SMB - method (e.g. NFS or local file access). You should never need to disable this parameter. + method (e.g. NFS or local file access). It is very unlikely that you need to set this parameter + to "no", unless you are sharing from an NFS mount, which is not a good idea in the first place. yes -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via e6d3146 s3: Fix bug 7832
from d6000ed s3: Add shadow copy info to smbclient allinfo
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit e6d31465fe62b300964dad325f3d9ed02823ac26
Author: Volker Lendecke
Date: Tue Nov 30 12:31:39 2010 +0100
s3: Fix bug 7832
Signed-off-by: Günther Deschner
Autobuild-User: Günther Deschner
Autobuild-Date: Tue Nov 30 14:39:34 CET 2010 on sn-devel-104
---
Summary of changes:
source3/winbindd/idmap_ad.c |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index 1567598..bc1a1e5 100644
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -859,6 +859,7 @@ static NTSTATUS nss_ad_get_info( struct nss_domain_entry *e,
/* See if we can use the ADS connection struct swe were given */
+#if 0
if (ads) {
DEBUG(10, ("nss_ad_get_info: using given ads connection and "
"LDAP message (%p)\n", msg));
@@ -875,6 +876,7 @@ static NTSTATUS nss_ad_get_info( struct nss_domain_entry *e,
nt_status = NT_STATUS_OK;
goto done;
}
+#endif
/* Have to do our own query */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d6337bb s3: Fix bug 7832
from f430dd3 wafsamba: Fix indentation.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d6337bb1bea8698f7532ef5be83de3c75376f09b
Author: Volker Lendecke
Date: Tue Nov 30 12:31:39 2010 +0100
s3: Fix bug 7832
Signed-off-by: Günther Deschner
Autobuild-User: Günther Deschner
Autobuild-Date: Tue Nov 30 14:39:34 CET 2010 on sn-devel-104
---
Summary of changes:
source3/winbindd/idmap_ad.c |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index 1567598..bc1a1e5 100644
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -859,6 +859,7 @@ static NTSTATUS nss_ad_get_info( struct nss_domain_entry *e,
/* See if we can use the ADS connection struct swe were given */
+#if 0
if (ads) {
DEBUG(10, ("nss_ad_get_info: using given ads connection and "
"LDAP message (%p)\n", msg));
@@ -875,6 +876,7 @@ static NTSTATUS nss_ad_get_info( struct nss_domain_entry *e,
nt_status = NT_STATUS_OK;
goto done;
}
+#endif
/* Have to do our own query */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via d6000ed s3: Add shadow copy info to smbclient allinfo
via 4e3347f s3: Add cli_shadow_copy_data (cherry picked from commit
3f6705e8e3055133cc155797e66233d8a5919795)
from e6c9327 Merge master into v3-6-test again.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit d6000ed8cc852ddf18f2f39e4013b762f6c72b17
Author: Volker Lendecke
Date: Mon Nov 29 18:09:49 2010 +0100
s3: Add shadow copy info to smbclient allinfo
Autobuild-User: Volker Lendecke
Autobuild-Date: Tue Nov 30 12:23:50 CET 2010 on sn-devel-104
(cherry picked from commit e0e4dc1c2282253cfaac5bae39b75361d13c843e)
commit 4e3347f4cbe21e7765acd759360017d31258b478
Author: Volker Lendecke
Date: Mon Nov 29 17:39:43 2010 +0100
s3: Add cli_shadow_copy_data
(cherry picked from commit 3f6705e8e3055133cc155797e66233d8a5919795)
---
Summary of changes:
source3/client/client.c | 46 ++
source3/include/proto.h | 11
source3/libsmb/clifile.c | 149 ++
3 files changed, 206 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/client.c b/source3/client/client.c
index 062809d..b3bbcf5 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1633,8 +1633,11 @@ static int do_allinfo(const char *name)
uint16_t mode;
SMB_INO_T ino;
NTTIME tmp;
+ uint16_t fnum;
unsigned int num_streams;
struct stream_struct *streams;
+ int num_snapshots;
+ char **snapshots;
unsigned int i;
NTSTATUS status;
@@ -1681,6 +1684,49 @@ static int do_allinfo(const char *name)
(unsigned long long)streams[i].size);
}
+ status = cli_open(cli, name, O_RDONLY, DENY_NONE, &fnum);
+ if (!NT_STATUS_IS_OK(status)) {
+ /*
+* Ignore failure, it does not hurt if we can't list
+* snapshots
+*/
+ return 0;
+ }
+ status = cli_shadow_copy_data(talloc_tos(), cli, fnum,
+ true, &snapshots, &num_snapshots);
+ if (!NT_STATUS_IS_OK(status)) {
+ cli_close(cli, fnum);
+ return 0;
+ }
+
+ for (i=0; iget_names = get_names;
+ ret_size = get_names ? cli->max_xmit : 16;
+
+ SIVAL(state->setup + 0, 0, FSCTL_GET_SHADOW_COPY_DATA);
+ SSVAL(state->setup + 2, 0, fnum);
+ SCVAL(state->setup + 3, 0, 0); /* isFsctl */
+ SCVAL(state->setup + 3, 1, 0); /* compfilter, isFlags (WSSP) */
+
+ subreq = cli_trans_send(
+ state, ev, cli, SMBnttrans, NULL, 0, NT_TRANSACT_IOCTL, 0,
+ state->setup, ARRAY_SIZE(state->setup), 0,
+ NULL, 0, 0,
+ NULL, 0, ret_size);
+ if (tevent_req_nomem(subreq, req)) {
+ return tevent_req_post(req, ev);
+ }
+ tevent_req_set_callback(subreq, cli_shadow_copy_data_done, req);
+ return req;
+}
+
+static void cli_shadow_copy_data_done(struct tevent_req *subreq)
+{
+ struct tevent_req *req = tevent_req_callback_data(
+ subreq, struct tevent_req);
+ struct cli_shadow_copy_data_state *state = tevent_req_data(
+ req, struct cli_shadow_copy_data_state);
+ NTSTATUS status;
+
+ status = cli_trans_recv(subreq, state, NULL,
+ NULL, 0, NULL, /* setup */
+ NULL, 0, NULL, /* param */
+ &state->data, 12, &state->num_data);
+ TALLOC_FREE(subreq);
+ if (!NT_STATUS_IS_OK(status)) {
+ tevent_req_nterror(req, status);
+ return;
+ }
+ tevent_req_done(req);
+}
+
+NTSTATUS cli_shadow_copy_data_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+ char ***pnames, int *pnum_names)
+{
+ struct cli_shadow_copy_data_state *state = tevent_req_data(
+ req, struct cli_shadow_copy_data_state);
+ char **names;
+ int i, num_names;
+ uint32_t dlength;
+ NTSTATUS status;
+
+ if (tevent_req_is_nterror(req, &status)) {
+ return status;
+ }
+ num_names = IVAL(state->data, 4);
+ dlength = IVAL(state->data, 8);
+
+ if (!state->get_names) {
+ *pnum_names = num_names;
+ return NT_STATUS_OK;
+ }
+
+ if (dlength+12 > state->num_data) {
+ return NT_STATUS_INVALID_NETWORK_RESPONSE;
+ }
+ names = talloc_array(mem_ctx, char *, num_names);
+ if (names == NULL) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ for (i=0; idata + 12 + i * 2 * sizeof(SHADOW_COPY_LABEL);
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f430dd3 wafsamba: Fix indentation. from e0e4dc1 s3: Add shadow copy info to smbclient allinfo http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f430dd3cb8eb904a0b9a0dd0b786d913da16a155 Author: Jelmer Vernooij Date: Tue Nov 30 12:01:07 2010 +0100 wafsamba: Fix indentation. Without this change we'd exclude the rpath for private libraries whenever the first dependency of a subsystem was a public library. Autobuild-User: Jelmer Vernooij Autobuild-Date: Tue Nov 30 13:08:04 CET 2010 on sn-devel-104 --- Summary of changes: buildtools/wafsamba/samba_utils.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index 1e360f0..5811cb3 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -69,7 +69,7 @@ def needs_private_lib(bld, target): t = bld.name_to_obj(lib, bld.env) if t and getattr(t, 'private_library', False): return True -return False +return False def install_rpath(target): -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e0e4dc1 s3: Add shadow copy info to smbclient allinfo
via 3f6705e s3: Add cli_shadow_copy_data
from 10d1cd7 s4:torture - partially revert "s4:torture - prefer the
termination "return"s at the end of two unittests"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e0e4dc1c2282253cfaac5bae39b75361d13c843e
Author: Volker Lendecke
Date: Mon Nov 29 18:09:49 2010 +0100
s3: Add shadow copy info to smbclient allinfo
Autobuild-User: Volker Lendecke
Autobuild-Date: Tue Nov 30 12:23:50 CET 2010 on sn-devel-104
commit 3f6705e8e3055133cc155797e66233d8a5919795
Author: Volker Lendecke
Date: Mon Nov 29 17:39:43 2010 +0100
s3: Add cli_shadow_copy_data
---
Summary of changes:
source3/client/client.c | 46 ++
source3/include/proto.h | 11
source3/libsmb/clifile.c | 149 ++
3 files changed, 206 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/client.c b/source3/client/client.c
index 062809d..b3bbcf5 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1633,8 +1633,11 @@ static int do_allinfo(const char *name)
uint16_t mode;
SMB_INO_T ino;
NTTIME tmp;
+ uint16_t fnum;
unsigned int num_streams;
struct stream_struct *streams;
+ int num_snapshots;
+ char **snapshots;
unsigned int i;
NTSTATUS status;
@@ -1681,6 +1684,49 @@ static int do_allinfo(const char *name)
(unsigned long long)streams[i].size);
}
+ status = cli_open(cli, name, O_RDONLY, DENY_NONE, &fnum);
+ if (!NT_STATUS_IS_OK(status)) {
+ /*
+* Ignore failure, it does not hurt if we can't list
+* snapshots
+*/
+ return 0;
+ }
+ status = cli_shadow_copy_data(talloc_tos(), cli, fnum,
+ true, &snapshots, &num_snapshots);
+ if (!NT_STATUS_IS_OK(status)) {
+ cli_close(cli, fnum);
+ return 0;
+ }
+
+ for (i=0; iget_names = get_names;
+ ret_size = get_names ? cli->max_xmit : 16;
+
+ SIVAL(state->setup + 0, 0, FSCTL_GET_SHADOW_COPY_DATA);
+ SSVAL(state->setup + 2, 0, fnum);
+ SCVAL(state->setup + 3, 0, 0); /* isFsctl */
+ SCVAL(state->setup + 3, 1, 0); /* compfilter, isFlags (WSSP) */
+
+ subreq = cli_trans_send(
+ state, ev, cli, SMBnttrans, NULL, 0, NT_TRANSACT_IOCTL, 0,
+ state->setup, ARRAY_SIZE(state->setup), 0,
+ NULL, 0, 0,
+ NULL, 0, ret_size);
+ if (tevent_req_nomem(subreq, req)) {
+ return tevent_req_post(req, ev);
+ }
+ tevent_req_set_callback(subreq, cli_shadow_copy_data_done, req);
+ return req;
+}
+
+static void cli_shadow_copy_data_done(struct tevent_req *subreq)
+{
+ struct tevent_req *req = tevent_req_callback_data(
+ subreq, struct tevent_req);
+ struct cli_shadow_copy_data_state *state = tevent_req_data(
+ req, struct cli_shadow_copy_data_state);
+ NTSTATUS status;
+
+ status = cli_trans_recv(subreq, state, NULL,
+ NULL, 0, NULL, /* setup */
+ NULL, 0, NULL, /* param */
+ &state->data, 12, &state->num_data);
+ TALLOC_FREE(subreq);
+ if (!NT_STATUS_IS_OK(status)) {
+ tevent_req_nterror(req, status);
+ return;
+ }
+ tevent_req_done(req);
+}
+
+NTSTATUS cli_shadow_copy_data_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+ char ***pnames, int *pnum_names)
+{
+ struct cli_shadow_copy_data_state *state = tevent_req_data(
+ req, struct cli_shadow_copy_data_state);
+ char **names;
+ int i, num_names;
+ uint32_t dlength;
+ NTSTATUS status;
+
+ if (tevent_req_is_nterror(req, &status)) {
+ return status;
+ }
+ num_names = IVAL(state->data, 4);
+ dlength = IVAL(state->data, 8);
+
+ if (!state->get_names) {
+ *pnum_names = num_names;
+ return NT_STATUS_OK;
+ }
+
+ if (dlength+12 > state->num_data) {
+ return NT_STATUS_INVALID_NETWORK_RESPONSE;
+ }
+ names = talloc_array(mem_ctx, char *, num_names);
+ if (names == NULL) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ for (i=0; idata + 12 + i * 2 * sizeof(SHADOW_COPY_LABEL);
+ ret = convert_string_talloc(
+ names, CH_UTF16LE, CH_UNIX,
+ src, 2 * sizeof(SHADOW_COPY_LABEL),
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 10d1cd7 s4:torture - partially revert "s4:torture - prefer the
termination "return"s at the end of two unittests"
from 2a5daa7 wafsamba: Only use private library rpath when linking
against private libraries.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 10d1cd7af7962a2ce012f426947e9b0538e9f653
Author: Matthias Dieter Wallnöfer
Date: Tue Nov 30 08:32:22 2010 +0100
s4:torture - partially revert "s4:torture - prefer the termination
"return"s at the end of two unittests"
This partially reverts commit 54a5c398aaa1d53b5892c9b0aa5539ae7da651da.
As tridge pointed out I've overseen the nested loop in "run_iometer".
Therefore we end in a infinite loop. Obviously it wasn't run by "make
test" since then I would have detected it.
Autobuild-User: Matthias Dieter Wallnöfer
Autobuild-Date: Tue Nov 30 09:23:00 CET 2010 on sn-devel-104
---
Summary of changes:
source4/torture/basic/base.c |6 ++
1 files changed, 2 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 0e168ed..9953573 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -1340,7 +1340,7 @@ static bool run_iometer(struct torture_context *tctx,
for (i=0; i torture_numops) {
- break;
+ return true;
}
res = smbcli_read(cli->tree, fnum, buf,
random() % filesize, sizeof(buf));
@@ -1351,7 +1351,7 @@ static bool run_iometer(struct torture_context *tctx,
for (i=0; i torture_numops) {
- break;
+ return true;
}
res = smbcli_write(cli->tree, fnum, 0, buf,
random() % filesize, sizeof(buf));
@@ -1360,8 +1360,6 @@ static bool run_iometer(struct torture_context *tctx,
smbcli_errstr(cli->tree)));
}
}
-
- return true;
}
/**
--
Samba Shared Repository
