[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 2973532 s3: Add some const from bfbfcd1 s3:torture: test smb2cli_logoff and smb2cli_tdis http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 29735327f69d886051646a98f70df9b349b53308 Author: Volker Lendecke v...@samba.org Date: Fri Nov 25 08:45:26 2011 +0100 s3: Add some const Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Fri Nov 25 10:21:07 CET 2011 on sn-devel-104 --- Summary of changes: source3/include/proto.h |4 ++-- source3/libsmb/trustdom_cache.c |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index 0228120..2d61ef4 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1127,8 +1127,8 @@ WERROR map_werror_from_unix(int error); bool trustdom_cache_enable(void); bool trustdom_cache_shutdown(void); -bool trustdom_cache_store(char* name, char* alt_name, const struct dom_sid *sid, - time_t timeout); +bool trustdom_cache_store(const char *name, const char *alt_name, + const struct dom_sid *sid, time_t timeout); bool trustdom_cache_fetch(const char* name, struct dom_sid* sid); uint32 trustdom_cache_fetch_timestamp( void ); bool trustdom_cache_store_timestamp( uint32 t, time_t timeout ); diff --git a/source3/libsmb/trustdom_cache.c b/source3/libsmb/trustdom_cache.c index 95ea3da..8789d30 100644 --- a/source3/libsmb/trustdom_cache.c +++ b/source3/libsmb/trustdom_cache.c @@ -100,8 +100,8 @@ static char* trustdom_cache_key(const char* name) * false if store attempt failed **/ -bool trustdom_cache_store(char* name, char* alt_name, const struct dom_sid *sid, - time_t timeout) +bool trustdom_cache_store(const char *name, const char *alt_name, + const struct dom_sid *sid, time_t timeout) { char *key, *alt_key; fstring sid_string; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 47a94f7 s3: user_domain is not used in wb_getpwsid from 2973532 s3: Add some const http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 47a94f7f817cf03f6f165127845b1685542ea4e5 Author: Volker Lendecke v...@samba.org Date: Thu Nov 24 10:58:52 2011 +0100 s3: user_domain is not used in wb_getpwsid Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Fri Nov 25 13:23:30 CET 2011 on sn-devel-104 --- Summary of changes: source3/winbindd/wb_getpwsid.c |7 --- 1 files changed, 0 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c index 3c942f0..5bd384b 100644 --- a/source3/winbindd/wb_getpwsid.c +++ b/source3/winbindd/wb_getpwsid.c @@ -23,7 +23,6 @@ #include ../libcli/security/security.h struct wb_getpwsid_state { - struct winbindd_domain *user_domain; struct tevent_context *ev; struct dom_sid sid; struct wbint_userinfo *userinfo; @@ -50,12 +49,6 @@ struct tevent_req *wb_getpwsid_send(TALLOC_CTX *mem_ctx, state-ev = ev; state-pw = pw; - state-user_domain = find_domain_from_sid_noinit(user_sid); - if (state-user_domain == NULL) { - tevent_req_nterror(req, NT_STATUS_NO_SUCH_USER); - return tevent_req_post(req, ev); - } - subreq = wb_queryuser_send(state, ev, state-sid); if (tevent_req_nomem(subreq, req)) { return tevent_req_post(req, ev); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 37f7a2c s3:locking:posix: remove uses of SMB_ASSERT() from get_windows_lock_ref_count() via 95e686d s3:locking:posix: adapt use of dbrwrap_fetch() to new NTSTATUS semantics via 3a2fd7c s3:registry: write INFO/version if we create registry.tdb via a719ce7 s3:dbwrap: do not burden the user of db_open_ctdb with ifdef voodoo via 90eb2eb s3:lib fix output of hex escapes 0x7F with cbuf_print_quoted (cherry picked from commit a1fcb7e37a23dcc035686486d4afe32a67082ae1) via 2d9b401 s3:net registry check: improve console output via 9b42b8a socket_wrapper: use libreplace headers based on #ifdef HAVE_LIBREPLACE via 87026b6 socket_wrapper: simplify include path for replace.h from 47a94f7 s3: user_domain is not used in wb_getpwsid http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 37f7a2c82d76fd5b9997686d8cbf1cf8a2180aac Author: Michael Adam ob...@samba.org Date: Thu Nov 10 23:11:54 2011 +0100 s3:locking:posix: remove uses of SMB_ASSERT() from get_windows_lock_ref_count() SMB_ASSERT is useless, since in non-developer build it does not actually fail after the log message, but usual flow just continues. Autobuild-User: Michael Adam ob...@samba.org Autobuild-Date: Fri Nov 25 14:59:53 CET 2011 on sn-devel-104 commit 95e686d59c2e712b4e030c770a37dde18837e222 Author: Michael Adam ob...@samba.org Date: Thu Nov 10 22:55:28 2011 +0100 s3:locking:posix: adapt use of dbrwrap_fetch() to new NTSTATUS semantics commit 3a2fd7c0e213e0fefed40eaa31a2282b126f2be4 Author: Gregor Beck gb...@sernet.de Date: Mon Nov 7 13:31:26 2011 +0100 s3:registry: write INFO/version if we create registry.tdb Signed-off-by: Michael Adam ob...@samba.org commit a719ce7c11c2c8c8b006c94b4559ef5e8addbc1a Author: Gregor Beck gb...@sernet.de Date: Tue Oct 25 16:32:12 2011 +0200 s3:dbwrap: do not burden the user of db_open_ctdb with ifdef voodoo Signed-off-by: Michael Adam ob...@samba.org commit 90eb2eb1789e430b4ad8c849d7df99f5d8315a06 Author: Gregor Beck gb...@sernet.de Date: Fri Oct 21 10:49:45 2011 +0200 s3:lib fix output of hex escapes 0x7F with cbuf_print_quoted (cherry picked from commit a1fcb7e37a23dcc035686486d4afe32a67082ae1) commit 2d9b4015d6835fa9b83f9945cb94ca289c5ab5c7 Author: Gregor Beck gb...@sernet.de Date: Fri Oct 21 15:32:27 2011 +0200 s3:net registry check: improve console output Signed-off-by: Michael Adam ob...@samba.org commit 9b42b8a346b80ff5df9125c2ba27315ef3bc57e5 Author: Michael Adam ob...@samba.org Date: Sun Nov 20 23:45:05 2011 +0100 socket_wrapper: use libreplace headers based on #ifdef HAVE_LIBREPLACE instead of #ifdef _SAMBA_BUILD_. This is to be able to use socket_wrapper in other projects that also use libreplace. commit 87026b6dc360d7caf5dcc0f49d67f51e924314fe Author: Michael Adam ob...@samba.org Date: Fri Nov 18 15:37:07 2011 +0100 socket_wrapper: simplify include path for replace.h --- Summary of changes: lib/socket_wrapper/socket_wrapper.c | 10 ++ source3/lib/cbuf.c |2 +- source3/lib/dbwrap/dbwrap_ctdb.c| 13 + source3/lib/dbwrap/dbwrap_ctdb.h|3 --- source3/locking/posix.c | 30 +- source3/registry/reg_backend_db.c |7 +++ source3/utils/net_registry_check.c | 11 --- 7 files changed, 56 insertions(+), 20 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c index a54f50f..2c24ab7 100644 --- a/lib/socket_wrapper/socket_wrapper.c +++ b/lib/socket_wrapper/socket_wrapper.c @@ -39,15 +39,17 @@ is set. */ -#ifdef _SAMBA_BUILD_ +#include config.h + +#ifdef HAVE_LIBREPLACE #define SOCKET_WRAPPER_NOT_REPLACE -#include ../replace/replace.h +#include replace.h #include system/network.h #include system/filesys.h #include system/time.h -#else /* _SAMBA_BUILD_ */ +#else /* HAVE_LIBREPLACE */ #include sys/types.h #include sys/time.h @@ -66,7 +68,7 @@ #include stdio.h #include stdint.h -#endif +#endif /* HAVE_LIBREPLACE */ #ifndef _PUBLIC_ #define _PUBLIC_ diff --git a/source3/lib/cbuf.c b/source3/lib/cbuf.c index 42353f8..611aa80 100644 --- a/source3/lib/cbuf.c +++ b/source3/lib/cbuf.c @@ -306,7 +306,7 @@ int cbuf_print_quoted(cbuf* ost, const char* s, size_t len) if (isprint(*s) ((*s == ' ') || !isspace(*s))) { ret = cbuf_putc(ost, *s); } else { - ret = cbuf_printf(ost, \\%02x, *s); + ret = cbuf_printf(ost, \\%02x, (uchar)*s); }
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via a64f88f s3-winbind: Don't fail on users without a uid. from 3651471 lib/util/ Fix crash bug caused by gfree_debug() http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit a64f88f4e97f0f9c006fe6f0cefc0a61efc1ca98 Author: Andreas Schneider a...@samba.org Date: Mon Nov 14 10:01:31 2011 +0100 s3-winbind: Don't fail on users without a uid. This fixes bug #8608. If you join samba with idmap_ad backend to an AD. When you try to enumerate users with 'getent passwd' and the user doesn't have a uid set, then getent is aborted cause of NT_STATUS_NONE_MAPPED. If we can't map a user we should not stop but continue enumerating users. This normally happens with the default user 'krbtgt' with idmap_ad but could also happen with other backends. Autobuild-User: Andreas Schneider a...@cryptomilk.org Autobuild-Date: Tue Nov 15 16:52:04 CET 2011 on sn-devel-104 (backported from commit 10b285ccc29b106f164a6c18116e237634867717) Signed-off-by: Andreas Schneider a...@samba.org --- Summary of changes: source3/winbindd/wb_next_pwent.c | 19 ++- 1 files changed, 18 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/winbindd/wb_next_pwent.c b/source3/winbindd/wb_next_pwent.c index da4754c..d47b2fc 100644 --- a/source3/winbindd/wb_next_pwent.c +++ b/source3/winbindd/wb_next_pwent.c @@ -148,7 +148,24 @@ static void wb_next_pwent_fill_done(struct tevent_req *subreq) status = wb_fill_pwent_recv(subreq); TALLOC_FREE(subreq); - if (tevent_req_nterror(req, status)) { + /* +* When you try to enumerate users with 'getent passwd' and the user +* doesn't have a uid set we should just move on. +*/ + if (NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) { + state-gstate-next_user += 1; + + subreq = wb_fill_pwent_send(state, + state-ev, + state-gstate-users[state-gstate-next_user], + state-pw); + if (tevent_req_nomem(subreq, req)) { + return; + } + tevent_req_set_callback(subreq, wb_next_pwent_fill_done, req); + + return; + } else if (tevent_req_nterror(req, status)) { return; } state-gstate-next_user += 1; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 6849353 s3-winbind: Don't fail on users without a uid. from 4efc4fc s3/packaging: Fix rpm build issues on RHEL4. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 6849353175d6623c3508f0dd955c7aace6cfc677 Author: Andreas Schneider a...@samba.org Date: Mon Nov 14 10:01:31 2011 +0100 s3-winbind: Don't fail on users without a uid. This fixes bug #8608. If you join samba with idmap_ad backend to an AD. When you try to enumerate users with 'getent passwd' and the user doesn't have a uid set, then getent is aborted cause of NT_STATUS_NONE_MAPPED. If we can't map a user we should not stop but continue enumerating users. This normally happens with the default user 'krbtgt' with idmap_ad but could also happen with other backends. Autobuild-User: Andreas Schneider a...@cryptomilk.org Autobuild-Date: Tue Nov 15 16:52:04 CET 2011 on sn-devel-104 (backported from commit 10b285ccc29b106f164a6c18116e237634867717) Signed-off-by: Andreas Schneider a...@samba.org --- Summary of changes: source3/winbindd/wb_next_pwent.c | 19 ++- 1 files changed, 18 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/winbindd/wb_next_pwent.c b/source3/winbindd/wb_next_pwent.c index fbaaa48..e5b5e29 100644 --- a/source3/winbindd/wb_next_pwent.c +++ b/source3/winbindd/wb_next_pwent.c @@ -147,7 +147,24 @@ static void wb_next_pwent_fill_done(struct tevent_req *subreq) status = wb_fill_pwent_recv(subreq); TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { + /* +* When you try to enumerate users with 'getent passwd' and the user +* doesn't have a uid set we should just move on. +*/ + if (NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) { + state-gstate-next_user += 1; + + subreq = wb_fill_pwent_send(state, + state-ev, + state-gstate-users[state-gstate-next_user], + state-pw); + if (tevent_req_nomem(subreq, req)) { + return; + } + tevent_req_set_callback(subreq, wb_next_pwent_fill_done, req); + + return; + } else if (!NT_STATUS_IS_OK(status)) { tevent_req_nterror(req, status); return; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 10f4515 s3:libsmb: only align unicode pipe_name (bug #8586) from a64f88f s3-winbind: Don't fail on users without a uid. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 10f45157037edc528926ae7dc4a40909566c6480 Author: Stefan Metzmacher me...@samba.org Date: Fri Nov 18 08:40:18 2011 +0100 s3:libsmb: only align unicode pipe_name (bug #8586) metze (cherry picked from commit 48bcb8c846532ccd5489ef705182fb81c5278b04) --- Summary of changes: source3/libsmb/clitrans.c | 18 +++--- 1 files changed, 11 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c index 2f2801e..844ad2b 100644 --- a/source3/libsmb/clitrans.c +++ b/source3/libsmb/clitrans.c @@ -208,14 +208,18 @@ static void cli_trans_format(struct cli_trans_state *state, uint8_t *pwct, switch (cmd) { case SMBtrans: - pad[0] = 0; - iov[0].iov_base = (void *)pad; - iov[0].iov_len = 1; - iov[1].iov_base = (void *)state-pipe_name_conv; - iov[1].iov_len = state-pipe_name_conv_len; + if (cli_ucs2(state-cli)) { + pad[0] = 0; + iov[0].iov_base = (void *)pad; + iov[0].iov_len = 1; + param_offset += 1; + iov += 1; + } + iov[0].iov_base = (void *)state-pipe_name_conv; + iov[0].iov_len = state-pipe_name_conv_len; wct = 14 + state-num_setup; - param_offset += iov[0].iov_len + iov[1].iov_len; - iov += 2; + param_offset += iov[0].iov_len; + iov += 1; break; case SMBtrans2: pad[0] = 0; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 7db7ea6 Improve configure.in so it can be used outside the Samba source tree. from 10f4515 s3:libsmb: only align unicode pipe_name (bug #8586) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 7db7ea684a17b70ecae31c70c1b2e647ea0fafa1 Author: Richard Sharpe realrichardsha...@gmail.com Date: Mon Nov 14 07:47:38 2011 -0800 Improve configure.in so it can be used outside the Samba source tree. Autobuild-User: Richard Sharpe sha...@samba.org Autobuild-Date: Thu Nov 17 07:00:38 CET 2011 on sn-devel-104 (cherry picked from commit f50aa988c201c2fe78e467f1a419bedc741e1d31) Fix bug #8607 (The configure.in in examples/VFS does not easily allow building modules outside the Samba source tree). --- Summary of changes: examples/VFS/configure.in |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/examples/VFS/configure.in b/examples/VFS/configure.in index 4e9d465..9e30197 100644 --- a/examples/VFS/configure.in +++ b/examples/VFS/configure.in @@ -337,11 +337,11 @@ AC_CACHE_CHECK([whether building shared libraries actually works], ac_cv_shlib_works=no # try building a trivial shared library if test $PICSUFFIX = po; then - $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.po ${srcdir-.}/../../tests/shlib.c + $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.po ${SAMBA_SOURCE}/../tests/shlib.c $CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o shlib.$SHLIBEXT shlib.po ac_cv_shlib_works=yes else - $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.$PICSUFFIX ${srcdir-.}/../../tests/shlib.c + $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.$PICSUFFIX ${SAMBA_SOURCE}/../tests/shlib.c mv shlib.$PICSUFFIX shlib.po $CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o shlib.$SHLIBEXT shlib.po ac_cv_shlib_works=yes @@ -350,6 +350,7 @@ AC_CACHE_CHECK([whether building shared libraries actually works], ]) if test $ac_cv_shlib_works = no; then BLDSHARED=false + AC_MSG_WARN([[Did you forget to specify --with-samba-source=/path/to/samba?]]) fi fi -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 0a6d7a9 Improve configure.in so it can be used outside the Samba source tree. from 6849353 s3-winbind: Don't fail on users without a uid. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 0a6d7a9ff9c96771ac0d5ca8159c5a2246cae782 Author: Richard Sharpe realrichardsha...@gmail.com Date: Mon Nov 14 07:47:38 2011 -0800 Improve configure.in so it can be used outside the Samba source tree. Autobuild-User: Richard Sharpe sha...@samba.org Autobuild-Date: Thu Nov 17 07:00:38 CET 2011 on sn-devel-104 (cherry picked from commit f50aa988c201c2fe78e467f1a419bedc741e1d31) Fix bug #8607 (The configure.in in examples/VFS does not easily allow building modules outside the Samba source tree). (cherry picked from commit 7db7ea684a17b70ecae31c70c1b2e647ea0fafa1) --- Summary of changes: examples/VFS/configure.in |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/examples/VFS/configure.in b/examples/VFS/configure.in index 4e9d465..9e30197 100644 --- a/examples/VFS/configure.in +++ b/examples/VFS/configure.in @@ -337,11 +337,11 @@ AC_CACHE_CHECK([whether building shared libraries actually works], ac_cv_shlib_works=no # try building a trivial shared library if test $PICSUFFIX = po; then - $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.po ${srcdir-.}/../../tests/shlib.c + $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.po ${SAMBA_SOURCE}/../tests/shlib.c $CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o shlib.$SHLIBEXT shlib.po ac_cv_shlib_works=yes else - $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.$PICSUFFIX ${srcdir-.}/../../tests/shlib.c + $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.$PICSUFFIX ${SAMBA_SOURCE}/../tests/shlib.c mv shlib.$PICSUFFIX shlib.po $CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o shlib.$SHLIBEXT shlib.po ac_cv_shlib_works=yes @@ -350,6 +350,7 @@ AC_CACHE_CHECK([whether building shared libraries actually works], ]) if test $ac_cv_shlib_works = no; then BLDSHARED=false + AC_MSG_WARN([[Did you forget to specify --with-samba-source=/path/to/samba?]]) fi fi -- Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.12-47-g66af665
The branch, master has been updated via 66af6659eaffaeafbfa58779162aabe915d1c50f (commit) via 7d4809ba343114e435830c7c1ab047dc4ce5ff0e (commit) via 8d65d7f399ba2e6a4162eed5e84a58c7cb024187 (commit) via 99ce8a9de648babdfb1b1ea0219ee184c9718048 (commit) via 8dd377b6a4d188af086f9a5b41a1b48e44eda6f3 (commit) via 5e45a176031e973e97450296c28ddfb0a779e00b (commit) via 17bcffab19fdbb435b4745ff90c327342bbbf0f8 (commit) via 11bebd5367102fcd02b17c44ac87bf50d4c68785 (commit) via cc60df5a3edebfdf50fcd22ebfaad35736f90379 (commit) via 7420d9991e30575219c919ce2a8edce20ad3eb63 (commit) via b283be8658d6229314b9265ed8659d2cac573073 (commit) via add2506caf3340118be05a21b05dd71b822b1516 (commit) from 8959d15804bb5901356d7beec1ecddb1cabbca52 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 66af6659eaffaeafbfa58779162aabe915d1c50f Author: Michael Adam ob...@samba.org Date: Sat Sep 3 01:30:08 2011 +0200 build: add target libctdb.so.0 and symlink libctdb.so commit 7d4809ba343114e435830c7c1ab047dc4ce5ff0e Author: Michael Adam ob...@samba.org Date: Fri Nov 25 17:07:24 2011 +0100 build: add socket_wrapper objects to test binaries commit 8d65d7f399ba2e6a4162eed5e84a58c7cb024187 Author: Michael Adam ob...@samba.org Date: Thu Oct 20 14:17:45 2011 +0200 build: add option --enable-socket-wrapper to build binaries with socket wrapper support commit 99ce8a9de648babdfb1b1ea0219ee184c9718048 Author: Michael Adam ob...@samba.org Date: Thu Oct 20 14:17:25 2011 +0200 add socket_wrapper from samba commit 8dd377b6a4d188af086f9a5b41a1b48e44eda6f3 Author: Andreas Schneider a...@redhat.com Date: Fri Feb 19 12:44:07 2010 +0100 libutil: Remove obsolete signal type cast. commit 5e45a176031e973e97450296c28ddfb0a779e00b Author: Michael Adam ob...@samba.org Date: Fri Nov 25 16:29:44 2011 +0100 build: add libreplace network checks to configure commit 17bcffab19fdbb435b4745ff90c327342bbbf0f8 Author: Michael Adam ob...@samba.org Date: Fri Nov 25 16:36:40 2011 +0100 update lib/replace to current upstream version (samba master) commit 11bebd5367102fcd02b17c44ac87bf50d4c68785 Author: Michael Adam ob...@samba.org Date: Fri Nov 25 17:01:58 2011 +0100 system_linux: correctly cast sockaddr_in6 to sockaddr for sendto() in ctdb_sys_send_tcp() commit cc60df5a3edebfdf50fcd22ebfaad35736f90379 Author: Michael Adam ob...@samba.org Date: Fri Nov 25 16:59:51 2011 +0100 system_linux: correctly cast sockaddr_in to sockaddr in ctdb_sys_send_tcp() commit 7420d9991e30575219c919ce2a8edce20ad3eb63 Author: Michael Adam ob...@samba.org Date: Fri Nov 25 16:42:53 2011 +0100 logging: properly cast sockaddr_in to sockaddr for sendto() in ctdb_syslog_log() commit b283be8658d6229314b9265ed8659d2cac573073 Author: Michael Adam ob...@samba.org Date: Fri Nov 25 16:41:59 2011 +0100 logging: some whitespace cleanup in ctdb_syslog_log() commit add2506caf3340118be05a21b05dd71b822b1516 Author: Michael Adam ob...@samba.org Date: Fri Nov 25 16:40:52 2011 +0100 logging: properly cast sockaddr_in to sockaddr for bind in start_syslog_daemon() --- Summary of changes: Makefile.in| 24 +- common/system_linux.c |8 +- configure.ac |2 + lib/replace/Makefile | 63 + lib/replace/Makefile.in| 19 +- lib/replace/README | 17 +- lib/replace/autoconf-2.60.m4 | 50 +- lib/replace/{autogen.sh = autogen-autotools.sh} |0 lib/{tdb = replace}/build_macros.m4 |0 lib/replace/config.guess | 58 +- lib/replace/config.sub | 15 +- lib/replace/configure | 21 + lib/replace/configure.ac |9 + lib/replace/crypt.c| 770 ++ lib/replace/crypt.m4 |6 + lib/replace/dlfcn.c|3 + lib/replace/dlfcn.m4 |2 +- lib/replace/getaddrinfo.h |2 + lib/replace/getifaddrs.c | 110 +- lib/replace/getpass.c | 19 +- lib/replace/getpass.m4 | 18 +- lib/replace/hdr_replace.h |2 + lib/replace/inet_aton.c| 33 + lib/replace/inet_ntoa.c| 39 + lib/replace/libreplace.m4 | 268 ++- lib/replace/libreplace_cc.m4 | 28 +-
[SCM] CTDB repository - branch master updated - ctdb-1.12-53-g6b9d308
The branch, master has been updated via 6b9d308985ef2363c62fde6340ad37d56f6d7702 (commit) via 88ad1e75c686cd47aec18b0a8eb93c3b125f0e97 (commit) via 0f070a65a322bd6d3240ca96a9e5c3633ef647bf (commit) via 39a5c0d8cca4ce5e8bc7055739a6377fb2dc36e0 (commit) via 4ae564e415560cde7e4cd4c5a1d7699f3d49621b (commit) via 057023f5843c91d1cf8512f3675a01a119ea6157 (commit) from 66af6659eaffaeafbfa58779162aabe915d1c50f (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 6b9d308985ef2363c62fde6340ad37d56f6d7702 Author: Michael Adam ob...@samba.org Date: Fri Nov 25 13:55:20 2011 +0100 vacuum: write a big and up-to-date explaining comment for ctdb_vacuum_db() commit 88ad1e75c686cd47aec18b0a8eb93c3b125f0e97 Author: Michael Adam ob...@samba.org Date: Fri Nov 25 13:54:48 2011 +0100 vacuum: fix a comment typo in vacuum_traverse() commit 0f070a65a322bd6d3240ca96a9e5c3633ef647bf Author: Michael Adam ob...@samba.org Date: Fri Nov 25 13:35:05 2011 +0100 vacuum: fix horrible indentation/whitespacing for ctdb_vacuum_event() commit 39a5c0d8cca4ce5e8bc7055739a6377fb2dc36e0 Author: Michael Adam ob...@samba.org Date: Fri Nov 25 13:34:15 2011 +0100 vacuum: fix a comment typo in vacuum_traverse() commit 4ae564e415560cde7e4cd4c5a1d7699f3d49621b Author: Michael Adam ob...@samba.org Date: Fri Nov 25 13:25:27 2011 +0100 vacuum: fix an abundance of indentation white spaces in ctdb_vacuum_db() commit 057023f5843c91d1cf8512f3675a01a119ea6157 Author: Michael Adam ob...@samba.org Date: Fri Nov 25 13:23:23 2011 +0100 vacuum: rename size to freelist_size for clarity --- Summary of changes: server/ctdb_vacuum.c | 65 +++-- 1 files changed, 46 insertions(+), 19 deletions(-) Changeset truncated at 500 lines: diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c index 2be3e4b..e30b6e8 100644 --- a/server/ctdb_vacuum.c +++ b/server/ctdb_vacuum.c @@ -206,8 +206,8 @@ static int add_record_to_vacuum_fetch_list(struct vacuum_data *vdata, } -static void ctdb_vacuum_event(struct event_context *ev, struct timed_event *te, - struct timeval t, void *private_data); +static void ctdb_vacuum_event(struct event_context *ev, struct timed_event *te, + struct timeval t, void *private_data); /* @@ -236,7 +236,7 @@ static int vacuum_traverse(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, } if (data.dsize != sizeof(struct ctdb_ltdb_header)) { - /* its not a deleted record */ + /* it is not a deleted record */ vdata-full_skipped++; return 0; } @@ -250,7 +250,7 @@ static int vacuum_traverse(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, if (lmaster == ctdb-pnn) { /* -* We are both lmaster and dmaster, and the record * is empty. +* We are both lmaster and dmaster, and the record is empty. * So we should be able to delete it. */ res = add_record_to_delete_tree(vdata, key, hdr); @@ -435,11 +435,37 @@ done: return 0; } -/* - * read-only traverse the database in order to find - * records that can be deleted and try to delete these - * records on the other nodes - * this executes in the child context +/** + * Vacuum a DB: + * - Always do the fast vacuuming run, which traverses + *the in-memory delete queue: these records have been + *scheduled for deletion. + * - Only if explicitly requested, the database is traversed + *in order to use the traditional heuristics on empty records + *to trigger deletion. + *This is done only every VacuumFastPathCount'th vacuuming run. + * + * The traverse runs fill two lists: + * + * - The delete_list: + * This is the list of empty records the current + * node is lmaster and dmaster for. These records are later + * deleted first on other nodes and then locally. + * + * The fast vacuuming run has a short cut for those records + * that have never been migrated with data: these records + * are immediately deleted locally, since they have left + * no trace on other nodes. + * + * - The vacuum_fetch lists + * (one for each other lmaster node): + * The records in this list are sent for deletion to + * their lmaster in a bulk VACUUM_FETCH message. + * + * The lmaster then migrates all these records to itelf + * so that they can be vacuumed there. + * + * This executes in the child context. */ static int ctdb_vacuum_db(struct ctdb_db_context *ctdb_db, struct vacuum_data *vdata, @@ -488,8 +514,8 @@ static int ctdb_vacuum_db(struct ctdb_db_context *ctdb_db,
[SCM] CTDB repository - branch master updated - ctdb-1.12-54-ga95b524
The branch, master has been updated via a95b524e57b861416f65baef7a0235bf7e394cef (commit) from 6b9d308985ef2363c62fde6340ad37d56f6d7702 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit a95b524e57b861416f65baef7a0235bf7e394cef Author: Michael Adam ob...@samba.org Date: Sat Nov 26 01:06:13 2011 +0100 vacuum: update (C) from vacuum rewrite --- Summary of changes: server/ctdb_vacuum.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c index e30b6e8..5be8abe 100644 --- a/server/ctdb_vacuum.c +++ b/server/ctdb_vacuum.c @@ -2,6 +2,8 @@ ctdb vacuuming events Copyright (C) Ronnie Sahlberg 2009 + Copyright (C) Michael Adam 2010-2011 + Copyright (C) Stefan Metzmacher 2010-2011 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -- CTDB repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-11-26-0259/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-11-26-0259/samba3.stderr http://git.samba.org/autobuild.flakey/2011-11-26-0259/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-11-26-0259/samba4.stderr http://git.samba.org/autobuild.flakey/2011-11-26-0259/samba4.stdout The top commit at the time of the failure was: commit 37f7a2c82d76fd5b9997686d8cbf1cf8a2180aac Author: Michael Adam ob...@samba.org Date: Thu Nov 10 23:11:54 2011 +0100 s3:locking:posix: remove uses of SMB_ASSERT() from get_windows_lock_ref_count() SMB_ASSERT is useless, since in non-developer build it does not actually fail after the log message, but usual flow just continues. Autobuild-User: Michael Adam ob...@samba.org Autobuild-Date: Fri Nov 25 14:59:53 CET 2011 on sn-devel-104