[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8c07686 s4 provision: DNS backend should be set by caller via d58f266 s4 provision/dns: Clean up os level handling via 6382721 s4 provision/dns: Clean up backend handling via b42b812 s4 provision: Default to win2k3 domain function level via 41d4862 s4 provision: Reword opinionated dns backend help text, add NONE backend via 292554c s4 provision: Rename bind9 flatfile backend to BIND9_FLATFILE from 009b97d provision: fix the doc http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8c076862ad0b1b14bb6addef323c5678368051af Author: Kai Blin k...@samba.org Date: Sat Oct 15 13:54:45 2011 +0200 s4 provision: DNS backend should be set by caller Autobuild-User: Kai Blin k...@samba.org Autobuild-Date: Mon Oct 17 09:51:12 CEST 2011 on sn-devel-104 commit d58f266d19750484b72ad0e18de3e83c88e81169 Author: Kai Blin k...@samba.org Date: Sat Oct 15 13:52:57 2011 +0200 s4 provision/dns: Clean up os level handling commit 6382721ce0559bd60a9abd08b0a9353db9f7d731 Author: Kai Blin k...@samba.org Date: Sat Oct 15 13:48:28 2011 +0200 s4 provision/dns: Clean up backend handling commit b42b81249c5f6006e743b186a3d58a3763aeabe8 Author: Kai Blin k...@samba.org Date: Sat Oct 15 12:36:50 2011 +0200 s4 provision: Default to win2k3 domain function level commit 41d48626e24324c726793856c3c907c0dd89f3a1 Author: Kai Blin k...@samba.org Date: Sat Oct 15 12:27:55 2011 +0200 s4 provision: Reword opinionated dns backend help text, add NONE backend commit 292554c396d0a848bb73423e08a5f30eba1d4907 Author: Kai Blin k...@samba.org Date: Sat Oct 15 12:17:14 2011 +0200 s4 provision: Rename bind9 flatfile backend to BIND9_FLATFILE --- Summary of changes: source4/scripting/python/samba/join.py |6 ++- .../scripting/python/samba/provision/__init__.py |8 +--- .../scripting/python/samba/provision/sambadns.py | 41 source4/scripting/python/samba/upgrade.py |8 +++- source4/scripting/python/samba/upgradehelpers.py |3 +- source4/setup/provision| 16 ++-- 6 files changed, 52 insertions(+), 30 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py index 731f0b5..6a8ac97 100644 --- a/source4/scripting/python/samba/join.py +++ b/source4/scripting/python/samba/join.py @@ -584,7 +584,8 @@ class dc_join(object): serverdn=ctx.server_dn, domain=ctx.domain_name, hostname=ctx.myname, domainsid=ctx.domsid, machinepass=ctx.acct_pass, serverrole=domain controller, -sitename=ctx.site, lp=ctx.lp, ntdsguid=ctx.ntds_guid) +sitename=ctx.site, lp=ctx.lp, ntdsguid=ctx.ntds_guid, +dns_backend=NONE) print Provision OK for domain DN %s % presult.domaindn ctx.local_samdb = presult.samdb ctx.lp = presult.lp @@ -622,7 +623,8 @@ class dc_join(object): domainguid=domguid, targetdir=ctx.targetdir, samdb_fill=FILL_SUBDOMAIN, machinepass=ctx.acct_pass, serverrole=domain controller, - lp=ctx.lp, hostip=ctx.names.hostip, hostip6=ctx.names.hostip6) + lp=ctx.lp, hostip=ctx.names.hostip, hostip6=ctx.names.hostip6, + dns_backend=BIND9_FLATFILE) print(Provision OK for domain %s % ctx.names.dnsdomain) diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index a3633ab..5e7e374 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -1625,10 +1625,6 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths, dnsdomain=names.dnsdomain, dns_keytab_path=paths.dns_keytab, dnspass=dnspass) -# Default DNS backend is BIND9 using txt files for zone information -if not dns_backend: -dns_backend = BIND9 - setup_ad_dns(samdb, names, logger, hostip=hostip, hostip6=hostip6, dns_backend=dns_backend, os_level=dom_for_fun_level) @@ -1640,7 +1636,7 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths, # Only make a zone file on the first DC, it should be # replicated with DNS replication -if dns_backend == BIND9: +if dns_backend == BIND9_FLATFILE: create_zone_file(lp, logger, paths,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2a2dd6f s3: Before adding KDC's to the krb5.conf, cldap ping them
via 41a0e96 Add cldap_multi_netlogon_send/recv
from 8c07686 s4 provision: DNS backend should be set by caller
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2a2dd6ff5e057b1dec37a212b0a5eeb2a8392c36
Author: Volker Lendecke v...@samba.org
Date: Wed Oct 12 19:41:45 2011 +0200
s3: Before adding KDC's to the krb5.conf, cldap ping them
Some Kerberos libraries don't do proper failover. This fixes the situation
where a KDC exists in DNS but is not reachable for some reason.
Ported to master by Stefan Metzmacher me...@samba.org
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Mon Oct 17 11:25:37 CEST 2011 on sn-devel-104
commit 41a0e96724dc05752b1bdb86fc946c820be16632
Author: Volker Lendecke v...@samba.org
Date: Thu Sep 29 13:30:30 2011 +0200
Add cldap_multi_netlogon_send/recv
Make ads_cldap_netlogon use it. It does not need the fancy multi stuff, but
excercising that code more often is better. And because we have to ask over
the
network, the additional load should be neglectable.
Ported to master by Stefan Metzmacher me...@samba.org
---
Summary of changes:
source3/Makefile.in |3 +-
source3/libads/cldap.c| 338 +++--
source3/libads/cldap.h| 18 +++
source3/libads/kerberos.c | 148 ++---
source3/wscript_build |2 +-
5 files changed, 418 insertions(+), 91 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6b979d4..f2bab71 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1532,7 +1532,8 @@ NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ)
$(POPT_LIB_OBJ) \
$(PASSDB_OBJ) $(GROUPDB_OBJ) \
$(SMBLDAP_OBJ) $(LIBNMB_OBJ) \
$(WBCOMMON_OBJ) \
- $(LIBCLI_LDAP_NDR_OBJ) \
+ $(LIBNBT_OBJ) \
+ $(CLDAP_OBJ) \
$(DRSUAPI_OBJ) \
$(LIBNDR_GEN_OBJ0) $(LIBNDR_NETLOGON_OBJ) @BUILD_INIPARSER@
diff --git a/source3/libads/cldap.c b/source3/libads/cldap.c
index 4f725a0..0241236 100644
--- a/source3/libads/cldap.c
+++ b/source3/libads/cldap.c
@@ -23,8 +23,286 @@
#include includes.h
#include ../libcli/cldap/cldap.h
#include ../lib/tsocket/tsocket.h
+#include ../lib/util/tevent_ntstatus.h
#include libads/cldap.h
+struct cldap_multi_netlogon_state {
+ struct tevent_context *ev;
+ const struct tsocket_address * const *servers;
+ int num_servers;
+ const char *domain;
+ const char *hostname;
+ unsigned ntversion;
+ int min_servers;
+
+ struct cldap_socket **cldap;
+ struct tevent_req **subreqs;
+ int num_sent;
+ int num_received;
+ int num_good_received;
+ struct cldap_netlogon *ios;
+ struct netlogon_samlogon_response **responses;
+};
+
+static void cldap_multi_netlogon_done(struct tevent_req *subreq);
+static void cldap_multi_netlogon_next(struct tevent_req *subreq);
+
+/*
+ * Do a parallel cldap ping to the servers. The first min_servers
+ * are fired directly, the remaining ones in 100msec intervals. If
+ * min_servers responses came in successfully, we immediately reply,
+ * not waiting for the remaining ones.
+ */
+
+struct tevent_req *cldap_multi_netlogon_send(
+ TALLOC_CTX *mem_ctx, struct tevent_context *ev,
+ const struct tsocket_address * const *servers, int num_servers,
+ const char *domain, const char *hostname, unsigned ntversion,
+ int min_servers)
+{
+ struct tevent_req *req, *subreq;
+ struct cldap_multi_netlogon_state *state;
+ int i;
+
+ req = tevent_req_create(mem_ctx, state,
+ struct cldap_multi_netlogon_state);
+ if (req == NULL) {
+ return NULL;
+ }
+ state-ev = ev;
+ state-servers = servers;
+ state-num_servers = num_servers;
+ state-domain = domain;
+ state-hostname = hostname;
+ state-ntversion = ntversion;
+ state-min_servers = min_servers;
+
+ if (min_servers num_servers) {
+ tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+ return tevent_req_post(req, ev);
+ }
+
+ state-subreqs = talloc_zero_array(state,
+ struct tevent_req *,
+ num_servers);
+ if (tevent_req_nomem(state-subreqs, req)) {
+ return tevent_req_post(req, ev);
+ }
+
+ state-cldap = talloc_zero_array(state,
+struct cldap_socket *,
+
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-10-17-1202/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-10-17-1202/samba3.stderr http://git.samba.org/autobuild.flakey/2011-10-17-1202/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-10-17-1202/samba4.stderr http://git.samba.org/autobuild.flakey/2011-10-17-1202/samba4.stdout The top commit at the time of the failure was: commit 2a2dd6ff5e057b1dec37a212b0a5eeb2a8392c36 Author: Volker Lendecke v...@samba.org Date: Wed Oct 12 19:41:45 2011 +0200 s3: Before adding KDC's to the krb5.conf, cldap ping them Some Kerberos libraries don't do proper failover. This fixes the situation where a KDC exists in DNS but is not reachable for some reason. Ported to master by Stefan Metzmacher me...@samba.org Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Mon Oct 17 11:25:37 CEST 2011 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ebcf45b s4:dlz_bind9: add no memory checks
via d9558fd s4:dlz_bind9: Copy dn before changing in b9_has_soa
via c88195f s4:dlz_bind9: add missing earch bases for windows 2000
domains
from 2a2dd6f s3: Before adding KDC's to the krb5.conf, cldap ping them
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ebcf45b5506013b2cbcc706e09f26198c07382d3
Author: Stefan Metzmacher me...@samba.org
Date: Mon Oct 17 12:10:10 2011 +0200
s4:dlz_bind9: add no memory checks
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Mon Oct 17 14:07:25 CEST 2011 on sn-devel-104
commit d9558fdc34a690230cd4927df45f4353bd5cc498
Author: Stefan Gohmann gohm...@univention.de
Date: Thu Oct 13 15:23:58 2011 +0200
s4:dlz_bind9: Copy dn before changing in b9_has_soa
Signed-off-by: Stefan Metzmacher me...@samba.org
commit c88195fbe3a6b201f24ffb1ababdac22dd2c33a3
Author: Stefan Gohmann gohm...@univention.de
Date: Fri Sep 16 15:36:08 2011 +0200
s4:dlz_bind9: add missing earch bases for windows 2000 domains
By default the samba4 dlz_bind9 backend searches under
CN=MicrosoftDNS,DC=DomainDnsZones and CN=MicrosoftDNS,DC=ForestDnsZones.
In my samba4 test setup all DNS zones are under CN=MicrosoftDNS,CN=System.
After adding the attached patch it works fine for me.
Signed-off-by: Stefan Metzmacher me...@samba.org
---
Summary of changes:
source4/dns_server/dlz_bind9.c | 11 ++-
1 files changed, 10 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c
index 4873112..e37a66e 100644
--- a/source4/dns_server/dlz_bind9.c
+++ b/source4/dns_server/dlz_bind9.c
@@ -53,6 +53,7 @@ struct dlz_bind9_data {
static const char *zone_prefixes[] = {
CN=MicrosoftDNS,DC=DomainDnsZones,
CN=MicrosoftDNS,DC=ForestDnsZones,
+ CN=MicrosoftDNS,CN=System,
NULL
};
@@ -1014,10 +1015,18 @@ _PUBLIC_ isc_result_t dlz_configure(dns_view_t *view,
void *dbdata)
for (j=0; jres-count; j++) {
isc_result_t result;
const char *zone =
ldb_msg_find_attr_as_string(res-msgs[j], name, NULL);
+ struct ldb_dn *zone_dn;
+
if (zone == NULL) {
continue;
}
- if (!b9_has_soa(state, dn, zone)) {
+ zone_dn = ldb_dn_copy(tmp_ctx, dn);
+ if (zone_dn == NULL) {
+ talloc_free(tmp_ctx);
+ return ISC_R_NOMEMORY;
+ }
+
+ if (!b9_has_soa(state, zone_dn, zone)) {
continue;
}
result = state-writeable_zone(view, zone);
--
Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-10-17-1647/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-10-17-1647/samba3.stderr http://git.samba.org/autobuild.flakey/2011-10-17-1647/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-10-17-1647/samba4.stderr http://git.samba.org/autobuild.flakey/2011-10-17-1647/samba4.stdout The top commit at the time of the failure was: commit ebcf45b5506013b2cbcc706e09f26198c07382d3 Author: Stefan Metzmacher me...@samba.org Date: Mon Oct 17 12:10:10 2011 +0200 s4:dlz_bind9: add no memory checks metze Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Mon Oct 17 14:07:25 CEST 2011 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b96a9e1 s3-waf: make sure we always build example pdb modules with
--enable-developer.
via bc536d4 s3-passdb: fix the build of example pdb test module.
via 234f06e s3-auth: remove dead prototype.
via 235f78a s3-waf: make sure we always build example auth modules with
--enable-developer.
via 329c4d1 s3-auth: fix the build of skel auth example module.
from ebcf45b s4:dlz_bind9: add no memory checks
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b96a9e1c5b23271f42734a8045e4d95a42e8e33f
Author: Günther Deschner g...@samba.org
Date: Mon Oct 17 16:08:50 2011 +0200
s3-waf: make sure we always build example pdb modules with
--enable-developer.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Mon Oct 17 17:39:36 CEST 2011 on sn-devel-104
commit bc536d4893678eec2a3fbba40fb133a24761992a
Author: Günther Deschner g...@samba.org
Date: Mon Oct 17 16:08:04 2011 +0200
s3-passdb: fix the build of example pdb test module.
Guenther
commit 234f06eae1a05a232ec1d09250badd6706b8beb2
Author: Günther Deschner g...@samba.org
Date: Mon Oct 17 15:56:08 2011 +0200
s3-auth: remove dead prototype.
Guenther
commit 235f78aa955084c87fbc9f3bc9f556a9811a71c4
Author: Günther Deschner g...@samba.org
Date: Mon Oct 17 15:54:17 2011 +0200
s3-waf: make sure we always build example auth modules with
--enable-developer.
Guenther
commit 329c4d12f9a08d9499f9982076bdd9e614fbdd63
Author: Günther Deschner g...@samba.org
Date: Mon Oct 17 15:53:19 2011 +0200
s3-auth: fix the build of skel auth example module.
Guenther
---
Summary of changes:
examples/auth/auth_skel.c | 25 -
examples/auth/wscript_build |9 +
examples/pdb/test.c | 33 +
examples/pdb/wscript_build | 10 ++
source3/auth/proto.h|1 -
source3/wscript |1 +
source3/wscript_build |2 ++
7 files changed, 43 insertions(+), 38 deletions(-)
create mode 100644 examples/auth/wscript_build
create mode 100644 examples/pdb/wscript_build
Changeset truncated at 500 lines:
diff --git a/examples/auth/auth_skel.c b/examples/auth/auth_skel.c
index e6cbd73..4352251 100644
--- a/examples/auth/auth_skel.c
+++ b/examples/auth/auth_skel.c
@@ -19,6 +19,7 @@
*/
#include includes.h
+#include auth.h
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
@@ -26,8 +27,8 @@
static NTSTATUS check_skel_security(const struct auth_context *auth_context,
void *my_private_data,
TALLOC_CTX *mem_ctx,
-const auth_usersupplied_info
*user_info,
-auth_serversupplied_info **server_info)
+const struct auth_usersupplied_info
*user_info,
+struct auth_serversupplied_info
**server_info)
{
if (!user_info || !auth_context) {
return NT_STATUS_LOGON_FAILURE;
@@ -43,12 +44,26 @@ static NTSTATUS check_skel_security(const struct
auth_context *auth_context,
/* module initialisation */
NTSTATUS auth_init_skel(struct auth_context *auth_context, const char *param,
auth_methods **auth_method)
{
- if (!make_auth_methods(auth_context, auth_method)) {
+ struct auth_methods *result;
+
+ result = talloc_zero(auth_context, struct auth_methods);
+ if (result == NULL) {
return NT_STATUS_NO_MEMORY;
}
+ result-name = skel;
+ result-auth = check_skel_security;
+
+ if (param *param) {
+ /* we load the 'fallback' module - if skel isn't here, call this
+ module */
+ auth_methods *priv;
+ if (!load_auth_module(auth_context, param, priv)) {
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+ result-private_data = (void *)priv;
+ }
- (*auth_method)-auth = check_skel_security;
- (*auth_method)-name = skel;
+*auth_method = result;
return NT_STATUS_OK;
}
diff --git a/examples/auth/wscript_build b/examples/auth/wscript_build
new file mode 100644
index 000..91f5302
--- /dev/null
+++ b/examples/auth/wscript_build
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+bld.SAMBA3_MODULE('auth_skel',
+ subsystem='auth',
+ source='auth_skel.c',
+ deps='samba-util',
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_skel'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_skel'))
diff --git
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c3bdcab First part of fix for bug #8419 - Make VFS op streaminfo
stackable.
from b96a9e1 s3-waf: make sure we always build example pdb modules with
--enable-developer.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c3bdcab5161107be8155a7913d9cb325383a781d
Author: Frank Lahm frankl...@googlemail.com
Date: Mon Oct 17 11:10:29 2011 -0700
First part of fix for bug #8419 - Make VFS op streaminfo stackable.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Mon Oct 17 21:39:32 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/lib/filename_util.c |2 +-
source3/smbd/close.c|6 +++---
source3/smbd/filename.c |4 ++--
source3/smbd/nttrans.c |4 ++--
source3/smbd/open.c |6 +++---
source3/smbd/proto.h|6 ++
source3/smbd/trans2.c |5 ++---
source3/smbd/vfs.c | 15 +++
8 files changed, 34 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/filename_util.c b/source3/lib/filename_util.c
index 2405183..85d9fb5 100644
--- a/source3/lib/filename_util.c
+++ b/source3/lib/filename_util.c
@@ -47,7 +47,7 @@ NTSTATUS get_full_smb_filename(TALLOC_CTX *ctx,
/**
* There are actually legitimate callers of this such as functions that
- * enumerate streams using the SMB_VFS_STREAMINFO interface and then want to
+ * enumerate streams using the vfs_streaminfo interface and then want to
* operate on each stream.
*/
NTSTATUS create_synthetic_smb_fname(TALLOC_CTX *ctx, const char *base_name,
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 33e497c..b736432 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -212,8 +212,8 @@ NTSTATUS delete_all_streams(connection_struct *conn, const
char *fname)
TALLOC_CTX *frame = talloc_stackframe();
NTSTATUS status;
- status = SMB_VFS_STREAMINFO(conn, NULL, fname, talloc_tos(),
- num_streams, stream_info);
+ status = vfs_streaminfo(conn, NULL, fname, talloc_tos(),
+ num_streams, stream_info);
if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED)) {
DEBUG(10, (no streams around\n));
@@ -222,7 +222,7 @@ NTSTATUS delete_all_streams(connection_struct *conn, const
char *fname)
}
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(10, (SMB_VFS_STREAMINFO failed: %s\n,
+ DEBUG(10, (vfs_streaminfo failed: %s\n,
nt_errstr(status)));
goto fail;
}
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 7fe7cc8..b7c7831 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -1184,8 +1184,8 @@ static NTSTATUS build_stream_path(TALLOC_CTX *mem_ctx,
}
/* Fall back to a case-insensitive scan of all streams on the file. */
- status = SMB_VFS_STREAMINFO(conn, NULL, smb_fname-base_name, mem_ctx,
- num_streams, streams);
+ status = vfs_streaminfo(conn, NULL, smb_fname-base_name, mem_ctx,
+ num_streams, streams);
if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
SET_STAT_INVALID(smb_fname-st);
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 2d6fa26..8e78d3c 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -702,7 +702,7 @@ void reply_ntcreate_and_X(struct smb_request *req)
if (NT_STATUS_IS_OK(status) num_names) {
file_status = ~NO_EAS;
}
- status = SMB_VFS_STREAMINFO(conn, NULL, smb_fname-base_name,
ctx,
+ status = vfs_streaminfo(conn, NULL, smb_fname-base_name, ctx,
num_streams, streams);
/* There is always one stream, ::$DATA. */
if (NT_STATUS_IS_OK(status) num_streams 1) {
@@ -1283,7 +1283,7 @@ static void call_nt_transact_create(connection_struct
*conn,
if (NT_STATUS_IS_OK(status) num_names) {
file_status = ~NO_EAS;
}
- status = SMB_VFS_STREAMINFO(conn, NULL, smb_fname-base_name,
ctx,
+ status = vfs_streaminfo(conn, NULL, smb_fname-base_name, ctx,
num_streams, streams);
/* There is always one stream, ::$DATA. */
if (NT_STATUS_IS_OK(status) num_streams 1) {
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index b897c8a..f3fccd0 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2972,8 +2972,8 @@ NTSTATUS open_streams_for_delete(connection_struct *conn,
TALLOC_CTX *frame =
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via c52b571 Fix uninitialized memory problem in group_sids_to_info3 (fixes bug #8455). from c3bdcab First part of fix for bug #8419 - Make VFS op streaminfo stackable. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit c52b571506874987ba626c25e9692fbe2251b7e2 Author: Wilco Baan Hofman wi...@baanhofman.nl Date: Mon Oct 17 21:24:41 2011 +0200 Fix uninitialized memory problem in group_sids_to_info3 (fixes bug #8455). Autobuild-User: Jeremy Allison j...@samba.org Autobuild-Date: Mon Oct 17 23:32:58 CEST 2011 on sn-devel-104 --- Summary of changes: source3/auth/server_info.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c index fd21010..5b2706a 100644 --- a/source3/auth/server_info.c +++ b/source3/auth/server_info.c @@ -269,8 +269,8 @@ static NTSTATUS group_sids_to_info3(struct netr_SamInfo3 *info3, if (info3-base.primary_gid == rid) continue; /* store domain group rid */ - groups-rids[i].rid = rid; - groups-rids[i].attributes = attributes; + groups-rids[groups-count].rid = rid; + groups-rids[groups-count].attributes = attributes; groups-count++; continue; } -- Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-10-18-0102/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-10-18-0102/samba3.stderr http://git.samba.org/autobuild.flakey/2011-10-18-0102/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-10-18-0102/samba4.stderr http://git.samba.org/autobuild.flakey/2011-10-18-0102/samba4.stdout The top commit at the time of the failure was: commit c52b571506874987ba626c25e9692fbe2251b7e2 Author: Wilco Baan Hofman wi...@baanhofman.nl Date: Mon Oct 17 21:24:41 2011 +0200 Fix uninitialized memory problem in group_sids_to_info3 (fixes bug #8455). Autobuild-User: Jeremy Allison j...@samba.org Autobuild-Date: Mon Oct 17 23:32:58 CEST 2011 on sn-devel-104
[SCM] CTDB repository - branch master updated - ctdb-1.11-76-gc774e17
The branch, master has been updated via c774e17c78f181833ca688aa48b42e7b90c822d8 (commit) from dd9f82dbe2346c7143b0229e3611c402ee8c4025 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit c774e17c78f181833ca688aa48b42e7b90c822d8 Author: Martin Schwenke mar...@meltin.net Date: Sun Sep 25 14:48:25 2011 +1000 Web - add me as a developer. :-) Signed-off-by: Martin Schwenke mar...@meltin.net --- Summary of changes: web/index.html |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/web/index.html b/web/index.html index 658a71e..d9d03a2 100644 --- a/web/index.html +++ b/web/index.html @@ -134,6 +134,7 @@ projects that want to make their services cluster aware using CTDB. liPeter Somogyi/li lia href=http://sernet.de/Samba/;Volker Lendecke/a/li liStefan Metzmacher/li +lia href=http://meltin.net/people/martin/;Martin Schwenke/a/li /ul !--#include virtual=footer.html -- -- CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.11-77-g02184bd
The branch, master has been updated
via 02184bd5b9ab94cdf2b9ff92e56a509f92f9e4aa (commit)
from c774e17c78f181833ca688aa48b42e7b90c822d8 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 02184bd5b9ab94cdf2b9ff92e56a509f92f9e4aa
Author: Martin Schwenke mar...@meltin.net
Date: Fri Oct 7 14:59:46 2011 +1100
onnode: unset EXTRA_SSH_OPTS when using fakessh
This case was never tested and fakessh obviously won't handle the
extra arguments.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
tools/onnode |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/tools/onnode b/tools/onnode
index 804ab09..4bd8243 100755
--- a/tools/onnode
+++ b/tools/onnode
@@ -339,6 +339,7 @@ $current command=cd $PWD $command
ssh_opts=
if [ -n $CTDB_NODES_SOCKETS ] ; then
SSH=fakessh
+EXTRA_SSH_OPTS=
else
# Could 2/dev/null || true but want to see errors from typos in file.
[ -r ${ctdb_base}/onnode.conf ] . ${ctdb_base}/onnode.conf
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.11-81-g99de5bc
The branch, master has been updated
via 99de5bceb788ba56ebc052c05d29a834ba2496fa (commit)
via 2d6a800a789ca59fdab92422f98a4e05ba55f34c (commit)
via 395ddff90281189ebdab77620b560d233e04 (commit)
via 1f1534435b9d5f464604e28a8cce2cd0a779ef68 (commit)
from 02184bd5b9ab94cdf2b9ff92e56a509f92f9e4aa (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 99de5bceb788ba56ebc052c05d29a834ba2496fa
Merge: 02184bd5b9ab94cdf2b9ff92e56a509f92f9e4aa
2d6a800a789ca59fdab92422f98a4e05ba55f34c
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Oct 18 11:54:55 2011 +1100
Merge remote branch 'martins/tests'
commit 2d6a800a789ca59fdab92422f98a4e05ba55f34c
Author: Martin Schwenke mar...@meltin.net
Date: Fri Sep 2 13:20:50 2011 +1000
Tests - simple integration - do a ctdb sync after restarting the cluster
There looks to be a minor race where IPs haven't yet been reallocated
but the cluster is healthy. This should fix it.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit 395ddff90281189ebdab77620b560d233e04
Author: Martin Schwenke mar...@meltin.net
Date: Thu Sep 15 17:09:36 2011 +1000
Tests - IP allocation - initial unit tests
Signed-off-by: Martin Schwenke mar...@meltin.net
commit 1f1534435b9d5f464604e28a8cce2cd0a779ef68
Author: Martin Schwenke mar...@meltin.net
Date: Thu Sep 15 17:08:18 2011 +1000
Tests - IP allocation - allow more interesting node states to be specified
Node states on the command line are now comma-separated hex numbers,
so all flag states can be expressed.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
tests/scripts/ctdb_test_functions.bash |3 +
tests/src/ctdb_takeover_tests.c | 27 +++--
tests/takeover/common.sh| 70 +
tests/{onnode = takeover}/run_tests.sh |8 +-
tests/takeover/testcases/lcp2.001.sh| 31 ++
tests/takeover/testcases/lcp2.002.sh| 31 ++
tests/takeover/testcases/lcp2.003.sh| 31 ++
tests/takeover/testcases/lcp2.004.sh| 37 +++
tests/takeover/testcases/lcp2.005.sh| 163 +++
tests/takeover/testcases/lcp2.006.sh| 31 ++
tests/takeover/testcases/lcp2.007.sh| 31 ++
tests/takeover/testcases/lcp2.008.sh| 31 ++
tests/takeover/testcases/lcp2.009.sh| 31 ++
tests/takeover/testcases/nondet.001.sh | 29 ++
tests/takeover/testcases/nondet.002.sh | 29 ++
tests/takeover/testcases/nondet.003.sh | 29 ++
16 files changed, 597 insertions(+), 15 deletions(-)
create mode 100644 tests/takeover/common.sh
copy tests/{onnode = takeover}/run_tests.sh (57%)
create mode 100755 tests/takeover/testcases/lcp2.001.sh
create mode 100755 tests/takeover/testcases/lcp2.002.sh
create mode 100755 tests/takeover/testcases/lcp2.003.sh
create mode 100755 tests/takeover/testcases/lcp2.004.sh
create mode 100755 tests/takeover/testcases/lcp2.005.sh
create mode 100755 tests/takeover/testcases/lcp2.006.sh
create mode 100755 tests/takeover/testcases/lcp2.007.sh
create mode 100755 tests/takeover/testcases/lcp2.008.sh
create mode 100755 tests/takeover/testcases/lcp2.009.sh
create mode 100755 tests/takeover/testcases/nondet.001.sh
create mode 100755 tests/takeover/testcases/nondet.002.sh
create mode 100755 tests/takeover/testcases/nondet.003.sh
Changeset truncated at 500 lines:
diff --git a/tests/scripts/ctdb_test_functions.bash
b/tests/scripts/ctdb_test_functions.bash
index 13797dc..670b91e 100644
--- a/tests/scripts/ctdb_test_functions.bash
+++ b/tests/scripts/ctdb_test_functions.bash
@@ -929,6 +929,9 @@ restart_ctdb ()
continue
fi
+ echo Doing a sync...
+ onnode -q 0 $CTDB sync
+
echo ctdb is ready
return 0
done
diff --git a/tests/src/ctdb_takeover_tests.c b/tests/src/ctdb_takeover_tests.c
index 5fd2332..a150018 100644
--- a/tests/src/ctdb_takeover_tests.c
+++ b/tests/src/ctdb_takeover_tests.c
@@ -183,11 +183,23 @@ void ctdb_test_init(const char nodestates[],
struct ctdb_public_ip_list *t;
struct ctdb_all_public_ips *available_public_ips;
int i, numips, numnodes;
-
- numnodes = strlen(nodestates);
+ /* This is test code and this is unreasonably big... :-) */
+ uint32_t nodeflags[256];
+ char *tok, *ns;
*ctdb = talloc_zero(NULL, struct ctdb_context);
+ /* Avoid that const */
+ ns = talloc_strdup(*ctdb, nodestates);
+
+ numnodes = 0;
+ tok = strtok(ns, ,);
+ while (tok != NULL) {
+ nodeflags[numnodes] = (uint32_t) strtol(tok, NULL, 16);
+ numnodes++;
+ tok = strtok(NULL, ,);
+ }
+
/* Fake things up... */
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 75953f1 ldb: fixed a race in ldb initialisation
via 3a4fa65 libsmbclient: initial ABI signatures
via d226acd libsmbclient: add ABI checking and pc file
from c52b571 Fix uninitialized memory problem in group_sids_to_info3
(fixes bug #8455).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 75953f18469fa8746d9d8ad203bcbd0df9dd
Author: Andrew Tridgell tri...@samba.org
Date: Tue Oct 18 11:21:34 2011 +1100
ldb: fixed a race in ldb initialisation
This fixes a race when two processes initialise the same ldb database
at the same time. One of them could fail due to the other creating the
@BASEINFO record first.
Pair-Programmed-With: Andrew Bartlett abart...@samba.org
Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Tue Oct 18 03:54:42 CEST 2011 on sn-devel-104
commit 3a4fa654d5ba42ae78a132f54a7edfa722b367f0
Author: Andrew Tridgell tri...@samba.org
Date: Thu Oct 13 10:03:55 2011 +1100
libsmbclient: initial ABI signatures
commit d226acd97a2aa79cd1710c2b07d00a2ed3c93d6e
Author: Andrew Tridgell tri...@samba.org
Date: Thu Oct 13 10:02:17 2011 +1100
libsmbclient: add ABI checking and pc file
this gives us ABI checking for libsmbclient so that the waf build will
prevent ABI breakage, and a public version number. The addition of the
pc file makes this library available via pkgconfig, including querying
of the version number
Pair-Programmed-With: Andrew Bartlett abart...@samba.org
---
Summary of changes:
lib/ldb/ldb_tdb/ldb_cache.c | 10 ++-
source3/libsmb/ABI/smbclient-0.1.0.sigs | 170 +++
source3/libsmb/smbclient.pc.in | 11 ++
source3/wscript_build |6 +-
4 files changed, 194 insertions(+), 3 deletions(-)
create mode 100644 source3/libsmb/ABI/smbclient-0.1.0.sigs
create mode 100644 source3/libsmb/smbclient.pc.in
Changeset truncated at 500 lines:
diff --git a/lib/ldb/ldb_tdb/ldb_cache.c b/lib/ldb/ldb_tdb/ldb_cache.c
index e54ceaa..0b93021 100644
--- a/lib/ldb/ldb_tdb/ldb_cache.c
+++ b/lib/ldb/ldb_tdb/ldb_cache.c
@@ -308,9 +308,17 @@ int ltdb_cache_load(struct ldb_module *module)
/* possibly initialise the baseinfo */
if (r == LDB_ERR_NO_SUCH_OBJECT) {
- if (ltdb_baseinfo_init(module) != LDB_SUCCESS) {
+
+ if (tdb_transaction_start(ltdb-tdb) != 0) {
goto failed;
}
+
+ /* error handling for ltdb_baseinfo_init() is by
+ looking for the record again. */
+ ltdb_baseinfo_init(module);
+
+ tdb_transaction_commit(ltdb-tdb);
+
if (ltdb_search_dn1(module, baseinfo_dn, baseinfo) !=
LDB_SUCCESS) {
goto failed;
}
diff --git a/source3/libsmb/ABI/smbclient-0.1.0.sigs
b/source3/libsmb/ABI/smbclient-0.1.0.sigs
new file mode 100644
index 000..bbd7700
--- /dev/null
+++ b/source3/libsmb/ABI/smbclient-0.1.0.sigs
@@ -0,0 +1,170 @@
+smbc_chmod: int (const char *, mode_t)
+smbc_close: int (int)
+smbc_closedir: int (int)
+smbc_creat: int (const char *, mode_t)
+smbc_fgetxattr: int (int, const char *, const void *, size_t)
+smbc_flistxattr: int (int, char *, size_t)
+smbc_free_context: int (SMBCCTX *, int)
+smbc_fremovexattr: int (int, const char *)
+smbc_fsetxattr: int (int, const char *, const void *, size_t, int)
+smbc_fstat: int (int, struct stat *)
+smbc_fstatvfs: int (int, struct statvfs *)
+smbc_ftruncate: int (int, off_t)
+smbc_getDebug: int (SMBCCTX *)
+smbc_getFunctionAddCachedServer: smbc_add_cached_srv_fn (SMBCCTX *)
+smbc_getFunctionAuthData: smbc_get_auth_data_fn (SMBCCTX *)
+smbc_getFunctionAuthDataWithContext: smbc_get_auth_data_with_context_fn
(SMBCCTX *)
+smbc_getFunctionCheckServer: smbc_check_server_fn (SMBCCTX *)
+smbc_getFunctionChmod: smbc_chmod_fn (SMBCCTX *)
+smbc_getFunctionClose: smbc_close_fn (SMBCCTX *)
+smbc_getFunctionClosedir: smbc_closedir_fn (SMBCCTX *)
+smbc_getFunctionCreat: smbc_creat_fn (SMBCCTX *)
+smbc_getFunctionFstat: smbc_fstat_fn (SMBCCTX *)
+smbc_getFunctionFstatVFS: smbc_fstatvfs_fn (SMBCCTX *)
+smbc_getFunctionFstatdir: smbc_fstatdir_fn (SMBCCTX *)
+smbc_getFunctionFtruncate: smbc_ftruncate_fn (SMBCCTX *)
+smbc_getFunctionGetCachedServer: smbc_get_cached_srv_fn (SMBCCTX *)
+smbc_getFunctionGetdents: smbc_getdents_fn (SMBCCTX *)
+smbc_getFunctionGetxattr: smbc_getxattr_fn (SMBCCTX *)
+smbc_getFunctionListPrintJobs: smbc_list_print_jobs_fn (SMBCCTX *)
+smbc_getFunctionListxattr: smbc_listxattr_fn (SMBCCTX *)
+smbc_getFunctionLseek: smbc_lseek_fn (SMBCCTX *)
+smbc_getFunctionLseekdir: smbc_lseekdir_fn (SMBCCTX *)
+smbc_getFunctionMkdir: smbc_mkdir_fn (SMBCCTX *)
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 5954a37 lib/param: Remove parameters for wins and spoolss databases via 9d49945 ldb: Output more error information when a connect fails via 94fbe2e s3:auth_util: add the uid with WBC_ID_TYPE_BOTH also to the group array via 9068a30 s3-auth: use typedefs in auth.h via e7d5f0a gensec: move event context from gensec_*_init() to gensec_update() via 0f2b27e s3-auth fix comment after s3 ntlmssp gensec module via f88b686 gensec: move event-using code to gensec_update() hooks out of gensec_start*() via 3f9ab2e ntlmssp: Refuse to seal if we did not negotiate to sign via 86d684e gensec: Refuse to seal if we did not negotiate to sign via 09c5acd s4-auth: match the new s3 gensec client and always negotiate SIGN with SEAL via 0d5de7e gensec: Assert that we have not been subject to a downgrade attack in DCE/RPC clients via 5ef4e91 s3-smbd Give the nt error string when failing to set up encrypted transport via 5392491 s3-ntlmssp Implement the server-side auth_ntlmssp code as a GENSEC module via c779647 gensec: an event context is no longer mandetory via 02eef4d ntlmssp: Put members from auth_ntlmssp_state into gensec_ntlmssp_state via 968b367 ntlmssp: Prepare gensec_ntlmssp_start() for broader use via 0c6e4ad ntlmssp: Move ntlmssp code to auth/ntlmssp via 5e6543a build: compile gensec_start.c and credentials.c in the autoconf build via 5f11615 s4-s3-upgrade: Give a better clue when we cannot open secrets.tdb via d4d4f4e s3-auth Add my copyright via 734e5c5 credentials: Prioritise command-line specified options above defaults from smb.conf via f8c6219 s4-selftest When testing for a credentials cache, do not specify a domain via 4c20276 Revert s4: Mark the winsreplication test as knownfail via fe98fa6 Revert s4:selftest: skip flakey samba4.nbt.winsreplication for now from 75953f1 ldb: fixed a race in ldb initialisation http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 5954a37997a786a8808ee2544b594a0c90f1c893 Author: Andrew Bartlett abart...@samba.org Date: Tue Oct 18 11:33:33 2011 +1100 lib/param: Remove parameters for wins and spoolss databases This removes the smb.conf parameters per-database, replacing these with hard-coded database names in well known (and configurable) directories. The wins.ldb is now always in the state dir, rather than being in both state and lock dir (ie, a bug). Less smb.conf parameters means less parameters to try and sync up between the loadparm subsystems. Andrew Bartlett Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Tue Oct 18 05:39:54 CEST 2011 on sn-devel-104 commit 9d49945ff037e46f5083dc88816acafc2343a77c Author: Andrew Bartlett abart...@samba.org Date: Tue Oct 18 11:30:52 2011 +1100 ldb: Output more error information when a connect fails commit 94fbe2e4bdab8bcd021fedfff71114bbf3d72ca1 Author: Stefan Metzmacher me...@samba.org Date: Wed Oct 12 20:52:09 2011 +0200 s3:auth_util: add the uid with WBC_ID_TYPE_BOTH also to the group array This will help with having sidHistory support in future. metze commit 9068a3080b6d8980f46cc141fdf76b832d38ecf7 Author: Andrew Bartlett abart...@samba.org Date: Mon Oct 17 15:56:44 2011 +1100 s3-auth: use typedefs in auth.h Signed-off-by: Stefan Metzmacher me...@samba.org commit e7d5f0a357c42593a015b80390dedf920117a7e2 Author: Andrew Bartlett abart...@samba.org Date: Mon Oct 17 09:22:33 2011 +0200 gensec: move event context from gensec_*_init() to gensec_update() This avoids keeping the event context around on a the gensec_security context structure long term. In the Samba3 server, the event context we either supply is a NULL pointer as no server-side modules currently use the event context. Andrew Bartlett Signed-off-by: Stefan Metzmacher me...@samba.org commit 0f2b27e7d428e75b8e6079ee5f36a0cccd4d1785 Author: Andrew Bartlett abart...@samba.org Date: Mon Oct 17 14:00:39 2011 +1100 s3-auth fix comment after s3 ntlmssp gensec module Signed-off-by: Stefan Metzmacher me...@samba.org commit f88b686167d3cc0c8e2c6d00f12da4b0fccc767d Author: Andrew Bartlett abart...@samba.org Date: Mon Oct 17 13:46:57 2011 +1100 gensec: move event-using code to gensec_update() hooks out of gensec_start*() This ensures that only gensec_update() will require an event context argument when the API is refactored. Andrew Bartlett commit 3f9ab2e8e7437ad2775ecd7b87c20804089b58cb Author: Andrew Bartlett abart...@samba.org Date: Sat Oct 15 14:56:11 2011 +1100 ntlmssp: Refuse to seal if we did not negotiate to
