[SCM] CTDB repository - branch master updated - ba1f6c310d41c97fdef60ddbad60aece869cabc2
The branch, master has been updated via ba1f6c310d41c97fdef60ddbad60aece869cabc2 (commit) from 2eedaa8f4fd4afc0564387a93cd0f9186ae7d0a1 (commit) http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=master - Log - commit ba1f6c310d41c97fdef60ddbad60aece869cabc2 Author: Andrew Tridgell Date: Tue May 5 16:52:24 2009 +1000 more subdir html support --- Summary of changes: web/header.html |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/web/header.html b/web/header.html index c78d2ee..a356b08 100644 --- a/web/header.html +++ b/web/header.html @@ -18,7 +18,7 @@ - + -- CTDB repository
[SCM] CTDB repository - branch master updated - 2eedaa8f4fd4afc0564387a93cd0f9186ae7d0a1
The branch, master has been updated via 2eedaa8f4fd4afc0564387a93cd0f9186ae7d0a1 (commit) from 08e6c100971e1d72edd050f7f502145363f3c1ab (commit) http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=master - Log - commit 2eedaa8f4fd4afc0564387a93cd0f9186ae7d0a1 Author: Andrew Tridgell Date: Tue May 5 16:49:05 2009 +1000 allow pages in subdirs --- Summary of changes: web/footer.html |2 +- web/header.html | 14 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/web/footer.html b/web/footer.html index a66b5c9..a9758e8 100644 --- a/web/footer.html +++ b/web/footer.html @@ -2,7 +2,7 @@ - + http://www.google.com/custom";> diff --git a/web/header.html b/web/header.html index e2b904f..c78d2ee 100644 --- a/web/header.html +++ b/web/header.html @@ -11,10 +11,10 @@ - home - documentation - configuring - building + home + documentation + configuring + building @@ -22,8 +22,8 @@ - download - testing + download + testing http://wiki.samba.org/index.php/CTDB_Setup";>wiki http://bugzilla.samba.org/";>bug-tracking @@ -32,7 +32,7 @@ - -- CTDB repository
[SCM] CTDB repository - branch 1.0.69 updated - ctdb-1.0.69-21-g9a00035
The branch, 1.0.69 has been updated
via 9a00035c9c815736d0a5909dfc4de7f4c3ac41d4 (commit)
via 8ae93da7f6341f1cddb15786df67644f29648b9b (commit)
via b06d4c6ee7da97aaa810aa4c95952b6505cf720f (commit)
from d26d522fd0a1df7f06be056e7458ed5349a00658 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.0.69
- Log -
commit 9a00035c9c815736d0a5909dfc4de7f4c3ac41d4
Author: root
Date: Tue May 5 16:33:21 2009 +1000
change the talloc hierarchy for the main transaction_start context and the
individual transaction_all handles
commit 8ae93da7f6341f1cddb15786df67644f29648b9b
Author: Andrew Tridgell
Date: Tue May 5 12:17:21 2009 +1000
fixed an error with newer autotools versions
commit b06d4c6ee7da97aaa810aa4c95952b6505cf720f
Author: Andrew Tridgell
Date: Tue May 5 12:17:07 2009 +1000
fixed a problem with clients disconnecting during a traverse
When a client (such as smbstatus) is killed, it may have outstanding
traverse children on remote nodes. We need to catch the client
disconnect in ctdbd and send a control to all nodes telling them to
kill those outstanding traverse children.
---
Summary of changes:
include/ctdb_private.h |6 ++-
lib/replace/autoconf-2.60.m4 |2 +
server/ctdb_control.c|6 ++-
server/ctdb_traverse.c | 135 -
4 files changed, 117 insertions(+), 32 deletions(-)
Changeset truncated at 500 lines:
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 5121cd9..e14a272 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -439,6 +439,7 @@ struct ctdb_db_context {
struct ctdb_registered_call *calls; /* list of registered calls */
uint32_t seqnum;
struct timed_event *te;
+ struct ctdb_traverse_local_handle *traverse;
};
@@ -564,6 +565,7 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS =
0,
CTDB_CONTROL_TAKEOVER_IP = 89,
CTDB_CONTROL_GET_PUBLIC_IPS = 90,
CTDB_CONTROL_GET_NODEMAP = 91,
+ CTDB_CONTROL_TRAVERSE_KILL = 92,
};
/*
@@ -1131,9 +1133,11 @@ struct ctdb_client_call_state {
int32_t ctdb_control_traverse_start(struct ctdb_context *ctdb, TDB_DATA
indata,
- TDB_DATA *outdata, uint32_t srcnode);
+ TDB_DATA *outdata, uint32_t srcnode,
uint32_t client_id);
int32_t ctdb_control_traverse_all(struct ctdb_context *ctdb, TDB_DATA data,
TDB_DATA *outdata);
int32_t ctdb_control_traverse_data(struct ctdb_context *ctdb, TDB_DATA data,
TDB_DATA *outdata);
+int32_t ctdb_control_traverse_kill(struct ctdb_context *ctdb, TDB_DATA indata,
+ TDB_DATA *outdata, uint32_t srcnode);
int ctdb_dispatch_message(struct ctdb_context *ctdb, uint64_t srvid, TDB_DATA
data);
diff --git a/lib/replace/autoconf-2.60.m4 b/lib/replace/autoconf-2.60.m4
index acdcd38..2d5dbc1 100644
--- a/lib/replace/autoconf-2.60.m4
+++ b/lib/replace/autoconf-2.60.m4
@@ -179,6 +179,7 @@ AC_DEFUN([AC_PROG_CC_C99],
#
# Enable extensions on systems that normally disable them,
# typically due to standards-conformance issues.
+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
[
AC_BEFORE([$0], [AC_COMPILE_IFELSE])
@@ -208,3 +209,4 @@ AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
AC_DEFINE([__EXTENSIONS__])
AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
])
+])
diff --git a/server/ctdb_control.c b/server/ctdb_control.c
index 15f5000..73d5d46 100644
--- a/server/ctdb_control.c
+++ b/server/ctdb_control.c
@@ -217,7 +217,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context
*ctdb,
case CTDB_CONTROL_TRAVERSE_START:
CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_traverse_start));
- return ctdb_control_traverse_start(ctdb, indata, outdata,
srcnode);
+ return ctdb_control_traverse_start(ctdb, indata, outdata,
srcnode, client_id);
case CTDB_CONTROL_TRAVERSE_ALL:
return ctdb_control_traverse_all(ctdb, indata, outdata);
@@ -225,6 +225,10 @@ static int32_t ctdb_control_dispatch(struct ctdb_context
*ctdb,
case CTDB_CONTROL_TRAVERSE_DATA:
return ctdb_control_traverse_data(ctdb, indata, outdata);
+ case CTDB_CONTROL_TRAVERSE_KILL:
+ CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_traverse_start));
+ return ctdb_control_traverse_kill(ctdb, indata, outdata,
srcnode);
+
case CTDB_CONTROL_REGISTER_SRVID:
return daemon_register_message_handler(ctdb, client_id, srvid);
diff --git a/server/ctdb_traverse.c b/server/ctdb_traverse.c
index 35ae318..dbb4b4f 1
[SCM] CTDB repository - branch master updated - 08e6c100971e1d72edd050f7f502145363f3c1ab
The branch, master has been updated
via 08e6c100971e1d72edd050f7f502145363f3c1ab (commit)
via 8ae93da7f6341f1cddb15786df67644f29648b9b (commit)
via b06d4c6ee7da97aaa810aa4c95952b6505cf720f (commit)
via d26d522fd0a1df7f06be056e7458ed5349a00658 (commit)
via d02c0e9371981bc6830f792d65e9f08832656cf0 (commit)
via 87e674f93728fb20209b6473f07ca323530ddbdc (commit)
via 478f43bc3c970edc7c8db3e34095774261a48056 (commit)
via a63c79318678abe99d2a36fe4465e63eafc008b7 (commit)
via 8628402d4cad4b9ef580151b85e36b6a5909e56c (commit)
via c61c4f7a7628232e9094d463275ba6abf7b79941 (commit)
via 460e6b2402fc9bca9e9835e3a203278ac0bcaf8f (commit)
via fb582515c674b76e06aed28d04f24ae3a849cfe2 (commit)
via b5ef99f14fb02deb128b4b0956508fc980886407 (commit)
via ac5557659e667da5f3a33cc612e06a21396fce2d (commit)
via 968739ea9af2aaba90e6bb4569ae4d9fb60b79aa (commit)
via 2031fd8b83bd832d1104128c3faddf209e6bb23e (commit)
via 0563b3c6d9787164475538fbc1342f8c6be62eac (commit)
via 3aba067b7fa7d77836901f82deee441a07b3a15d (commit)
via 0a7dbe56d1b4545e9f45c29ea719d24b3b3ada3e (commit)
via 767e92f64b63a6bcaa36efe633e8a3e55a803e79 (commit)
via 7b6bada79b4e0534b261440438b4256bc446191f (commit)
from c62e71fa8b6170245dbb66057b441b94c10e2c5d (commit)
http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=master
- Log -
commit 08e6c100971e1d72edd050f7f502145363f3c1ab
Merge: c62e71fa8b6170245dbb66057b441b94c10e2c5d
8ae93da7f6341f1cddb15786df67644f29648b9b
Author: Andrew Tridgell
Date: Tue May 5 16:12:04 2009 +1000
merged 1.0.69 into head
---
Summary of changes:
client/ctdb_client.c|4 +-
include/ctdb_private.h | 16 --
packaging/RPM/ctdb.spec | 28 +++
server/ctdb_control.c |6 ++-
server/ctdb_traverse.c | 124 ++
5 files changed, 147 insertions(+), 31 deletions(-)
Changeset truncated at 500 lines:
diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 3bdb4b2..8c3bb74 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -2399,10 +2399,10 @@ int ctdb_ctrl_modflags(struct ctdb_context *ctdb,
struct timeval timeout, uint32
timeout, false, data,
NULL, NULL,
NULL) != 0) {
- DEBUG(DEBUG_ERR, (__location__ " ctdb_control to disable node
failed\n"));
+ DEBUG(DEBUG_ERR, (__location__ " ctdb_control to update
nodeflags failed\n"));
talloc_free(tmp_ctx);
- return -1;
+ return 0;
}
talloc_free(tmp_ctx);
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index eac27f7..9ba4cc0 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -430,6 +430,7 @@ struct ctdb_db_context {
struct ctdb_registered_call *calls; /* list of registered calls */
uint32_t seqnum;
struct timed_event *te;
+ struct ctdb_traverse_local_handle *traverse;
};
@@ -555,11 +556,12 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS
= 0,
CTDB_CONTROL_TAKEOVER_IP = 89,
CTDB_CONTROL_GET_PUBLIC_IPS = 90,
CTDB_CONTROL_GET_NODEMAP = 91,
- CTDB_CONTROL_EVENT_SCRIPT_INIT = 92,
- CTDB_CONTROL_EVENT_SCRIPT_START = 93,
- CTDB_CONTROL_EVENT_SCRIPT_STOP = 94,
- CTDB_CONTROL_EVENT_SCRIPT_FINISHED = 95,
- CTDB_CONTROL_GET_EVENT_SCRIPT_STATUS = 96,
+ CTDB_CONTROL_TRAVERSE_KILL = 92,
+ CTDB_CONTROL_EVENT_SCRIPT_INIT = 93,
+ CTDB_CONTROL_EVENT_SCRIPT_START = 94,
+ CTDB_CONTROL_EVENT_SCRIPT_STOP = 95,
+ CTDB_CONTROL_EVENT_SCRIPT_FINISHED = 96,
+ CTDB_CONTROL_GET_EVENT_SCRIPT_STATUS = 97,
};
/*
@@ -1118,9 +1120,11 @@ struct ctdb_client_call_state {
int32_t ctdb_control_traverse_start(struct ctdb_context *ctdb, TDB_DATA
indata,
- TDB_DATA *outdata, uint32_t srcnode);
+ TDB_DATA *outdata, uint32_t srcnode,
uint32_t client_id);
int32_t ctdb_control_traverse_all(struct ctdb_context *ctdb, TDB_DATA data,
TDB_DATA *outdata);
int32_t ctdb_control_traverse_data(struct ctdb_context *ctdb, TDB_DATA data,
TDB_DATA *outdata);
+int32_t ctdb_control_traverse_kill(struct ctdb_context *ctdb, TDB_DATA indata,
+ TDB_DATA *outdata, uint32_t srcnode);
int ctdb_dispatch_message(struct ctdb_con
[SCM] CTDB repository - branch master updated - c62e71fa8b6170245dbb66057b441b94c10e2c5d
The branch, master has been updated via c62e71fa8b6170245dbb66057b441b94c10e2c5d (commit) from bf1b76955db6ba00ec64686b53084268573ba6a0 (commit) http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=master - Log - commit c62e71fa8b6170245dbb66057b441b94c10e2c5d Author: Andrew Tridgell Date: Tue May 5 16:06:58 2009 +1000 added link to michaels sambaxp papers --- Summary of changes: web/documentation.html |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/web/documentation.html b/web/documentation.html index 6636869..d78a1f0 100644 --- a/web/documentation.html +++ b/web/documentation.html @@ -27,4 +27,10 @@ Man pages: http://ctdb.samba.org/~tridge/ctdb/doc/onnode.1.html";>onnode manual page +Articles: + +http://samba.org/~obnox/presentations/sambaXP-2009/";>Michael +Adam's clustered NAS articles + + -- CTDB repository
[SCM] CTDB repository - branch ctdb-1.0.64 created - de801bcb2da8d972fa1bebb85d2d558367f53103
The branch, ctdb-1.0.64 has been created at de801bcb2da8d972fa1bebb85d2d558367f53103 (commit) - Log - commit de801bcb2da8d972fa1bebb85d2d558367f53103 Author: Andrew Tridgell Date: Fri Nov 21 08:05:59 2008 +1100 fixed problem with looping ctdb recoveries After a node failure, GPFS can get into a state where non-blocking fcntl() locks can take a long time. This means to the ctdb set_recmode test timing out, which leads to a recovery failure, and a new recovery. The recovery loop can last a long time. The fix is to consider a fcntl timeout as a success of this test. The test is to see that we can't lock the shared reclock file, so a timeout is fine for a success. --- -- CTDB repository
[SCM] CTDB repository - branch 1.0.69 created - 8ae93da7f6341f1cddb15786df67644f29648b9b
The branch, 1.0.69 has been created at 8ae93da7f6341f1cddb15786df67644f29648b9b (commit) - Log - commit 8ae93da7f6341f1cddb15786df67644f29648b9b Author: Andrew Tridgell Date: Tue May 5 12:17:21 2009 +1000 fixed an error with newer autotools versions commit b06d4c6ee7da97aaa810aa4c95952b6505cf720f Author: Andrew Tridgell Date: Tue May 5 12:17:07 2009 +1000 fixed a problem with clients disconnecting during a traverse When a client (such as smbstatus) is killed, it may have outstanding traverse children on remote nodes. We need to catch the client disconnect in ctdbd and send a control to all nodes telling them to kill those outstanding traverse children. commit d26d522fd0a1df7f06be056e7458ed5349a00658 Author: root Date: Tue May 5 10:24:14 2009 +1000 new version 1.0.69-6 commit d02c0e9371981bc6830f792d65e9f08832656cf0 Author: root Date: Tue May 5 09:55:36 2009 +1000 try to add the routes back also for the releaseip event to workaround the issue with when the kernel removes too many addresses (see 10.interfaces for the details) commit 87e674f93728fb20209b6473f07ca323530ddbdc Author: root Date: Fri May 1 01:24:27 2009 +1000 new version 1.0.69-5 commit 478f43bc3c970edc7c8db3e34095774261a48056 Author: root Date: Fri May 1 01:18:27 2009 +1000 Add a new variable VerifyRecoveryLock which can be used to disable the test that the recovery daemon holds the lock properly when performing a recovery commit a63c79318678abe99d2a36fe4465e63eafc008b7 Author: Ronnie Sahlberg Date: Sun Apr 26 08:50:35 2009 +1000 new version 1.0.69-4 commit 8628402d4cad4b9ef580151b85e36b6a5909e56c Author: Ronnie Sahlberg Date: Sun Apr 26 08:47:38 2009 +1000 we only need to have transaction nesting disabled when we start the new transaction for the recovery commit c61c4f7a7628232e9094d463275ba6abf7b79941 Author: Ronnie Sahlberg Date: Sun Apr 26 08:42:54 2009 +1000 set the TDB_NO_NESTING flag for the tdb before we start a transaction from within recovery commit 460e6b2402fc9bca9e9835e3a203278ac0bcaf8f Author: Ronnie Sahlberg Date: Sun Apr 26 08:38:37 2009 +1000 add TDB_NO_NESTING. When this flag is set tdb will not allow any nested transactions and tdb_transaction_start() will implicitely _cancel() any pending transactions before starting any new ones. commit fb582515c674b76e06aed28d04f24ae3a849cfe2 Author: Ronnie Sahlberg Date: Fri Apr 24 18:23:48 2009 +1000 add a tuneable RecoveryDropAllIPs so it is possible to control after how long a node that has been stuck in recovery will wait until it will yield all public addresses. this now defaults to 60 seconds This is useful if a split brain occurs due to network partitioning since it will make sure that the "other half" of the cluster that does not contain the recovery master will eventually release all ips and thus avoiding a duplicate ip situation for the public addresses commit b5ef99f14fb02deb128b4b0956508fc980886407 Author: Ronnie Sahlberg Date: Fri Apr 24 18:09:51 2009 +1000 increase the loglevel for the message we print when we automatically release all ips when we have been in recovery for too long commit ac5557659e667da5f3a33cc612e06a21396fce2d Author: Ronnie Sahlberg Date: Fri Apr 24 14:43:48 2009 +1000 new version 1.0.69-3 commit 968739ea9af2aaba90e6bb4569ae4d9fb60b79aa Author: Ronnie Sahlberg Date: Fri Apr 24 14:41:21 2009 +1000 tweak some timeouts so that we do trigger a banning even if the control hangs/timesout commit 2031fd8b83bd832d1104128c3faddf209e6bb23e Author: Ronnie Sahlberg Date: Fri Apr 24 13:58:32 2009 +1000 If we can not pull a database from a node during recovery, mark this node as a "culprit" so that it will eventually become banned. commit 0563b3c6d9787164475538fbc1342f8c6be62eac Author: Ronnie Sahlberg Date: Thu Apr 23 09:31:44 2009 +1000 new version 1.0.69-2 commit 3aba067b7fa7d77836901f82deee441a07b3a15d Author: Ronnie Sahlberg Date: Mon Apr 6 12:00:22 2009 +1000 We dont need to verify the nodemap on remote nodes that are banned commit 0a7dbe56d1b4545e9f45c29ea719d24b3b3ada3e Author: Ronnie Sahlberg Date: Thu Apr 2 14:50:43 2009 +1100 if we cant pull the remote nodemap off a node we should mark it as a culprit so it eventually becomes banned. commit 767e92f64b63a6bcaa36efe633e8a3e55a803e79 Author: root Date: Thu Feb 5 12:56:22 2009 +1100 New version 1.0.69_1 commit 7b6bada79b4e0534b261440438b4256bc446191f Author: root Date: Thu Feb 5 12:18:17 2009 +1100 dont return error if update nodeflags failed. this can happen when we talk to older ctdb versions --- -- CTDB repository
[SCM] CTDB repository - branch ctdb-1.0.28 created - ca266a989ba1c6fcac48b1739e7cff7766481df7
The branch, ctdb-1.0.28 has been created at ca266a989ba1c6fcac48b1739e7cff7766481df7 (commit) - Log - --- -- CTDB repository
[SCM] CTDB repository - branch master updated - bf1b76955db6ba00ec64686b53084268573ba6a0
The branch, master has been updated
via bf1b76955db6ba00ec64686b53084268573ba6a0 (commit)
via 72f1c696ee77899f7973878f2568a60d199d4fea (commit)
via 329df9e47e6ca8ab5143985a999e68f37c6d88a5 (commit)
via 94343309992929a592348c936e09a7b4f8b512c1 (commit)
via bf8dae63d10498e6b6179bbacdd72f1ff0fc60be (commit)
via 1b2029dbb055ff07367ebc1f307f5241320227b2 (commit)
via 459e4ee135bd1cd24c15e5325906eb4ecfd550ec (commit)
via 70f21428c9eec96bcc787be191e7478ad68956dc (commit)
via 7af060ded5113a49832f6a08a942523a202586b3 (commit)
via 1860a365e6ba8212e15c33016c80a2adcf8d10f4 (commit)
via 69dc3bf60b86d8df6dc5c7c6ebf303e847fb2ba9 (commit)
from 2f952af1a12e81a652ec9a4794db96f9593f2676 (commit)
http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=master
- Log -
commit bf1b76955db6ba00ec64686b53084268573ba6a0
Author: root
Date: Fri May 1 12:37:52 2009 +1000
new version 1.0.80
commit 72f1c696ee77899f7973878f2568a60d199d4fea
Author: root
Date: Fri May 1 12:30:26 2009 +1000
when tracking the ctdb statistics,only decrement num_clients and
pending_calls IFF the counter is >0
Otherwise there is the chance that we will reset the statistics after the
counter has been incremented (client connects) to zero and when the client
disconnects we decrement it to a negative number.
this is a pure cosmetic patch with no operational impact to ctdb
commit 329df9e47e6ca8ab5143985a999e68f37c6d88a5
Author: root
Date: Fri May 1 01:18:27 2009 +1000
Add a new variable VerifyRecoveryLock which can be used to disable the test
that the recovery daemon holds the lock properly when performing a recovery
commit 94343309992929a592348c936e09a7b4f8b512c1
Author: Ronnie Sahlberg
Date: Thu Apr 30 17:38:30 2009 +1000
dont unconditionally kill/restart ctdb when given "service ctdb start"
only start ctdb if it is not already running, and print an error message
othervise
commit bf8dae63d10498e6b6179bbacdd72f1ff0fc60be
Author: Ronnie Sahlberg
Date: Sun Apr 26 08:47:38 2009 +1000
we only need to have transaction nesting disabled when we start the new
transaction for the recovery
commit 1b2029dbb055ff07367ebc1f307f5241320227b2
Author: Ronnie Sahlberg
Date: Sun Apr 26 08:42:54 2009 +1000
set the TDB_NO_NESTING flag for the tdb before we start a transaction from
within recovery
commit 459e4ee135bd1cd24c15e5325906eb4ecfd550ec
Author: Ronnie Sahlberg
Date: Sun Apr 26 08:38:37 2009 +1000
add TDB_NO_NESTING. When this flag is set tdb will not allow any nested
transactions and tdb_transaction_start() will implicitely _cancel() any pending
transactions before starting any new ones.
commit 70f21428c9eec96bcc787be191e7478ad68956dc
Author: Ronnie Sahlberg
Date: Fri Apr 24 18:23:48 2009 +1000
add a tuneable RecoveryDropAllIPs so it is possible to control after how
long a node that has been stuck in recovery will wait until it will yield all
public addresses.
this now defaults to 60 seconds
This is useful if a split brain occurs due to network partitioning since it
will make sure that the "other half" of the cluster that does not contain the
recovery master will eventually release all ips and thus avoiding a duplicate
ip situation for the public addresses
commit 7af060ded5113a49832f6a08a942523a202586b3
Author: Ronnie Sahlberg
Date: Fri Apr 24 18:09:51 2009 +1000
increase the loglevel for the message we print when we automatically
release all ips when we have been in recovery for too long
commit 1860a365e6ba8212e15c33016c80a2adcf8d10f4
Author: Ronnie Sahlberg
Date: Fri Apr 24 14:41:21 2009 +1000
tweak some timeouts so that we do trigger a banning even if the control
hangs/timesout
commit 69dc3bf60b86d8df6dc5c7c6ebf303e847fb2ba9
Author: Ronnie Sahlberg
Date: Fri Apr 24 13:58:32 2009 +1000
If we can not pull a database from a node during recovery, mark this node
as a "culprit" so that it will eventually become banned.
---
Summary of changes:
config/ctdb.init |8 ++-
include/ctdb_private.h |2 +
lib/tdb/common/transaction.c | 18 +---
lib/tdb/include/tdb.h|1 +
packaging/RPM/ctdb.spec | 10 -
server/ctdb_daemon.c | 44 +++--
server/ctdb_freeze.c |2 +
server/ctdb_recover.c| 19 -
server/ctdb_recoverd.c | 28 ++---
server/ctdb_tunables.c |6 +++-
10 files changed, 109 insertions(+), 29 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/ctdb.init b/config/ctdb.init
index 0903c91..a45babf 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -95,9 +95,15 @@ set_retval() {
}
start() {
[SCM] CTDB repository - branch 1.0.69 updated - ctdb-1.0.69-18-gd26d522
The branch, 1.0.69 has been updated
via d26d522fd0a1df7f06be056e7458ed5349a00658 (commit)
via d02c0e9371981bc6830f792d65e9f08832656cf0 (commit)
from 87e674f93728fb20209b6473f07ca323530ddbdc (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.0.69
- Log -
commit d26d522fd0a1df7f06be056e7458ed5349a00658
Author: root
Date: Tue May 5 10:24:14 2009 +1000
new version 1.0.69-6
commit d02c0e9371981bc6830f792d65e9f08832656cf0
Author: root
Date: Tue May 5 09:55:36 2009 +1000
try to add the routes back also for the releaseip event to workaround the
issue
with when the kernel removes too many addresses (see 10.interfaces for the
details)
---
Summary of changes:
config/events.d/99.routing |2 +-
packaging/RPM/ctdb.spec|8 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/99.routing b/config/events.d/99.routing
index ec0a7bf..02d86a6 100755
--- a/config/events.d/99.routing
+++ b/config/events.d/99.routing
@@ -24,7 +24,7 @@ shift
PATH=/usr/bin:/bin:/usr/sbin:/sbin:$PATH
case $cmd in
- takeip)
+ takeip|releaseip)
iface=$1
cat $CTDB_BASE/static-routes | egrep "^$iface " | while read IFACE DEST
GW; do
route add -net $DEST gw $GW
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 432a6aa..db3677b 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -5,7 +5,7 @@ Vendor: Samba Team
Packager: Samba Team
Name: ctdb
Version: 1.0
-Release: 69_5
+Release: 69_6
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -121,6 +121,12 @@ fi
%{_includedir}/ctdb_private.h
%changelog
+* Tue May 5 2009 : Version 1.0.69-6
+ - Try to add back the routes in 99.routing both for the takeip and also the
+ releaseip event since during releaseip) too many addresses may have been
+ deleted, causing routes to be lost.
+ See 10.interfaces for the workaround for "ip addr del" deleting too
+ many addresses.
* Fri May 1 2009 : Version 1.0.69-5
- Add a new variable VerifyRecoveryLock. When set to 0 this will skip
the test inside the main where it verifies that the recovery masted does
--
CTDB repository
Build status as of Tue May 5 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-05-04 00:00:17.0 + +++ /home/build/master/cache/broken_results.txt 2009-05-05 00:00:45.0 + @@ -1,22 +1,22 @@ -Build status as of Mon May 4 00:00:02 2009 +Build status as of Tue May 5 00:00:02 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 31 6 0 +ccache 32 6 0 distcc 0 0 0 -ldb 31 31 0 -libreplace 31 11 0 +ldb 32 32 0 +libreplace 32 11 0 lorikeet 0 0 0 pidl 21 3 0 -ppp 14 0 0 -rsync30 10 0 +ppp 15 0 0 +rsync32 10 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 29 19 0 -samba_3_master 30 29 1 -samba_3_next 30 30 1 -samba_4_0_test 31 30 1 -talloc 29 31 0 -tdb 29 11 0 +samba_3_current 30 16 0 +samba_3_master 31 29 1 +samba_3_next 31 30 1 +samba_4_0_test 32 31 1 +talloc 32 32 0 +tdb 30 12 0
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1438-g2c47254
The branch, master has been updated via 2c4725462e2251de887e043653aa0ce3eaa9771e (commit) from d34651f9d2fc5514bfbf3f74b66f1070bc09202a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2c4725462e2251de887e043653aa0ce3eaa9771e Author: Jeremy Allison Date: Mon May 4 15:55:23 2009 -0700 Turn on POSIX test (small test) on buildfarm. Jeremy. --- Summary of changes: source3/script/tests/test_smbtorture_s3.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh index de372e9..8150b98 100755 --- a/source3/script/tests/test_smbtorture_s3.sh +++ b/source3/script/tests/test_smbtorture_s3.sh @@ -28,7 +28,7 @@ tests="$tests OPLOCK1 OPLOCK2 OPLOCK3" tests="$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3" tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K" tests="$tests TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE CHAIN1" -tests="$tests GETADDRINFO UID-REGRESSION-TEST" +tests="$tests GETADDRINFO POSIX UID-REGRESSION-TEST" skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN" skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST" -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1437-gd34651f
The branch, master has been updated
via d34651f9d2fc5514bfbf3f74b66f1070bc09202a (commit)
from c49730e15bd6b9b1d59e4ef271f4512d5a07c8b3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d34651f9d2fc5514bfbf3f74b66f1070bc09202a
Author: Jeremy Allison
Date: Mon May 4 15:50:35 2009 -0700
Fix the async calls for the posix_unlink and posix_rmdir.
Jeremy.
---
Summary of changes:
source3/libsmb/clifile.c | 62 +++-
source3/torture/torture.c |2 +-
2 files changed, 50 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index abc9391..a4e70c5 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -1282,9 +1282,16 @@ NTSTATUS cli_ntcreate(struct cli_state *cli,
return status;
}
-uint8_t *smb_bytes_push_str(uint8_t *buf, bool ucs2,
- const char *str, size_t str_len,
- size_t *pconverted_size)
+/***
+ Common function for pushing stings, used by smb_bytes_push_str()
+ and trans_bytes_push_str(). Only difference is the align_odd
+ parameter setting.
+***/
+
+static uint8_t *internal_bytes_push_str(uint8_t *buf, bool ucs2,
+ const char *str, size_t str_len,
+ bool align_odd,
+ size_t *pconverted_size)
{
size_t buflen;
char *converted;
@@ -1295,10 +1302,11 @@ uint8_t *smb_bytes_push_str(uint8_t *buf, bool ucs2,
}
buflen = talloc_get_size(buf);
- /*
-* We're pushing into an SMB buffer, align odd
-*/
- if (ucs2 && (buflen % 2 == 0)) {
+
+ if (align_odd && ucs2 && (buflen % 2 == 0)) {
+ /*
+* We're pushing into an SMB buffer, align odd
+*/
buf = TALLOC_REALLOC_ARRAY(NULL, buf, uint8_t, buflen + 1);
if (buf == NULL) {
return NULL;
@@ -1332,6 +1340,34 @@ uint8_t *smb_bytes_push_str(uint8_t *buf, bool ucs2,
return buf;
}
+/***
+ Push a string into an SMB buffer, with odd byte alignment
+ if it's a UCS2 string.
+***/
+
+uint8_t *smb_bytes_push_str(uint8_t *buf, bool ucs2,
+ const char *str, size_t str_len,
+ size_t *pconverted_size)
+{
+ return internal_bytes_push_str(buf, ucs2, str, str_len,
+ true, pconverted_size);
+}
+
+/***
+ Same as smb_bytes_push_str(), but without the odd byte
+ align for ucs2 (we're pushing into a param or data block).
+ static for now, although this will probably change when
+ other modules use async trans calls.
+***/
+
+static uint8_t *trans2_bytes_push_str(uint8_t *buf, bool ucs2,
+ const char *str, size_t str_len,
+ size_t *pconverted_size)
+{
+ return internal_bytes_push_str(buf, ucs2, str, str_len,
+ false, pconverted_size);
+}
+
/
Open a file
WARNING: if you open with O_WRONLY then getattrE won't work!
@@ -2940,7 +2976,7 @@ static int cli_posix_open_internal(struct cli_state *cli,
const char *fname, int
NULL,/* name */
-1, 0, /* fid, flags */
&setup, 1, 0, /* setup, length, max */
- param, param_len, 2,/* param, length, max */
+ param, param_len, 0,/* param, length, max */
(char *)&data, data_len, cli->max_xmit /* data,
length, max */
)) {
SAFE_FREE(param);
@@ -3033,7 +3069,7 @@ static struct tevent_req
*cli_posix_unlink_internal_send(TALLOC_CTX *mem_ctx,
memset(param, '\0', 6);
SSVAL(param, 0, SMB_POSIX_PATH_UNLINK);
- param = smb_bytes_push_str(param, cli_ucs2(cli), fname,
+ param = trans2_bytes_push_str(param, cli_ucs2(cli), fname,
strlen(fname)+1, NULL);
if (tevent_req_nomem(param, req)) {
@@ -3053,14 +3089,14 @@ static struct tevent_req
*cli_posix_unlink_internal_send(TALLOC_CTX *mem_ctx,
0, /* function. */
0, /*
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-871-gaeb7de5
The branch, v3-4-test has been updated
via aeb7de50b51840bddcdd4cbe6d96a4066b5116f0 (commit)
from 4b3bd6d0ba3348659615e69b3508969aa41e7de4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit aeb7de50b51840bddcdd4cbe6d96a4066b5116f0
Author: Steven Danneman
Date: Mon May 4 15:02:17 2009 -0700
s3:onefs.so fix issue with missing entries when enumerating directories
This bug prompted several, fairly large changes to the of OneFS's
readdirplus() within Samba.
One fundamental problem is that we kept our cache cursor pointed at the
next entry to be returned from onefs_readdir(), while the resume cookie
needed to refill the cache such that our cursor would be on this entry,
was located in the previous cache entry. This meant that to correctly
handle
seekdir() cases which could be found within the existing cache, and cases
where a cache reload was needed, required that the cache always hold
at least two entries: the entry we wished to return, and the previous entry
which held the resume cookie. Since the readdirplus() syscall gives us no
guarantee that it will always return these two direntries, there was a
fundamental problem with this design.
To fix this problem, I have rearchitected the onefs_readdir() path to keep
its pointer on the entry which contains the resume_cookie, not the entry
which will be returned next. Essentially, I changed onefs_readdir() from a
"return an entry then increment the cursor" model to "increment the cursor
then return an entry". By doing this, we only require that a single entry
be within the cache: the entry containing the resume cookie.
Second, there have been numerous off-by-one bugs in my implementation of
onefs_seekdir() which did a mapping between the 64-bit resume cookie
returned by readdirplus() and its own monotonically increasing "location"
offset. Furthermore, this design caused a somewhat frequent waste of
cycles, as in some cases we'd need to re-enumerate the entire directory to
recover the current "location" from an old resume cookie. As this code was
somewhat difficult to understand, prone to bugs, and innefficient in some
cases I decided it was better to wholesale replace it now, rather than
later.
It is possible to algorithmically map the 64-bit resume cookies from
readdirplus() into 32-bit offset values which SMB requires. The onefs.so
module now calls into a system library to do this conversion. This greatly
simplifies both the seekdir() and telldir() paths and is more efficient.
---
Summary of changes:
source3/modules/onefs_dir.c | 205 ---
1 files changed, 75 insertions(+), 130 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/onefs_dir.c b/source3/modules/onefs_dir.c
index 68a58b3..8c056d9 100644
--- a/source3/modules/onefs_dir.c
+++ b/source3/modules/onefs_dir.c
@@ -24,6 +24,7 @@
#include "onefs_config.h"
#include
+#include
/* The OneFS filesystem provides a readdirplus() syscall, equivalent to the
* NFSv3 PDU, which retrieves bulk directory listings with stat information
@@ -48,11 +49,11 @@ static uint64_t *rdp_cookies = NULL;
struct rdp_dir_state {
struct rdp_dir_state *next, *prev;
SMB_STRUCT_DIR *dirp;
- char *direntries_cursor; /* cursor to current direntry in the cache */
+ char *direntries_cursor; /* cursor to last returned direntry in cache */
size_t stat_count; /* number of entries stored in the cache */
- size_t stat_cursor; /* cursor to current stat in the cache */
- uint64_t resume_cookie; /* last cookie returned from the cache */
- long location; /* absolute location of direnty in DIR */
+ size_t stat_cursor; /* cursor to last returned stat in the cache */
+ uint64_t resume_cookie; /* cookie from the last entry returned from the
+ cache */
};
static struct rdp_dir_state *dirstatelist = NULL;
@@ -127,7 +128,6 @@ rdp_init(struct rdp_dir_state *dsp)
dsp->stat_count = RDP_BATCH_SIZE;
dsp->stat_cursor = RDP_BATCH_SIZE;
dsp->resume_cookie = RDP_RESUME_KEY_START;
- dsp->location = 0;
return 0;
}
@@ -155,10 +155,10 @@ rdp_fill_cache(struct rdp_dir_state *dsp)
dsp->stat_count = RDP_BATCH_SIZE;
DEBUG(9, ("Calling readdirplus() with DIR %p, dirfd: %d, "
-"resume_cookie 0x%llx, location %u, size_to_read: %zu, "
+"resume_cookie %#llx, size_to_read: %zu, "
"direntries_size: %zu, stat_count: %u\n",
-dsp->dirp, dirfd, dsp->resume_cookie, dsp->location,
-RDP_BATCH_SIZE, RDP_DIRE
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1436-gc49730e
The branch, master has been updated
via c49730e15bd6b9b1d59e4ef271f4512d5a07c8b3 (commit)
from 72bd5ff9833677c3567cd1582d5dd5fbb4001e90 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c49730e15bd6b9b1d59e4ef271f4512d5a07c8b3
Author: Steven Danneman
Date: Mon May 4 15:02:17 2009 -0700
s3:onefs.so fix issue with missing entries when enumerating directories
This bug prompted several, fairly large changes to the of OneFS's
readdirplus() within Samba.
One fundamental problem is that we kept our cache cursor pointed at the
next entry to be returned from onefs_readdir(), while the resume cookie
needed to refill the cache such that our cursor would be on this entry,
was located in the previous cache entry. This meant that to correctly
handle
seekdir() cases which could be found within the existing cache, and cases
where a cache reload was needed, required that the cache always hold
at least two entries: the entry we wished to return, and the previous entry
which held the resume cookie. Since the readdirplus() syscall gives us no
guarantee that it will always return these two direntries, there was a
fundamental problem with this design.
To fix this problem, I have rearchitected the onefs_readdir() path to keep
its pointer on the entry which contains the resume_cookie, not the entry
which will be returned next. Essentially, I changed onefs_readdir() from a
"return an entry then increment the cursor" model to "increment the cursor
then return an entry". By doing this, we only require that a single entry
be within the cache: the entry containing the resume cookie.
Second, there have been numerous off-by-one bugs in my implementation of
onefs_seekdir() which did a mapping between the 64-bit resume cookie
returned by readdirplus() and its own monotonically increasing "location"
offset. Furthermore, this design caused a somewhat frequent waste of
cycles, as in some cases we'd need to re-enumerate the entire directory to
recover the current "location" from an old resume cookie. As this code was
somewhat difficult to understand, prone to bugs, and innefficient in some
cases I decided it was better to wholesale replace it now, rather than
later.
It is possible to algorithmically map the 64-bit resume cookies from
readdirplus() into 32-bit offset values which SMB requires. The onefs.so
module now calls into a system library to do this conversion. This greatly
simplifies both the seekdir() and telldir() paths and is more efficient.
---
Summary of changes:
source3/modules/onefs_dir.c | 205 ---
1 files changed, 75 insertions(+), 130 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/onefs_dir.c b/source3/modules/onefs_dir.c
index 68a58b3..8c056d9 100644
--- a/source3/modules/onefs_dir.c
+++ b/source3/modules/onefs_dir.c
@@ -24,6 +24,7 @@
#include "onefs_config.h"
#include
+#include
/* The OneFS filesystem provides a readdirplus() syscall, equivalent to the
* NFSv3 PDU, which retrieves bulk directory listings with stat information
@@ -48,11 +49,11 @@ static uint64_t *rdp_cookies = NULL;
struct rdp_dir_state {
struct rdp_dir_state *next, *prev;
SMB_STRUCT_DIR *dirp;
- char *direntries_cursor; /* cursor to current direntry in the cache */
+ char *direntries_cursor; /* cursor to last returned direntry in cache */
size_t stat_count; /* number of entries stored in the cache */
- size_t stat_cursor; /* cursor to current stat in the cache */
- uint64_t resume_cookie; /* last cookie returned from the cache */
- long location; /* absolute location of direnty in DIR */
+ size_t stat_cursor; /* cursor to last returned stat in the cache */
+ uint64_t resume_cookie; /* cookie from the last entry returned from the
+ cache */
};
static struct rdp_dir_state *dirstatelist = NULL;
@@ -127,7 +128,6 @@ rdp_init(struct rdp_dir_state *dsp)
dsp->stat_count = RDP_BATCH_SIZE;
dsp->stat_cursor = RDP_BATCH_SIZE;
dsp->resume_cookie = RDP_RESUME_KEY_START;
- dsp->location = 0;
return 0;
}
@@ -155,10 +155,10 @@ rdp_fill_cache(struct rdp_dir_state *dsp)
dsp->stat_count = RDP_BATCH_SIZE;
DEBUG(9, ("Calling readdirplus() with DIR %p, dirfd: %d, "
-"resume_cookie 0x%llx, location %u, size_to_read: %zu, "
+"resume_cookie %#llx, size_to_read: %zu, "
"direntries_size: %zu, stat_count: %u\n",
-dsp->dirp, dirfd, dsp->resume_cookie, dsp->location,
-RDP_BATCH_SIZE, RDP_DIRENTRIES
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1435-g72bd5ff
The branch, master has been updated via 72bd5ff9833677c3567cd1582d5dd5fbb4001e90 (commit) from 1b223eeb5950c10e90d9672315635c5b171b3d9e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 72bd5ff9833677c3567cd1582d5dd5fbb4001e90 Author: Tim Prouty Date: Mon May 4 14:38:59 2009 -0700 libcli: Fix shadowed name in header also --- Summary of changes: libcli/named_pipe_auth/npa_tstream.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/named_pipe_auth/npa_tstream.h b/libcli/named_pipe_auth/npa_tstream.h index 6ffd7b8..34f2058 100644 --- a/libcli/named_pipe_auth/npa_tstream.h +++ b/libcli/named_pipe_auth/npa_tstream.h @@ -30,7 +30,7 @@ struct tevent_req *tstream_npa_connect_send(TALLOC_CTX *mem_ctx, const char *directory, const char *npipe, const struct tsocket_address *client, - const char *client_name, + const char *client_name_in, const struct tsocket_address *server, const char *server_name, const struct netr_SamInfo3 *info3, -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1434-g1b223ee
The branch, master has been updated
via 1b223eeb5950c10e90d9672315635c5b171b3d9e (commit)
from 651fb412a8092a93348621605b8d26396e061350 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1b223eeb5950c10e90d9672315635c5b171b3d9e
Author: Tim Prouty
Date: Mon May 4 13:26:02 2009 -0700
s3 torture: Only close if open was successful
---
Summary of changes:
source3/torture/denytest.c | 16
1 files changed, 12 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c
index e5cd5a2..66a1c9f 100644
--- a/source3/torture/denytest.c
+++ b/source3/torture/denytest.c
@@ -1470,8 +1470,12 @@ bool torture_denytest1(int dummy)
resultstr(denytable1[i].result));
}
- cli_close(cli1, fnum1);
- cli_close(cli1, fnum2);
+ if (NT_STATUS_IS_OK(ret1)) {
+ cli_close(cli1, fnum1);
+ }
+ if (NT_STATUS_IS_OK(ret2)) {
+ cli_close(cli1, fnum2);
+ }
}
for (i=0;i<2;i++) {
@@ -1555,8 +1559,12 @@ bool torture_denytest2(int dummy)
resultstr(denytable2[i].result));
}
- cli_close(cli1, fnum1);
- cli_close(cli2, fnum2);
+ if (NT_STATUS_IS_OK(ret1)) {
+ cli_close(cli1, fnum1);
+ }
+ if (NT_STATUS_IS_OK(ret2)) {
+ cli_close(cli2, fnum2);
+ }
}
for (i=0;i<2;i++) {
--
Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch master updated -release-4-0-0alpha7-1431-g1b2c65f
On Mon, May 04, 2009 at 12:22:48PM -0700, Tim Prouty wrote: > I was just mirroring the other usage in the file as the quick warning > fix. It seems a little bit strange to me to make an fd uint, when the > standard api uses -1 to indicate error. I fixed the standard API :-). Everything should be returning NTSTATUS now, not -1. Jeremy.
Re: [SCM] Samba Shared Repository - branch master updated -release-4-0-0alpha7-1431-g1b2c65f
On May 4, 2009, at 12:07 PM, Volker Lendecke wrote: On Mon, May 04, 2009 at 11:58:19AM -0500, Tim Prouty wrote: - if (fnum1 != -1) cli_close(cli1, fnum1); - if (fnum2 != -1) cli_close(cli2, fnum2); + cli_close(cli1, fnum1); + cli_close(cli2, fnum2); I think that's wrong. We need a (fnumx 1= (uint16_t)-1). I was just mirroring the other usage in the file as the quick warning fix. It seems a little bit strange to me to make an fd uint, when the standard api uses -1 to indicate error. -Tim
Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1431-g1b2c65f
On Mon, May 04, 2009 at 11:58:19AM -0500, Tim Prouty wrote: > - if (fnum1 != -1) cli_close(cli1, fnum1); > - if (fnum2 != -1) cli_close(cli2, fnum2); > + cli_close(cli1, fnum1); > + cli_close(cli2, fnum2); I think that's wrong. We need a (fnumx 1= (uint16_t)-1). Volker pgpQ3KgqOUFk8.pgp Description: PGP signature
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1433-g651fb41
The branch, master has been updated via 651fb412a8092a93348621605b8d26396e061350 (commit) from 5dae04e055d46483749f6e642ae6afffd641ff2a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 651fb412a8092a93348621605b8d26396e061350 Author: Jeremy Allison Date: Mon May 4 11:22:13 2009 -0700 Ensure we use UID-REGRESSION-TEST. It's a very short test. Jeremy. --- Summary of changes: source3/script/tests/test_smbtorture_s3.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh index 624e968..de372e9 100755 --- a/source3/script/tests/test_smbtorture_s3.sh +++ b/source3/script/tests/test_smbtorture_s3.sh @@ -28,7 +28,7 @@ tests="$tests OPLOCK1 OPLOCK2 OPLOCK3" tests="$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3" tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K" tests="$tests TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE CHAIN1" -tests="$tests GETADDRINFO" +tests="$tests GETADDRINFO UID-REGRESSION-TEST" skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN" skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST" -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1432-g5dae04e
The branch, master has been updated
via 5dae04e055d46483749f6e642ae6afffd641ff2a (commit)
from 1b2c65ff8d3c0033a0207801319dda662dbad4ba (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5dae04e055d46483749f6e642ae6afffd641ff2a
Author: Jeremy Allison
Date: Mon May 4 10:40:57 2009 -0700
Torture test for bug #6315 - smbd crashes doing vfs_full_audit on IPC$
close event.
Shows that doing a tdis with invalid uid succeeds.
Jeremy.
---
Summary of changes:
source3/torture/torture.c | 30 --
1 files changed, 28 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index c9199eb..804cdf3 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -5143,6 +5143,7 @@ static bool run_uid_regression_test(int dummy)
{
static struct cli_state *cli;
int16_t old_vuid;
+ int16_t old_cnum;
bool correct = True;
printf("starting uid regression test\n");
@@ -5172,14 +5173,39 @@ static bool run_uid_regression_test(int dummy)
NT_STATUS_NO_SUCH_USER)) {
return False;
}
- goto out;
+ }
+
+ old_cnum = cli->cnum;
+
+ /* Now try a SMBtdis with the invald vuid set to zero. */
+ cli->vuid = 0;
+
+ /* This should succeed. */
+ if (cli_tdis(cli)) {
+ printf("First tdis with invalid vuid should succeed.\n");
+ } else {
+ printf("First tdis failed (%s)\n", cli_errstr(cli));
+ }
+
+ cli->vuid = old_vuid;
+ cli->cnum = old_cnum;
+
+ /* This should fail. */
+ if (cli_tdis(cli)) {
+ printf("Second tdis with invalid vuid should fail - succeeded
instead !.\n");
+ } else {
+ /* Should be bad tid. */
+ if (!check_error(__LINE__, cli, ERRSRV, ERRinvnid,
+ NT_STATUS_NETWORK_NAME_DELETED)) {
+ return False;
+ }
}
cli_rmdir(cli, "\\uid_reg_test");
out:
- torture_close_connection(cli);
+ cli_shutdown(cli);
return correct;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1431-g1b2c65f
The branch, master has been updated
via 1b2c65ff8d3c0033a0207801319dda662dbad4ba (commit)
via 032bb807c70a442f539c5321c2a903461f83ac54 (commit)
from e46a88ce35e1aba9d9a344773bc97a9f3f2bd616 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1b2c65ff8d3c0033a0207801319dda662dbad4ba
Author: Tim Prouty
Date: Mon May 4 08:51:55 2009 -0700
s3 torture: Fix comparison is always true warning
commit 032bb807c70a442f539c5321c2a903461f83ac54
Author: Tim Prouty
Date: Mon May 4 08:50:35 2009 -0700
libcli: Fix shadowed variable warning
---
Summary of changes:
libcli/named_pipe_auth/npa_tstream.c |4 ++--
source3/torture/denytest.c |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/named_pipe_auth/npa_tstream.c
b/libcli/named_pipe_auth/npa_tstream.c
index c1a293e..57e8418 100644
--- a/libcli/named_pipe_auth/npa_tstream.c
+++ b/libcli/named_pipe_auth/npa_tstream.c
@@ -63,7 +63,7 @@ struct tevent_req *tstream_npa_connect_send(TALLOC_CTX
*mem_ctx,
const char *directory,
const char *npipe,
const struct tsocket_address *client,
- const char *client_name,
+ const char *client_name_in,
const struct tsocket_address *server,
const char *server_name,
const struct netr_SamInfo3 *info3,
@@ -119,7 +119,7 @@ struct tevent_req *tstream_npa_connect_send(TALLOC_CTX
*mem_ctx,
state->auth_req.level = 2;
info2 = &state->auth_req.info.info2;
- info2->client_name = client_name;
+ info2->client_name = client_name_in;
info2->client_addr = tsocket_address_inet_addr_string(client,
state);
if (!info2->client_addr) {
/* errno might be EINVAL */
diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c
index 1360fc2..e5cd5a2 100644
--- a/source3/torture/denytest.c
+++ b/source3/torture/denytest.c
@@ -1555,8 +1555,8 @@ bool torture_denytest2(int dummy)
resultstr(denytable2[i].result));
}
- if (fnum1 != -1) cli_close(cli1, fnum1);
- if (fnum2 != -1) cli_close(cli2, fnum2);
+ cli_close(cli1, fnum1);
+ cli_close(cli2, fnum2);
}
for (i=0;i<2;i++) {
--
Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1429-ge46a88c
Hi Jeremy,
> if (ent->vuid == vuid) {
> ent->vuid = UID_FIELD_INVALID;
> - /* Ensure we're not freeing an active pointer. */
> + /*
> + * We need to keep conn->server_info around
> + * if it's equal to ent->server_info as a SMBulogoff
> + * is often followed by a SMBtdis (with an invalid
> + * vuid). The debug code (or regular code in
Do you have a capture of this for me?
I wonder we should create a anonymous server_info for the SMBTdis,
if it uses an invalid vuid?
A torture test for this would also be very useful.
metze
metze
signature.asc
Description: OpenPGP digital signature
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1429-ge46a88c
The branch, master has been updated
via e46a88ce35e1aba9d9a344773bc97a9f3f2bd616 (commit)
from d8de7e3193143ec50d86adc704123ca240a8f549 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e46a88ce35e1aba9d9a344773bc97a9f3f2bd616
Author: Jeremy Allison
Date: Mon May 4 08:31:40 2009 -0700
Fix bug #6315 smbd crashes doing vfs_full_audit on IPC$ close event.
The underlying problem
is that once SMBulogoff is called, all server_info contexts associated with
the
vuid should become invalid, even if that's the context being currently used
by
the connection struct (tid). When the SMBtdis comes in it doesn't need a
valid
vuid value, but the code called inside vfs_full_audit always assumes that
there
is one (and hence a valid conn->server_info pointer) available.
This is actually a bug inside the vfs_full_audit and other code inside
Samba,
which should only indirect conn->server_info on calls which require AS_USER
to
be set in our process table. I could fix all these issues, but there's no
guarentee that someone might not add more code that fails this assumption,
as
it's a hard assumption to break (it's usually true).
So what I've done is to ensure that on SMBulogoff the previously used
conn->server_info struct is kept around to be used for print debugging
purposes
(it won't be used to change to an invalid user context, as such calls need
AS_USER set). This isn't strictly correct, as there's no association with
the
(now invalid) context being freed and the call that causes
conn->server_info to
be indirected, but it's good enough for most cases.
The hard part was to ensure that once a valid context is used again (via new
sessionsetupX calls, or new calls on a still valid vuid on this tid) that we
don't leak memory by simply replacing the stored conn->server_info pointer.
We
would never actually leak the memory (as all conn->server_info pointers are
talloc children of conn), but with the previous patch a malicious client
could
cause many server_info structs to be talloced by the right combination of
SMB
calls. This new patch introduces free_conn_server_info_if_unused(), which
protects against the above.
Jeremy.
---
Summary of changes:
source3/smbd/uid.c | 47 ---
1 files changed, 44 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index b8ed321..72837ff 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -52,6 +52,26 @@ bool change_to_guest(void)
return true;
}
+/
+ talloc free the conn->server_info if not used in the vuid cache.
+/
+
+static void free_conn_server_info_if_unused(connection_struct *conn)
+{
+ unsigned int i;
+
+ for (i = 0; i < VUID_CACHE_SIZE; i++) {
+ struct vuid_cache_entry *ent;
+ ent = &conn->vuid_cache.array[i];
+ if (ent->vuid != UID_FIELD_INVALID &&
+ conn->server_info == ent->server_info) {
+ return;
+ }
+ }
+ /* Not used, safe to free. */
+ TALLOC_FREE(conn->server_info);
+}
+
/***
Check if a username is OK.
@@ -75,6 +95,7 @@ static bool check_user_ok(connection_struct *conn,
for (i=0; ivuid_cache.array[i];
if (ent->vuid == vuid) {
+ free_conn_server_info_if_unused(conn);
conn->server_info = ent->server_info;
conn->read_only = ent->read_only;
conn->admin_user = ent->admin_user;
@@ -140,6 +161,7 @@ static bool check_user_ok(connection_struct *conn,
ent->vuid = vuid;
ent->read_only = readonly_share;
ent->admin_user = admin_user;
+ free_conn_server_info_if_unused(conn);
conn->server_info = ent->server_info;
}
@@ -151,6 +173,7 @@ static bool check_user_ok(connection_struct *conn,
/
Clear a vuid out of the connection's vuid cache
+ This is only called on SMBulogoff.
/
void conn_clear_vuid_cache(connection_struct *conn, uint16_t vuid)
@@ -164,11 +187,29 @@ void conn_clear_vuid_cache(connection_struct *conn,
uint16_t vuid)
if (ent->vuid == vuid) {
ent
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-870-g4b3bd6d
The branch, v3-4-test has been updated
via 4b3bd6d0ba3348659615e69b3508969aa41e7de4 (commit)
from c2eb0d87a2436614741119ebd14fda05b42a2ddd (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 4b3bd6d0ba3348659615e69b3508969aa41e7de4
Author: Jeremy Allison
Date: Mon May 4 08:31:40 2009 -0700
Fix bug #6315 smbd crashes doing vfs_full_audit on IPC$ close event.
The underlying problem
is that once SMBulogoff is called, all server_info contexts associated with
the
vuid should become invalid, even if that's the context being currently used
by
the connection struct (tid). When the SMBtdis comes in it doesn't need a
valid
vuid value, but the code called inside vfs_full_audit always assumes that
there
is one (and hence a valid conn->server_info pointer) available.
This is actually a bug inside the vfs_full_audit and other code inside
Samba,
which should only indirect conn->server_info on calls which require AS_USER
to
be set in our process table. I could fix all these issues, but there's no
guarentee that someone might not add more code that fails this assumption,
as
it's a hard assumption to break (it's usually true).
So what I've done is to ensure that on SMBulogoff the previously used
conn->server_info struct is kept around to be used for print debugging
purposes
(it won't be used to change to an invalid user context, as such calls need
AS_USER set). This isn't strictly correct, as there's no association with
the
(now invalid) context being freed and the call that causes
conn->server_info to
be indirected, but it's good enough for most cases.
The hard part was to ensure that once a valid context is used again (via new
sessionsetupX calls, or new calls on a still valid vuid on this tid) that we
don't leak memory by simply replacing the stored conn->server_info pointer.
We
would never actually leak the memory (as all conn->server_info pointers are
talloc children of conn), but with the previous patch a malicious client
could
cause many server_info structs to be talloced by the right combination of
SMB
calls. This new patch introduces free_conn_server_info_if_unused(), which
protects against the above.
Jeremy.
---
Summary of changes:
source3/smbd/uid.c | 47 ---
1 files changed, 44 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index b8ed321..72837ff 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -52,6 +52,26 @@ bool change_to_guest(void)
return true;
}
+/
+ talloc free the conn->server_info if not used in the vuid cache.
+/
+
+static void free_conn_server_info_if_unused(connection_struct *conn)
+{
+ unsigned int i;
+
+ for (i = 0; i < VUID_CACHE_SIZE; i++) {
+ struct vuid_cache_entry *ent;
+ ent = &conn->vuid_cache.array[i];
+ if (ent->vuid != UID_FIELD_INVALID &&
+ conn->server_info == ent->server_info) {
+ return;
+ }
+ }
+ /* Not used, safe to free. */
+ TALLOC_FREE(conn->server_info);
+}
+
/***
Check if a username is OK.
@@ -75,6 +95,7 @@ static bool check_user_ok(connection_struct *conn,
for (i=0; ivuid_cache.array[i];
if (ent->vuid == vuid) {
+ free_conn_server_info_if_unused(conn);
conn->server_info = ent->server_info;
conn->read_only = ent->read_only;
conn->admin_user = ent->admin_user;
@@ -140,6 +161,7 @@ static bool check_user_ok(connection_struct *conn,
ent->vuid = vuid;
ent->read_only = readonly_share;
ent->admin_user = admin_user;
+ free_conn_server_info_if_unused(conn);
conn->server_info = ent->server_info;
}
@@ -151,6 +173,7 @@ static bool check_user_ok(connection_struct *conn,
/
Clear a vuid out of the connection's vuid cache
+ This is only called on SMBulogoff.
/
void conn_clear_vuid_cache(connection_struct *conn, uint16_t vuid)
@@ -164,11 +187,29 @@ void conn_clear_vuid_cache(connection_struct *conn,
uint16_t vuid)
if (ent->vuid == vuid) {
[SCM] Samba Shared Repository - annotated tag talloc-1-3-0 created - release-3-4-0pre1
The annotated tag, talloc-1-3-0 has been created at 81b28e2e5942259ec065cae872af1a746d112b7b (tag) tagging 21188807b56319b3eca0d410d3859fa5cdbede54 (commit) replaces release-4-0-0alpha7 tagged by Karolin Seeger on Mon May 4 16:52:40 2009 +0200 - Log - tag talloc-1-3-0 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iD8DBQBJ/wFMbzORW2Vot+oRAngWAJ41pz//3MWULJQKxg1tuuo5a1SxxQCfVxHr vwVWMu9X+9bxP7140suJ6sY= =G3RW -END PGP SIGNATURE- Alexander Zagrebin (1): Missing break in conversion function prevents tdb password database update. Andrew Bartlett (18): Allow 'net vampire' to work without an existing smb.conf Don't print the admin password if we don't set one. Pull in all the schema information during DRS schema fetch Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel Update talloc version so we don't fail on system talloc 1.2.0 Remove parse_control from header, long after the function was removed Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel s3:smbldap Remove smbldap_get_dn s3:printing Convert nt_printer_publish_ads() to use talloc better s3:libads Make ads_get_dn() take a talloc context s3:smbtorture Convert charcnv torture suite to use push_ucs2_talloc() s3:kerberos Rework smb_krb5_unparse_name() to take a talloc context s3:smbldap convert the easy cases to push_utf8_talloc() s3:charcnv Remove unused ucs2_to_unistr2() s3:charcnv Remove unused unistr2 functions s3:rpc_parse remove unused prs_unistr2() s3:charcnv Remove unused unistrcpy() and unistrlen() s3:lib Use push_ucs2_talloc() in ms_fnmatch() Andrew Tridgell (5): added a test that triggers a bug in the Samba3 notify code fixed a bug in message handling for code the change notify code removed leading spaces from embedded ldif fixed more embedded spaces in LDIF use a base64 encoded password when changing passwords Andy Kelk (1): Add dirsort module Björn Jacke (22): don't hardcode python path some shells are picky about ^ without quotes make man page (un)install more portable use test -f, Solaris /bin/sh doesn't know test -e don't rely on shebang's perl path, call our $PERL instead fix "dubious escape" warning of Studio compiler use LIB_PATH_VAR in selftest.sh if we have it fix configure check by avoiding main(main(...)) fix some typos fix build on old Heimdal based systems Ñ3/winbind_pam: fix gcc 4.4 compile warning s3:dsgetdcname: use parentheses in if condition to make negation clear s3: ifdef sendfile code that's only used in other ifdef'ed sendfile code remove non standard way to point to ctdb path s3/pam_smbpass: don't link agains KRB5LIBS s3/cifs: don't link cifs mount helpers agains popt s3/ldbtools: don't neddlessly link against wbinbind libs don't set -O twice to be portable, use options first, arguments last clean up lib64 linking paths the same way as lib remove needless rpath stuff for default paths as early as possible Ñ3/configure: fix regexp for ld version recognition Bo Yang (4): Initialize the id_map status in idmap_ldap to avoid surprise More fix to initialize idmap statuses Fix careless mistake in winbindd_setup_sig_usr2_handler Fix crash in async_smb.c Brad Hards (1): Update instructions for checking out pidl. Dan Sledz (3): It appears that the first time we see a uid/gid that winbind can't map, s3 pdb_wbc_sam: LookupRids should return sAMAccountName, not NT4 names s3: Fix a free of an uninitialized variable in winbind_get_sid_aliases Dave Richards (2): s3: Add strict lock/unlock calls to the vfs layer to replace is_locked s3 OneFS: Add kernel strict locking support David Kwan (1): s3 onefs: Change error status to NT_ACCESS_DENIED for errors in SET_SECURITY_DESC Derrell Lipman (2): [Bug 6228] SMBC_open_ctx failure due to path resolve failure doesn't set errno Ensure parameter types match format string Günther Deschner (387): s3-spoolss: remove some unused defines and structs. spoolss: add spoolss_JobStatus. s3-spoolss: job status defines moved to IDL. s3: re-run make samba3-idl. s3-spoolss: fix search_notify(). sorry... spoolss: add spoolss_JobInfo2, JobInfo3 and JobInfo4 (new in vista). spoolss: add 2 new SPOOLSS_JOB_CONTROL values. s3: re-run make samba3-idl. s3-spoolss: add rpccli_spoolss_getjob convenience wrapper. s3-spoolss: remove old rpccli_spoolss_getjob. s3-rpcclient: use is_valid_policy_hnd before closing handles. s3-rpcclient: add getjob spoolss command. s3-spoolss: use DSPRINT flags instead of SPOO
[SCM] Samba Shared Repository - annotated tag tdb-1-1-3 created - release-3-4-0pre1
The annotated tag, tdb-1-1-3 has been created at 0831f8dcd0eb1a31a09f1d016483b3a98012b60e (tag) tagging 21188807b56319b3eca0d410d3859fa5cdbede54 (commit) replaces release-4-0-0alpha7 tagged by Karolin Seeger on Mon May 4 16:55:07 2009 +0200 - Log - tag tdb-1-1-3 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iD8DBQBJ/wHQbzORW2Vot+oRAo8aAJ9LJLJbRQy2MIYxkopFMi1vd6AvPgCeJNSp xsDHYDBpyabWRKR1nD8ime0= =Dm8m -END PGP SIGNATURE- Alexander Zagrebin (1): Missing break in conversion function prevents tdb password database update. Andrew Bartlett (18): Allow 'net vampire' to work without an existing smb.conf Don't print the admin password if we don't set one. Pull in all the schema information during DRS schema fetch Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel Update talloc version so we don't fail on system talloc 1.2.0 Remove parse_control from header, long after the function was removed Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel s3:smbldap Remove smbldap_get_dn s3:printing Convert nt_printer_publish_ads() to use talloc better s3:libads Make ads_get_dn() take a talloc context s3:smbtorture Convert charcnv torture suite to use push_ucs2_talloc() s3:kerberos Rework smb_krb5_unparse_name() to take a talloc context s3:smbldap convert the easy cases to push_utf8_talloc() s3:charcnv Remove unused ucs2_to_unistr2() s3:charcnv Remove unused unistr2 functions s3:rpc_parse remove unused prs_unistr2() s3:charcnv Remove unused unistrcpy() and unistrlen() s3:lib Use push_ucs2_talloc() in ms_fnmatch() Andrew Tridgell (5): added a test that triggers a bug in the Samba3 notify code fixed a bug in message handling for code the change notify code removed leading spaces from embedded ldif fixed more embedded spaces in LDIF use a base64 encoded password when changing passwords Andy Kelk (1): Add dirsort module Björn Jacke (22): don't hardcode python path some shells are picky about ^ without quotes make man page (un)install more portable use test -f, Solaris /bin/sh doesn't know test -e don't rely on shebang's perl path, call our $PERL instead fix "dubious escape" warning of Studio compiler use LIB_PATH_VAR in selftest.sh if we have it fix configure check by avoiding main(main(...)) fix some typos fix build on old Heimdal based systems Ñ3/winbind_pam: fix gcc 4.4 compile warning s3:dsgetdcname: use parentheses in if condition to make negation clear s3: ifdef sendfile code that's only used in other ifdef'ed sendfile code remove non standard way to point to ctdb path s3/pam_smbpass: don't link agains KRB5LIBS s3/cifs: don't link cifs mount helpers agains popt s3/ldbtools: don't neddlessly link against wbinbind libs don't set -O twice to be portable, use options first, arguments last clean up lib64 linking paths the same way as lib remove needless rpath stuff for default paths as early as possible Ñ3/configure: fix regexp for ld version recognition Bo Yang (4): Initialize the id_map status in idmap_ldap to avoid surprise More fix to initialize idmap statuses Fix careless mistake in winbindd_setup_sig_usr2_handler Fix crash in async_smb.c Brad Hards (1): Update instructions for checking out pidl. Dan Sledz (3): It appears that the first time we see a uid/gid that winbind can't map, s3 pdb_wbc_sam: LookupRids should return sAMAccountName, not NT4 names s3: Fix a free of an uninitialized variable in winbind_get_sid_aliases Dave Richards (2): s3: Add strict lock/unlock calls to the vfs layer to replace is_locked s3 OneFS: Add kernel strict locking support David Kwan (1): s3 onefs: Change error status to NT_ACCESS_DENIED for errors in SET_SECURITY_DESC Derrell Lipman (2): [Bug 6228] SMBC_open_ctx failure due to path resolve failure doesn't set errno Ensure parameter types match format string Günther Deschner (387): s3-spoolss: remove some unused defines and structs. spoolss: add spoolss_JobStatus. s3-spoolss: job status defines moved to IDL. s3: re-run make samba3-idl. s3-spoolss: fix search_notify(). sorry... spoolss: add spoolss_JobInfo2, JobInfo3 and JobInfo4 (new in vista). spoolss: add 2 new SPOOLSS_JOB_CONTROL values. s3: re-run make samba3-idl. s3-spoolss: add rpccli_spoolss_getjob convenience wrapper. s3-spoolss: remove old rpccli_spoolss_getjob. s3-rpcclient: use is_valid_policy_hnd before closing handles. s3-rpcclient: add getjob spoolss command. s3-spoolss: use DSPRINT flags instead of SPOOLS_DS
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3572-gb118a70
The branch, v3-2-test has been updated via b118a70a9fc96e8ae5e51ebc8abc9076b07fdf27 (commit) from 0b0b0499f0ba60cfff943fa2200a6534c0a3f816 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit b118a70a9fc96e8ae5e51ebc8abc9076b07fdf27 Author: Karolin Seeger Date: Mon May 4 15:17:30 2009 +0200 s3/docs: Fix typo. Karolin (cherry picked from commit c2eb0d87a2436614741119ebd14fda05b42a2ddd) (cherry picked from commit 98c238a54dbe3e64262252a9fb38b382c53c1bcf) --- Summary of changes: .../Samba3-ByExample/SBE-KerberosFastStart.xml |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml b/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml index b593eed..7f2ac4b 100644 --- a/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml +++ b/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml @@ -1368,8 +1368,10 @@ - A user opens a Work document from a network drive. The file was owned by user janetp + A user opens a Word document from a network drive. The file was owned by user janetp and users, and was set read/write-enabled for everyone. + A user opens a Word document from a network drive. The file was owned by user janetp + and users, and was set read/write-enabled for everyone. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-869-gc2eb0d8
The branch, v3-4-test has been updated via c2eb0d87a2436614741119ebd14fda05b42a2ddd (commit) from 7ad42cc74322a1435c9cce9b286b13cd9b490ec6 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit c2eb0d87a2436614741119ebd14fda05b42a2ddd Author: Karolin Seeger Date: Mon May 4 15:17:30 2009 +0200 s3/docs: Fix typo. Karolin --- Summary of changes: .../Samba3-ByExample/SBE-KerberosFastStart.xml |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml b/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml index b593eed..7f2ac4b 100644 --- a/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml +++ b/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml @@ -1368,8 +1368,10 @@ - A user opens a Work document from a network drive. The file was owned by user janetp + A user opens a Word document from a network drive. The file was owned by user janetp and users, and was set read/write-enabled for everyone. + A user opens a Word document from a network drive. The file was owned by user janetp + and users, and was set read/write-enabled for everyone. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-168-g4d569a5
The branch, v3-0-test has been updated via 4d569a5bcdf7549daa5f8be7a7006c296f8a35ea (commit) from e0eb78298e63c8dafbee9dea27a4e5f2150a4807 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit 4d569a5bcdf7549daa5f8be7a7006c296f8a35ea Author: Karolin Seeger Date: Mon May 4 15:17:30 2009 +0200 s3/docs: Fix typo. Karolin (cherry picked from commit c2eb0d87a2436614741119ebd14fda05b42a2ddd) (cherry picked from commit 98c238a54dbe3e64262252a9fb38b382c53c1bcf) (cherry picked from commit b118a70a9fc96e8ae5e51ebc8abc9076b07fdf27) --- Summary of changes: .../Samba3-ByExample/SBE-KerberosFastStart.xml |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml b/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml index b593eed..7f2ac4b 100644 --- a/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml +++ b/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml @@ -1368,8 +1368,10 @@ - A user opens a Work document from a network drive. The file was owned by user janetp + A user opens a Word document from a network drive. The file was owned by user janetp and users, and was set read/write-enabled for everyone. + A user opens a Word document from a network drive. The file was owned by user janetp + and users, and was set read/write-enabled for everyone. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5243-g98c238a
The branch, v3-3-test has been updated via 98c238a54dbe3e64262252a9fb38b382c53c1bcf (commit) from 151042f5b348c6eb7bcc702193fb046305630116 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 98c238a54dbe3e64262252a9fb38b382c53c1bcf Author: Karolin Seeger Date: Mon May 4 15:17:30 2009 +0200 s3/docs: Fix typo. Karolin (cherry picked from commit c2eb0d87a2436614741119ebd14fda05b42a2ddd) --- Summary of changes: .../Samba3-ByExample/SBE-KerberosFastStart.xml |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml b/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml index b593eed..7f2ac4b 100644 --- a/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml +++ b/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml @@ -1368,8 +1368,10 @@ - A user opens a Work document from a network drive. The file was owned by user janetp + A user opens a Word document from a network drive. The file was owned by user janetp and users, and was set read/write-enabled for everyone. + A user opens a Word document from a network drive. The file was owned by user janetp + and users, and was set read/write-enabled for everyone. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3573-g4371364
The branch, v3-2-test has been updated
via 437136465e52a893a3f866bda40d4c9d812693d9 (commit)
from b118a70a9fc96e8ae5e51ebc8abc9076b07fdf27 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 437136465e52a893a3f866bda40d4c9d812693d9
Author: Karolin Seeger
Date: Mon May 4 15:54:34 2009 +0200
s3/packaging: Add keyutils-devel to build requires.
This should fiy bug #5853. Thanks to D.L. Meyer
for reporting.
Karolin
(cherry picked from commit d8de7e3193143ec50d86adc704123ca240a8f549)
(cherry picked from commit c89c2db8c51bd3cede2e2e8fb58214971eda4129)
---
Summary of changes:
packaging/RHEL/samba.spec.tmpl |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 071fe87..f7c980f 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -28,7 +28,7 @@ Provides: samba = %{version}
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel,
openldap-devel, krb5-devel, cups-devel
+BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel,
openldap-devel, krb5-devel, cups-devel, keyutils-devel
# Working around perl dependency problem from docs
%define __perl_requires %{SOURCE998}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5244-gc89c2db
The branch, v3-3-test has been updated
via c89c2db8c51bd3cede2e2e8fb58214971eda4129 (commit)
from 98c238a54dbe3e64262252a9fb38b382c53c1bcf (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit c89c2db8c51bd3cede2e2e8fb58214971eda4129
Author: Karolin Seeger
Date: Mon May 4 15:54:34 2009 +0200
s3/packaging: Add keyutils-devel to build requires.
This should fiy bug #5853. Thanks to D.L. Meyer
for reporting.
Karolin
(cherry picked from commit d8de7e3193143ec50d86adc704123ca240a8f549)
---
Summary of changes:
packaging/RHEL/samba.spec.tmpl |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index d5e549b..d3724d9 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -28,7 +28,7 @@ Provides: samba = %{version}
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel,
openldap-devel, krb5-devel, cups-devel
+BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel,
openldap-devel, krb5-devel, cups-devel, keyutils-devel
# Working around perl dependency problem from docs
%define __perl_requires %{SOURCE998}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1428-gd8de7e3
The branch, master has been updated
via d8de7e3193143ec50d86adc704123ca240a8f549 (commit)
from ca7304dc22f0820251cba58054b84ae26cc23765 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d8de7e3193143ec50d86adc704123ca240a8f549
Author: Karolin Seeger
Date: Mon May 4 15:54:34 2009 +0200
s3/packaging: Add keyutils-devel to build requires.
This should fiy bug #5853. Thanks to D.L. Meyer
for reporting.
Karolin
---
Summary of changes:
packaging/RHEL/samba.spec.tmpl |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index d5e549b..d3724d9 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -28,7 +28,7 @@ Provides: samba = %{version}
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel,
openldap-devel, krb5-devel, cups-devel
+BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel,
openldap-devel, krb5-devel, cups-devel, keyutils-devel
# Working around perl dependency problem from docs
%define __perl_requires %{SOURCE998}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1427-gca7304d
The branch, master has been updated via ca7304dc22f0820251cba58054b84ae26cc23765 (commit) from 7070256f5e292eb252e9ee3b5150190105dab276 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ca7304dc22f0820251cba58054b84ae26cc23765 Author: Karolin Seeger Date: Mon May 4 15:17:30 2009 +0200 s3/docs: Fix typo. Karolin --- Summary of changes: .../Samba3-ByExample/SBE-KerberosFastStart.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml b/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml index 4fef217..8f3fc9a 100644 --- a/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml +++ b/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml @@ -1370,7 +1370,7 @@ - A user opens a Work document from a network drive. The file was owned by user janetp + A user opens a Word document from a network drive. The file was owned by user janetp and users, and was set read/write-enabled for everyone. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-868-g7ad42cc
The branch, v3-4-test has been updated
via 7ad42cc74322a1435c9cce9b286b13cd9b490ec6 (commit)
from 8c7afce8bb86cda773c713459bb18233dc4848a3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 7ad42cc74322a1435c9cce9b286b13cd9b490ec6
Author: Volker Lendecke
Date: Mon May 4 14:39:56 2009 +0200
Do not crash in ctdbd_traverse if ctdbd is not around
---
Summary of changes:
source3/lib/ctdbd_conn.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 88d82ca..dde3775 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -1101,6 +1101,11 @@ NTSTATUS ctdbd_traverse(uint32 db_id,
struct ctdbd_traverse_state state;
status = ctdbd_init_connection(NULL, &conn);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("ctdbd_init_connection failed: %s\n",
+ nt_errstr(status)));
+ return status;
+ }
t.db_id = db_id;
t.srvid = conn->rand_srvid;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1426-g7070256
The branch, master has been updated
via 7070256f5e292eb252e9ee3b5150190105dab276 (commit)
from 796764d92ba0afe2306f4955730e6afb80cb2eb7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7070256f5e292eb252e9ee3b5150190105dab276
Author: Volker Lendecke
Date: Mon May 4 14:39:56 2009 +0200
Do not crash in ctdbd_traverse if ctdbd is not around
---
Summary of changes:
source3/lib/ctdbd_conn.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 88d82ca..dde3775 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -1101,6 +1101,11 @@ NTSTATUS ctdbd_traverse(uint32 db_id,
struct ctdbd_traverse_state state;
status = ctdbd_init_connection(NULL, &conn);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("ctdbd_init_connection failed: %s\n",
+ nt_errstr(status)));
+ return status;
+ }
t.db_id = db_id;
t.srvid = conn->rand_srvid;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3571-g0b0b049
The branch, v3-2-test has been updated
via 0b0b0499f0ba60cfff943fa2200a6534c0a3f816 (commit)
from 07835177469d7699a478014f7a4a556684705bb6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 0b0b0499f0ba60cfff943fa2200a6534c0a3f816
Author: Günther Deschner
Date: Wed Apr 29 01:55:09 2009 +0200
3.2 samr bug 6301: fix samr_ConnectVersion enum which is 32bit not 16bit.
Port of 67ca76c288eb095ae to 3.2
Signed-off-by: Volker Lendecke
---
Summary of changes:
source/librpc/gen_ndr/ndr_samr.c |6 +++---
source/librpc/idl/samr.idl |2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c
index bd87a50..62676d2 100644
--- a/source/librpc/gen_ndr/ndr_samr.c
+++ b/source/librpc/gen_ndr/ndr_samr.c
@@ -4430,14 +4430,14 @@ _PUBLIC_ void ndr_print_samr_PwInfo(struct ndr_print
*ndr, const char *name, con
static enum ndr_err_code ndr_push_samr_ConnectVersion(struct ndr_push *ndr,
int ndr_flags, enum samr_ConnectVersion r)
{
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
return NDR_ERR_SUCCESS;
}
static enum ndr_err_code ndr_pull_samr_ConnectVersion(struct ndr_pull *ndr,
int ndr_flags, enum samr_ConnectVersion *r)
{
- uint16_t v;
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &v));
+ uint32_t v;
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
*r = v;
return NDR_ERR_SUCCESS;
}
diff --git a/source/librpc/idl/samr.idl b/source/librpc/idl/samr.idl
index b8337fd..f9b3a69 100644
--- a/source/librpc/idl/samr.idl
+++ b/source/librpc/idl/samr.idl
@@ -1246,7 +1246,7 @@ import "misc.idl", "lsa.idl", "security.idl";
//
/* Function0x3e */
- typedef enum {
+ typedef [v1_enum] enum {
SAMR_CONNECT_PRE_W2K= 1,
SAMR_CONNECT_W2K= 2,
SAMR_CONNECT_AFTER_W2K = 3
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5242-g151042f
The branch, v3-3-test has been updated
via 151042f5b348c6eb7bcc702193fb046305630116 (commit)
from 226620d0ed221da983b4f662fcef14906588f1bd (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 151042f5b348c6eb7bcc702193fb046305630116
Author: Günther Deschner
Date: Wed Apr 29 01:55:09 2009 +0200
3.3 samr bug 6301: fix samr_ConnectVersion enum which is 32bit not 16bit.
Port of 67ca76c288eb095ae to 3.3
Signed-off-by: Volker Lendecke
---
Summary of changes:
source/librpc/gen_ndr/ndr_samr.c |6 +++---
source/librpc/idl/samr.idl |2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c
index c82078f..ae3605b 100644
--- a/source/librpc/gen_ndr/ndr_samr.c
+++ b/source/librpc/gen_ndr/ndr_samr.c
@@ -4430,14 +4430,14 @@ _PUBLIC_ void ndr_print_samr_PwInfo(struct ndr_print
*ndr, const char *name, con
static enum ndr_err_code ndr_push_samr_ConnectVersion(struct ndr_push *ndr,
int ndr_flags, enum samr_ConnectVersion r)
{
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
return NDR_ERR_SUCCESS;
}
static enum ndr_err_code ndr_pull_samr_ConnectVersion(struct ndr_pull *ndr,
int ndr_flags, enum samr_ConnectVersion *r)
{
- uint16_t v;
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &v));
+ uint32_t v;
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
*r = v;
return NDR_ERR_SUCCESS;
}
diff --git a/source/librpc/idl/samr.idl b/source/librpc/idl/samr.idl
index 9e933a5..4a36ae1 100644
--- a/source/librpc/idl/samr.idl
+++ b/source/librpc/idl/samr.idl
@@ -1370,7 +1370,7 @@ import "misc.idl", "lsa.idl", "security.idl";
//
/* Function0x3e */
- typedef enum {
+ typedef [v1_enum] enum {
SAMR_CONNECT_PRE_W2K= 1,
SAMR_CONNECT_W2K= 2,
SAMR_CONNECT_AFTER_W2K = 3
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-867-g8c7afce
The branch, v3-4-test has been updated
via 8c7afce8bb86cda773c713459bb18233dc4848a3 (commit)
from 70231f2d88b96da365e56c8d077749366509a4e1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 8c7afce8bb86cda773c713459bb18233dc4848a3
Author: Volker Lendecke
Date: Mon May 4 12:36:13 2009 +0200
Increase debug level of "create_connection_server_info failed" message
I don't think we should unconditionally send every refused connection
attempt
to a share to syslog, that's where all debug level 0 messages end up.
---
Summary of changes:
source3/smbd/service.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index ab2371c..fc59744 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -668,7 +668,7 @@ static connection_struct *make_connection_snum(int snum,
user_struct *vuser,
&conn->server_info);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("create_connection_server_info failed: %s\n",
+ DEBUG(1, ("create_connection_server_info failed: %s\n",
nt_errstr(status)));
*pstatus = status;
conn_free(conn);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1425-g796764d
The branch, master has been updated
via 796764d92ba0afe2306f4955730e6afb80cb2eb7 (commit)
from fe839b65a7b4e8d5e085287b7d33ee1f970fe7c2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 796764d92ba0afe2306f4955730e6afb80cb2eb7
Author: Volker Lendecke
Date: Mon May 4 12:36:13 2009 +0200
Increase debug level of "create_connection_server_info failed" message
I don't think we should unconditionally send every refused connection
attempt
to a share to syslog, that's where all debug level 0 messages end up.
---
Summary of changes:
source3/smbd/service.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index c66a4d3..bc07f0b 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -668,7 +668,7 @@ static connection_struct *make_connection_snum(int snum,
user_struct *vuser,
&conn->server_info);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("create_connection_server_info failed: %s\n",
+ DEBUG(1, ("create_connection_server_info failed: %s\n",
nt_errstr(status)));
*pstatus = status;
conn_free(conn);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1424-gfe839b6
The branch, master has been updated via fe839b65a7b4e8d5e085287b7d33ee1f970fe7c2 (commit) from 9271dc5f7eb3e18021e27f334837d28b921db8e5 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit fe839b65a7b4e8d5e085287b7d33ee1f970fe7c2 Author: Günther Deschner Date: Fri May 1 02:17:23 2009 +0200 s3-printing: Fix driver upload for Xerox 4110 PS printer driver. We need to allow to set filesystem capabilities from the default vfs in create_conn_struct() in order to find mixed-case filenames. Thanks Volker! This one was hard to find, so a little longer explanation: When a Windows client tries to upload e.g. the Xerox 4110 PS driver, the client first uploads the driver files to the [print$] share. Some of them (in this case the Windows Postscript drivers) are with uppercase filenames while some of them (like the PPD file) are in lowercase. After the driver upload the client issues the spoolss_AddPrinterDriverEx() call with level 6. There the client tries to add the PPD file with an uppercase filename (while having stored it in lowercase on the server). The internal spoolss add driver functions then could not find the appropriate filename while trying to move them to the version subdirectory (in this case W32X86/3) and fails then entire spoolss_AddPrinterDriverEx() call. With this fix, the convert_unix_name() name finds the correct file and the spoolss_AddPrinterDriverEx() succeeds. Guenther --- Summary of changes: source3/smbd/msdfs.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c index 4d692cd..7bd32e8 100644 --- a/source3/smbd/msdfs.c +++ b/source3/smbd/msdfs.c @@ -272,6 +272,8 @@ NTSTATUS create_conn_struct(TALLOC_CTX *ctx, return status; } + conn->fs_capabilities = SMB_VFS_FS_CAPABILITIES(conn); + /* * Windows seems to insist on doing trans2getdfsreferral() calls on * the IPC$ share as the anonymous user. If we try to chdir as that -- Samba Shared Repository
svn commit: samba-web r1293 - in trunk/docs: .
Author: kseeger Date: 2009-05-04 07:53:18 + (Mon, 04 May 2009) New Revision: 1293 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1293 Log: Remove broken Dilbert link. This was reported by angelica [at] ahazelton.com on the samba mailing list. Karolin Modified: trunk/docs/SambaIntro.html Changeset: Modified: trunk/docs/SambaIntro.html === --- trunk/docs/SambaIntro.html 2009-04-30 09:35:36 UTC (rev 1292) +++ trunk/docs/SambaIntro.html 2009-05-04 07:53:18 UTC (rev 1293) @@ -62,9 +62,7 @@ The commercialization of the Internet over the past few years has created something of a modern melting pot. It has brought business-folk and technologists closer together than was previously -thought possible, helping to raise the popularity of the http://www.unitedmedia.com/comics/dilbert/";>Dilbert® -comic strip to dizzying levels. As a side effect, Windows and Unix +thought possible. As a side effect, Windows and Unix systems have been invading each others' turf, and people expect that they will not only play together nicely, but that they will share.
