[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 92c022f tdb2: allow readonly changes even while holding locks.
from da5224a s3:dbwrap_ctdb: skip the internal __db_sequence_number__
key from (persistent) traverse and traverse_read
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 92c022f04392e731ee1e5389ed021b54317da141
Author: Rusty Russell ru...@rustcorp.com.au
Date: Tue Sep 20 12:02:43 2011 +0930
tdb2: allow readonly changes even while holding locks.
This happens in SAMBA with the TDB_VERSION1, presumably due to a
read-only traverse nested inside a normal traverse (since it doesn't
occur without TDB_VERSION1).
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
(Imported from CCAN commit 24e5ddb143fb5e79112649472258f5da67cc7362)
Autobuild-User: Rusty Russell ru...@rustcorp.com.au
Autobuild-Date: Tue Sep 20 09:35:10 CEST 2011 on sn-devel-104
---
Summary of changes:
lib/tdb2/tdb.c | 10 --
1 files changed, 0 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb2/tdb.c b/lib/tdb2/tdb.c
index 9447816..6f38244 100644
--- a/lib/tdb2/tdb.c
+++ b/lib/tdb2/tdb.c
@@ -369,16 +369,6 @@ static bool readonly_changable(struct tdb_context *tdb,
const char *caller)
caller);
return false;
}
-
- if (tdb-file-allrecord_lock.count != 0
- || tdb-file-num_lockrecs != 0) {
- tdb-last_error = tdb_logerr(tdb, TDB_ERR_EINVAL,
-TDB_LOG_USE_ERROR,
-%s: can't change
- TDB_RDONLY holding locks,
-caller);
- return false;
- }
return true;
}
--
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-09-20-1247/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-09-20-1247/samba3.stderr http://git.samba.org/autobuild.flakey/2011-09-20-1247/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-09-20-1247/samba4.stderr http://git.samba.org/autobuild.flakey/2011-09-20-1247/samba4.stdout The top commit at the time of the failure was: commit 92c022f04392e731ee1e5389ed021b54317da141 Author: Rusty Russell ru...@rustcorp.com.au Date: Tue Sep 20 12:02:43 2011 +0930 tdb2: allow readonly changes even while holding locks. This happens in SAMBA with the TDB_VERSION1, presumably due to a read-only traverse nested inside a normal traverse (since it doesn't occur without TDB_VERSION1). Signed-off-by: Rusty Russell ru...@rustcorp.com.au Signed-off-by: Rusty Russell ru...@rustcorp.com.au (Imported from CCAN commit 24e5ddb143fb5e79112649472258f5da67cc7362) Autobuild-User: Rusty Russell ru...@rustcorp.com.au Autobuild-Date: Tue Sep 20 09:35:10 CEST 2011 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0167b04 s4-drs: allow replication of the GC partial attribute set
from 92c022f tdb2: allow readonly changes even while holding locks.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0167b0447fa679ceaf322633e3170f43fde4b740
Author: Andrew Tridgell tri...@samba.org
Date: Tue Sep 20 15:15:36 2011 +1000
s4-drs: allow replication of the GC partial attribute set
when a DC has the GUID_DRS_GET_FILTERED_ATTRIBUTES right on a NC, we
need to allow it to replicate if all the attributes it is asking for
are in the GC partial attribute set
Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Tue Sep 20 13:47:38 CEST 2011 on sn-devel-104
---
Summary of changes:
source4/rpc_server/drsuapi/getncchanges.c | 100 +++--
1 files changed, 95 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/rpc_server/drsuapi/getncchanges.c
b/source4/rpc_server/drsuapi/getncchanges.c
index ca24b3d..61a6002 100644
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -1162,20 +1162,90 @@ static WERROR
dcesrv_drsuapi_is_reveal_secrets_request(struct drsuapi_bind_state
}
}
+ if (req10-partial_attribute_set_ex) {
+ /* check the extended attributes they asked for */
+ for (i=0; ireq10-partial_attribute_set_ex-num_attids; i++) {
+ const struct dsdb_attribute *sa;
+ sa = dsdb_attribute_by_attributeID_id(schema,
req10-partial_attribute_set_ex-attids[i]);
+ if (sa == NULL) {
+ return WERR_DS_DRA_SCHEMA_MISMATCH;
+ }
+ if (!dsdb_attr_in_rodc_fas(sa)) {
+ *is_secret_request = true;
+ return WERR_OK;
+ }
+ }
+ }
+
+ *is_secret_request = false;
+ return WERR_OK;
+}
+
+/*
+ see if this getncchanges request is only for attributes in the GC
+ partial attribute set
+ */
+static WERROR dcesrv_drsuapi_is_gc_pas_request(struct drsuapi_bind_state
*b_state,
+ struct
drsuapi_DsGetNCChangesRequest10 *req10,
+ bool *is_gc_pas_request)
+{
+ enum drsuapi_DsExtendedOperation exop;
+ uint32_t i;
+ struct dsdb_schema *schema;
+
+ exop = req10-extended_op;
+
+ switch (exop) {
+ case DRSUAPI_EXOP_FSMO_REQ_ROLE:
+ case DRSUAPI_EXOP_FSMO_RID_ALLOC:
+ case DRSUAPI_EXOP_FSMO_RID_REQ_ROLE:
+ case DRSUAPI_EXOP_FSMO_REQ_PDC:
+ case DRSUAPI_EXOP_FSMO_ABANDON_ROLE:
+ case DRSUAPI_EXOP_REPL_SECRET:
+ *is_gc_pas_request = false;
+ return WERR_OK;
+ case DRSUAPI_EXOP_REPL_OBJ:
+ case DRSUAPI_EXOP_NONE:
+ break;
+ }
+
+ if (req10-partial_attribute_set == NULL) {
+ /* they want it all */
+ *is_gc_pas_request = false;
+ return WERR_OK;
+ }
+
+ schema = dsdb_get_schema(b_state-sam_ctx, NULL);
+
/* check the attributes they asked for */
- for (i=0; ireq10-partial_attribute_set_ex-num_attids; i++) {
+ for (i=0; ireq10-partial_attribute_set-num_attids; i++) {
const struct dsdb_attribute *sa;
- sa = dsdb_attribute_by_attributeID_id(schema,
req10-partial_attribute_set_ex-attids[i]);
+ sa = dsdb_attribute_by_attributeID_id(schema,
req10-partial_attribute_set-attids[i]);
if (sa == NULL) {
return WERR_DS_DRA_SCHEMA_MISMATCH;
}
- if (!dsdb_attr_in_rodc_fas(sa)) {
- *is_secret_request = true;
+ if (!sa-isMemberOfPartialAttributeSet) {
+ *is_gc_pas_request = false;
return WERR_OK;
}
}
- *is_secret_request = false;
+ if (req10-partial_attribute_set_ex) {
+ /* check the extended attributes they asked for */
+ for (i=0; ireq10-partial_attribute_set_ex-num_attids; i++) {
+ const struct dsdb_attribute *sa;
+ sa = dsdb_attribute_by_attributeID_id(schema,
req10-partial_attribute_set_ex-attids[i]);
+ if (sa == NULL) {
+ return WERR_DS_DRA_SCHEMA_MISMATCH;
+ }
+ if (!sa-isMemberOfPartialAttributeSet) {
+ *is_gc_pas_request = false;
+ return WERR_OK;
+ }
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8dda773 s3-docs: document -k switch in net manpage. from 0167b04 s4-drs: allow replication of the GC partial attribute set http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8dda773bd7eea1d163282b1f3c5e90cbff8a1003 Author: Günther Deschner g...@samba.org Date: Tue Sep 20 14:13:36 2011 +0200 s3-docs: document -k switch in net manpage. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Tue Sep 20 15:47:00 CEST 2011 on sn-devel-104 --- Summary of changes: docs-xml/manpages-3/net.8.xml |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml index 6e6b7e3..754fd43 100644 --- a/docs-xml/manpages-3/net.8.xml +++ b/docs-xml/manpages-3/net.8.xml @@ -61,6 +61,7 @@ variablelist stdarg.help; + stdarg.kerberos; varlistentry term-w target-workgroup/term -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 02a08d5 s4:ntvfs common - remove two outdated function prototypes
via 7c44039 s4:ntvfs common - add UTIL_TDB and tdb-wrap as internal
build dependency
via 5347074 s4:param/pyparam.c - suppress P_SEP compilation warning
from 8dda773 s3-docs: document -k switch in net manpage.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 02a08d5cd5f2a57e51fffd2a10b6ee8f797df9e0
Author: Matthias Dieter Wallnöfer m...@samba.org
Date: Tue Sep 20 18:38:54 2011 +0200
s4:ntvfs common - remove two outdated function prototypes
The two functions don't exist anymore.
Reviewed-by: Jelmer
Autobuild-User: Matthias Dieter Wallnöfer m...@samba.org
Autobuild-Date: Tue Sep 20 20:16:29 CEST 2011 on sn-devel-104
commit 7c44039f483802c04611abaf11e0b421716e632b
Author: Matthias Dieter Wallnöfer m...@samba.org
Date: Tue Sep 20 15:04:54 2011 +0200
s4:ntvfs common - add UTIL_TDB and tdb-wrap as internal build dependency
These modules are required for both header and source code files (see
bug #8468).
Reviewed-by: Jelmer
commit 5347074c4e458e077e2833170e2b122494037552
Author: Matthias Dieter Wallnöfer m...@samba.org
Date: Tue Sep 20 14:32:52 2011 +0200
s4:param/pyparam.c - suppress P_SEP compilation warning
Reviewed-by: Jelmer
---
Summary of changes:
source4/ntvfs/common/brlock.h |3 ---
source4/ntvfs/common/opendb.h |1 -
source4/ntvfs/common/wscript_build |1 +
source4/param/pyparam.c|4 ++--
4 files changed, 3 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/ntvfs/common/brlock.h b/source4/ntvfs/common/brlock.h
index 703538f..650136b 100644
--- a/source4/ntvfs/common/brlock.h
+++ b/source4/ntvfs/common/brlock.h
@@ -51,8 +51,5 @@ struct brlock_ops {
int *count);
};
-
void brlock_set_ops(const struct brlock_ops *new_ops);
void brl_tdb_init_ops(void);
-void brl_ctdb_init_ops(void);
-
diff --git a/source4/ntvfs/common/opendb.h b/source4/ntvfs/common/opendb.h
index 446df17..1bfc6aa 100644
--- a/source4/ntvfs/common/opendb.h
+++ b/source4/ntvfs/common/opendb.h
@@ -57,4 +57,3 @@ struct opendb_oplock_break {
void odb_set_ops(const struct opendb_ops *new_ops);
void odb_tdb_init_ops(void);
-void odb_ctdb_init_ops(void);
diff --git a/source4/ntvfs/common/wscript_build
b/source4/ntvfs/common/wscript_build
index 4977b70..b16f8fa 100644
--- a/source4/ntvfs/common/wscript_build
+++ b/source4/ntvfs/common/wscript_build
@@ -3,6 +3,7 @@
bld.SAMBA_SUBSYSTEM('ntvfs_common',
source='init.c brlock.c brlock_tdb.c opendb.c opendb_tdb.c notify.c',
autoproto='proto.h',
+ deps='UTIL_TDB tdb-wrap',
public_deps='NDR_OPENDB NDR_NOTIFY sys_notify sys_lease share'
)
diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c
index 663ed84..d5049d7 100644
--- a/source4/param/pyparam.c
+++ b/source4/param/pyparam.c
@@ -143,8 +143,8 @@ static PyObject *py_lp_ctx_get_helper(struct
loadparm_context *lp_ctx, const cha
PyString_FromString(strlist[j]));
return pylist;
}
-
- break;
+case P_SEP:
+ return NULL; /* this stands for a separator, can be ignored */
}
return NULL;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9881712 s3: Further fix for bug 8338
via 37b9753 Fix some typos
via cb2fe8b s3: Fix typos
from 02a08d5 s4:ntvfs common - remove two outdated function prototypes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9881712a09b2579047dcca6c22f9e919029455d4
Author: Volker Lendecke v...@samba.org
Date: Tue Sep 20 22:45:52 2011 +0200
s3: Further fix for bug 8338
OS/X can not deal with a 10-vwv read on normal files.
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Wed Sep 21 00:51:08 CEST 2011 on sn-devel-104
commit 37b9753096f20087bf3bf9f8454b99302eebdfd2
Author: Volker Lendecke v...@samba.org
Date: Mon Sep 19 01:41:27 2011 +0200
Fix some typos
commit cb2fe8bafc738acdec35d4061a94c9767847e9ae
Author: Volker Lendecke v...@samba.org
Date: Mon Sep 19 00:02:55 2011 +0200
s3: Fix typos
---
Summary of changes:
docs-xml/smbdotconf/misc/rpcserver.xml | 11 ---
source3/libsmb/clireadwrite.c | 11 +--
2 files changed, 13 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/misc/rpcserver.xml
b/docs-xml/smbdotconf/misc/rpcserver.xml
index 6984668..fcc63fe 100644
--- a/docs-xml/smbdotconf/misc/rpcserver.xml
+++ b/docs-xml/smbdotconf/misc/rpcserver.xml
@@ -15,7 +15,7 @@
para
This option can be set for each available rpc service in Samba.
The following list shows all available pipe names services you
- can modify with this options.
+ can modify with this option.
/para
itemizedlist
@@ -50,19 +50,16 @@
para
Choosing the emphasisexternal/emphasis option allows to run
- separate daemon or even a completely independent (3rd party)
+ a separate daemon or even a completely independent (3rd party)
server capable of interfacing with samba via the MS-RPC
interface over named pipes.
/para
para
- Currently in Samba3 we support thre daemons, spoolssd, epmd and
+ Currently in Samba3 we support three daemons, spoolssd, epmd and
lsasd. These daemons can be enabled using the
emphasisrpc_daemon/emphasis option. For spoolssd you have
- to to enable the deamon and proxy the named pipe with:
- Currently in Samba3 we support thre daemons, spoolssd, epmd and
- lsasd. These daemons can be enabled using the
- emphasisrpc_daemon/emphasis option.
+ to to enable the daemon and proxy the named pipe with:
/para
para
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 1ee2196..e8c9017 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -155,10 +155,17 @@ struct tevent_req *cli_read_andx_create(TALLOC_CTX
*mem_ctx,
SSVAL(state-vwv + 8, 0, 0);
SSVAL(state-vwv + 9, 0, 0);
- if ((uint64_t)offset 32) {
+ if (cli_state_capabilities(cli) CAP_LARGE_FILES) {
SIVAL(state-vwv + 10, 0,
(((uint64_t)offset)32) 0x);
- wct += 2;
+ wct = 12;
+ } else {
+ if uint64_t)offset) 0xLL) != 0) {
+ DEBUG(10, (cli_read_andx_send got large offset where
+ the server does not support it\n));
+ tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+ return tevent_req_post(req, ev);
+ }
}
subreq = cli_smb_req_create(state, ev, cli, SMBreadX, 0, wct,
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.11-63-g3d37be3
The branch, master has been updated
via 3d37be3e2bfb61ede824028aeebaa18ba304faae (commit)
from 8a86ac72088ad9f64ca83218c704f84c9abe00b6 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 3d37be3e2bfb61ede824028aeebaa18ba304faae
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Wed Sep 21 11:42:19 2011 +1000
when checking that the interfaces exist in ctdb_add_public_address()
cant talloc off vnn since it is not yet initialized and might not always be
NULL
---
Summary of changes:
server/ctdb_takeover.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 4114b40..29f7acd 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -880,15 +880,15 @@ static int ctdb_add_public_address(struct ctdb_context
*ctdb,
int i;
int ret;
- tmp = talloc_strdup(vnn, ifaces);
+ tmp = strdup(ifaces);
for (iface = strtok(tmp, ,); iface; iface = strtok(NULL, ,)) {
if (!ctdb_sys_check_iface_exists(iface)) {
DEBUG(DEBUG_CRIT,(Interface %s does not exist. Can not
add public-address : %s\n, iface, ctdb_addr_to_str(addr)));
- talloc_free(tmp);
+ free(tmp);
return -1;
}
}
- talloc_free(tmp);
+ free(tmp);
/* Verify that we dont have an entry for this ip yet */
for (vnn=ctdb-vnn;vnn;vnn=vnn-next) {
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ad3ac7e Try and fix bug #8472 - Crash in asn.1 parsing code.
from 9881712 s3: Further fix for bug 8338
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ad3ac7e3c0bdf9b93c6b831f29452fd63fe0818b
Author: Jeremy Allison j...@samba.org
Date: Tue Sep 20 18:50:00 2011 -0700
Try and fix bug #8472 - Crash in asn.1 parsing code.
Found by Codenomicon at the SNIA plugfest. Don't keep going
in the loop when reading the OIDs fail.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Wed Sep 21 05:24:59 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/libsmb/clispnego.c |7 ++-
1 files changed, 6 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c
index 4581ce4..d584f9f 100644
--- a/source3/libsmb/clispnego.c
+++ b/source3/libsmb/clispnego.c
@@ -126,7 +126,12 @@ bool spnego_parse_negTokenInit(TALLOC_CTX *ctx,
asn1_start_tag(data,ASN1_CONTEXT(0));
asn1_start_tag(data,ASN1_SEQUENCE(0));
for (i=0; asn1_tag_remaining(data) 0 i ASN1_MAX_OIDS-1; i++) {
- asn1_read_OID(data,ctx, OIDs[i]);
+ if (!asn1_read_OID(data,ctx, OIDs[i])) {
+ break;
+ }
+ if (data-has_error) {
+ break;
+ }
}
OIDs[i] = NULL;
asn1_end_tag(data);
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.11-64-gb963f5e
The branch, master has been updated via b963f5e40b1e73a60363568da88557cad9e58a28 (commit) from 3d37be3e2bfb61ede824028aeebaa18ba304faae (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit b963f5e40b1e73a60363568da88557cad9e58a28 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Wed Sep 21 15:41:28 2011 +1000 Change the 'This Node' column of the machinereadable output for 'ctdb status -Y' to Y/N instead of 1/0 1/0 is unsuitable since it can be useful to check 'if a column is 1 there is something wrong with that node' --- Summary of changes: tools/ctdb.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/tools/ctdb.c b/tools/ctdb.c index fc281e4..876521a 100644 --- a/tools/ctdb.c +++ b/tools/ctdb.c @@ -651,7 +651,7 @@ static int control_status(struct ctdb_context *ctdb, int argc, const char **argv talloc_free(ifaces); } } - printf(:%d:%s:%d:%d:%d:%d:%d:%d:%d:%d:\n, nodemap-nodes[i].pnn, + printf(:%d:%s:%d:%d:%d:%d:%d:%d:%d:%c:\n, nodemap-nodes[i].pnn, ctdb_addr_to_str(nodemap-nodes[i].addr), !!(nodemap-nodes[i].flagsNODE_FLAGS_DISCONNECTED), !!(nodemap-nodes[i].flagsNODE_FLAGS_BANNED), @@ -660,7 +660,7 @@ static int control_status(struct ctdb_context *ctdb, int argc, const char **argv !!(nodemap-nodes[i].flagsNODE_FLAGS_STOPPED), !!(nodemap-nodes[i].flagsNODE_FLAGS_INACTIVE), partially_online, - (nodemap-nodes[i].pnn == mypnn)); + (nodemap-nodes[i].pnn == mypnn)?'Y':'N'); } return 0; } -- CTDB repository
