[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 19c68f8 s3:idmap_autorid: fix freeing of non-talloced memory
(uninitialized pointer) (bug #9653)
from a64a617 Add a herald with version string to smbtorture
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 19c68f80251f443016e505c5cf87f697fb552e8c
Author: Michael Adam ob...@samba.org
Date: Mon Feb 11 22:52:55 2013 +0100
s3:idmap_autorid: fix freeing of non-talloced memory (uninitialized
pointer) (bug #9653)
Signed-off-by: Michael Adam ob...@samba.org
Reviewed-by: Stefan Metzmacher me...@samba.org
Autobuild-User(master): Stefan Metzmacher me...@samba.org
Autobuild-Date(master): Wed Feb 13 09:51:53 CET 2013 on sn-devel-104
---
Summary of changes:
source3/winbindd/idmap_autorid.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index b7b1689..0747916 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -244,7 +244,7 @@ static NTSTATUS idmap_autorid_id_to_sid(struct
autorid_global_config *cfg,
struct id_map *map)
{
uint32_t range;
- TDB_DATA data;
+ TDB_DATA data = tdb_null;
char *keystr;
struct dom_sid sid;
NTSTATUS status;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via d21280f Fix bug 9519 - Samba returns unexpected error on SMB posix open. from 872a7d6 s3: Make SMB2_GETINFO multi-volume aware. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit d21280f983249038bf7efda4edc1b1eadaff546a Author: Jeremy Allison j...@samba.org Date: Tue Feb 12 10:48:09 2013 -0800 Fix bug 9519 - Samba returns unexpected error on SMB posix open. Explicitly ignore bare O_EXCL flags instead of returning INVALID_PARAMETER. That's what the Linux kernel does. Signed-off-by: Jeremy Allison j...@samba.org --- Summary of changes: source3/smbd/trans2.c | 11 +-- 1 files changed, 9 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index f9e8809..df4fa64 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -7337,12 +7337,19 @@ static NTSTATUS smb_posix_open(connection_struct *conn, /* File exists open. File not exist create. */ create_disp = FILE_OPEN_IF; break; + case SMB_O_EXCL: + /* O_EXCL on its own without O_CREAT is undefined. + We deliberately ignore it as some versions of + Linux CIFSFS can send a bare O_EXCL on the + wire which other filesystems in the kernel + ignore. See bug 9519 for details. */ + + /* Fallthrough. */ + case 0: /* File exists open. File not exist fail. */ create_disp = FILE_OPEN; break; - case SMB_O_EXCL: - /* O_EXCL on its own without O_CREAT is undefined. */ default: DEBUG(5,(smb_posix_open: invalid create mode 0x%x\n, (unsigned int)wire_open_mode )); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via 1c74a7d Fix bug 9519 - Samba returns unexpected error on SMB posix open. from 4096d6c s3: Make SMB2_GETINFO multi-volume aware. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit 1c74a7da6b0d1897e4a6f06e925c7a6e801d226e Author: Jeremy Allison j...@samba.org Date: Tue Feb 12 10:48:09 2013 -0800 Fix bug 9519 - Samba returns unexpected error on SMB posix open. Explicitly ignore bare O_EXCL flags instead of returning INVALID_PARAMETER. That's what the Linux kernel does. Signed-off-by: Jeremy Allison j...@samba.org Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org Autobuild-Date(v4-0-test): Wed Feb 13 21:13:52 CET 2013 on sn-devel-104 --- Summary of changes: source3/smbd/trans2.c | 11 +-- 1 files changed, 9 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 6f3dc4e..062af25 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -7411,12 +7411,19 @@ static NTSTATUS smb_posix_open(connection_struct *conn, /* File exists open. File not exist create. */ create_disp = FILE_OPEN_IF; break; + case SMB_O_EXCL: + /* O_EXCL on its own without O_CREAT is undefined. + We deliberately ignore it as some versions of + Linux CIFSFS can send a bare O_EXCL on the + wire which other filesystems in the kernel + ignore. See bug 9519 for details. */ + + /* Fallthrough. */ + case 0: /* File exists open. File not exist fail. */ create_disp = FILE_OPEN; break; - case SMB_O_EXCL: - /* O_EXCL on its own without O_CREAT is undefined. */ default: DEBUG(5,(smb_posix_open: invalid create mode 0x%x\n, (unsigned int)wire_open_mode )); -- Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-2.1-24-ge204fac
The branch, master has been updated
via e204fac03412520e877ab04363b3ece02667c55b (commit)
via 053b89c6dbce47001505524606889334559d2ec4 (commit)
from 00db5fa00474f8a83f1aa3b603fd756cc9b49ff4 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit e204fac03412520e877ab04363b3ece02667c55b
Author: Amitay Isaacs ami...@gmail.com
Date: Mon Feb 11 13:23:47 2013 +1100
ctdbd: Fix the PullDBPreallocation size to 10MB as intended
In 1f262deaad0818f159f9c68330f7fec121679023, Ronnie changed recovery code
to allocate chunks of 10MB in traverse_pulldb() and traverse_recdb(). The
tunable PullDBPreallocation size was set to 100MB.
Signed-off-by: Amitay Isaacs ami...@gmail.com
commit 053b89c6dbce47001505524606889334559d2ec4
Author: Amitay Isaacs ami...@gmail.com
Date: Mon Feb 11 11:25:49 2013 +1100
eventscripts: Remove calls to smbstatus -np for samba cleanup
This is an artifact from older versions of Samba. In the newer versions of
Samba, smbstatus -np command does not do anything useful, but causes a
traverse in CTDB which is expensive and causes CPU utilization to shoot up.
Signed-off-by: Amitay Isaacs ami...@gmail.com
---
Summary of changes:
config/events.d/50.samba | 32 +++-
server/ctdb_tunables.c |2 +-
2 files changed, 4 insertions(+), 30 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index ecbe05e..ccc6864 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -68,11 +68,6 @@ service_stop ()
fi
}
-# set default samba cleanup period - in minutes
-[ -z $SAMBA_CLEANUP_PERIOD ] {
-SAMBA_CLEANUP_PERIOD=10
-}
-
# we keep a cached copy of smb.conf here
smbconf_cache=$service_state_dir/smb.conf.cache
@@ -152,15 +147,6 @@ list_samba_shares ()
###
-# periodic cleanup function
-periodic_cleanup() {
-# running smbstatus scrubs any dead entries from the connections
-# and sessionid database
-# echo Running periodic cleanup of samba databases
-smbstatus -np /dev/null 21
-}
-
-###
ctdb_start_stop_service
@@ -170,28 +156,16 @@ ctdb_service_check_reconfigure
###
-case $1 in
+case $1 in
startup)
ctdb_service_start
;;
-
+
shutdown)
ctdb_service_stop
;;
monitor)
- # Create a dummy file to track when we need to do periodic cleanup
- # of samba databases
- periodic_cleanup_file=$service_state_dir/periodic_cleanup
- [ -f $periodic_cleanup_file ] || {
- touch $periodic_cleanup_file
- }
- [ `find $periodic_cleanup_file -mmin +$SAMBA_CLEANUP_PERIOD | wc -l`
-eq 1 ] {
- # Cleanup the databases
- periodic_cleanup
- touch $periodic_cleanup_file
- }
-
if [ $CTDB_SAMBA_SKIP_SHARE_CHECK != yes ] ; then
testparm_background_update
@@ -200,7 +174,7 @@ case $1 in
testparm_cat | egrep '^WARNING|^ERROR|^Unknown' \
die ERROR: testparm shows smb.conf is not clean
}
-
+
list_samba_shares | ctdb_check_directories_probe || {
testparm_foreground_update
list_samba_shares |
diff --git a/server/ctdb_tunables.c b/server/ctdb_tunables.c
index b86d6d2..aa3115d 100644
--- a/server/ctdb_tunables.c
+++ b/server/ctdb_tunables.c
@@ -83,7 +83,7 @@ static const struct {
{ DBRecordCountWarn,10, offsetof(struct ctdb_tunable,
db_record_count_warn), false },
{ DBRecordSizeWarn, 1000, offsetof(struct ctdb_tunable,
db_record_size_warn), false },
{ DBSizeWarn,1, offsetof(struct ctdb_tunable,
db_size_warn), false },
- { PullDBPreallocation, 10*1024*10240, offsetof(struct ctdb_tunable,
pulldb_preallocation_size), false },
+ { PullDBPreallocation, 10*1024*1024, offsetof(struct ctdb_tunable,
pulldb_preallocation_size), false },
{ NoIPTakeoverOnDisabled,0, offsetof(struct ctdb_tunable,
no_ip_takeover_on_disabled), false },
{ DeadlockTimeout,300, offsetof(struct ctdb_tunable,
deadlock_timeout), false },
{ Samba3AvoidDeadlocks, 0, offsetof(struct ctdb_tunable,
samba3_hack), false },
--
CTDB repository
