[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9c81260 waf: Make sure we link against samba-util.
from 19c68f8 s3:idmap_autorid: fix freeing of non-talloced memory
(uninitialized pointer) (bug #9653)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9c812604995836a51693f620459f415996e00159
Author: Andreas Schneider
Date: Thu Feb 14 12:34:01 2013 +0100
waf: Make sure we link against samba-util.
libcmdline-credentials.so needs samba_getpass() from libsamba-util.so,
so we need to link against it.
Reviewed-by: Andrew Bartlet
Autobuild-User(master): Andreas Schneider
Autobuild-Date(master): Thu Feb 14 16:56:29 CET 2013 on sn-devel-104
---
Summary of changes:
source4/lib/cmdline/wscript_build |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/cmdline/wscript_build
b/source4/lib/cmdline/wscript_build
index 9b6f6e5..f8df22a 100644
--- a/source4/lib/cmdline/wscript_build
+++ b/source4/lib/cmdline/wscript_build
@@ -4,6 +4,7 @@ bld.SAMBA_LIBRARY('cmdline-credentials',
source='credentials.c',
autoproto='credentials.h',
public_deps='samba-credentials popt',
+ deps='samba-util',
private_library=True)
bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 736e3b1 docs: fix typo in serverrole.xml from 9c81260 waf: Make sure we link against samba-util. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 736e3b1335dde1ea20914841d1e178e453b42249 Author: Samba-JP oota Date: Thu Feb 14 22:55:51 2013 +0900 docs: fix typo in serverrole.xml Reviewed-by: David Disseldorp Autobuild-User(master): David Disseldorp Autobuild-Date(master): Thu Feb 14 18:43:57 CET 2013 on sn-devel-104 --- Summary of changes: docs-xml/smbdotconf/security/serverrole.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/security/serverrole.xml b/docs-xml/smbdotconf/security/serverrole.xml index 005b6e9..90edd88 100644 --- a/docs-xml/smbdotconf/security/serverrole.xml +++ b/docs-xml/smbdotconf/security/serverrole.xml @@ -65,7 +65,7 @@ This mode of operation runs a classic Samba backup domain controller, providing domain logon services to Windows and Samba clients of an NT4-like domain. As a BDC, this allows -multiple Samba servers to provide rudundent logon services to a +multiple Samba servers to provide redundant logon services to a single NetBIOS scope. SERVER ROLE = ACTIVE DIRECTORY DOMAIN CONTROLLER -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via daada84 tevent: Remove the previous "standard" tevent backend implementation. via 16f5707 tevent: Add in the new implementation of "standard" tevent backend. via 203f85c tevent: Add a private function tevent_poll_event_add_fd_internal(). via 5fe459f tevent: make use of tevent_find_ops_byname() in tevent_context_init_byname() via b5556a7 tevent: make sure tevent_backend_init() only runs once via aceeb58 tevent: Add a utility function tevent_find_ops_byname(). via 1ee428d tevent: Add in the same tevent_re_initialise() fix Metze put in the tevent_poll backend. via 06fb88b tevent: Add in some test code to allow the panic fallback path to be tested. via 6f98192 tevent: Plumb in the panic fallback code into the epoll_panic() runtime call. via 04ba47e tevent: Add an internal function tevent_epoll_set_panic_fallback(). via e4ef2ecf tevent: pass 'bool replay' to epoll_panic() via 129da06 tevent: Ensure we return after every call to epoll_panic(). via c36f8c1 tevent: Preparing to fix "standard" backend fallback. Initialize standard after epoll. from 736e3b1 docs: fix typo in serverrole.xml http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit daada849209df893ef9b42ea2be5de77d2d4125f Author: Jeremy Allison Date: Mon Feb 11 11:42:08 2013 -0800 tevent: Remove the previous "standard" tevent backend implementation. This was a horrible hybrid of duplicated epoll and select() code. Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Feb 14 22:40:30 CET 2013 on sn-devel-104 commit 16f57076b1b527c65da42e1fab6119c67bcd7f47 Author: Jeremy Allison Date: Mon Feb 11 11:40:49 2013 -0800 tevent: Add in the new implementation of "standard" tevent backend. Falls back cleanly from epoll -> poll, or uses poll if epoll not available. Signed-off-by: Jeremy Allison Signed-off-by: Stefan Metzmacher Reviewed-by: Stefan Metzmacher commit 203f85c25eb9238eae8e4dc5b55b549294b0fa03 Author: Jeremy Allison Date: Mon Feb 11 11:20:28 2013 -0800 tevent: Add a private function tevent_poll_event_add_fd_internal(). Not yet used, but will be called by the "standard" fallback from epoll -> poll backends. Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher commit 5fe459f5d7c0e6b5eeeb1aa2c8248e174a31008f Author: Stefan Metzmacher Date: Thu Feb 14 09:30:31 2013 +0100 tevent: make use of tevent_find_ops_byname() in tevent_context_init_byname() Signed-off-by: Stefan Metzmacher commit b5556a79e39be0bc9945cbac4e603b045ab55505 Author: Stefan Metzmacher Date: Thu Feb 14 09:29:57 2013 +0100 tevent: make sure tevent_backend_init() only runs once Signed-off-by: Stefan Metzmacher commit aceeb585cb6170e42cadae17791b8314083c278c Author: Jeremy Allison Date: Mon Feb 11 10:56:58 2013 -0800 tevent: Add a utility function tevent_find_ops_byname(). Returns an event ops struct given a string name. Not yet used, but will be part of the new "standard" fallback code. Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher commit 1ee428d5cad6910521ce77322614183fa2c7916e Author: Jeremy Allison Date: Mon Feb 11 10:53:15 2013 -0800 tevent: Add in the same tevent_re_initialise() fix Metze put in the tevent_poll backend. We might be called during tevent_re_initialise() which means we need to free our old additional_data. Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher commit 06fb88b449806d6de7ca20c73778dd6545a38cf7 Author: Jeremy Allison Date: Mon Feb 11 10:52:30 2013 -0800 tevent: Add in some test code to allow the panic fallback path to be tested. Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher commit 6f9819229b3d60cb898a0f9bfc67793b6c40fc2c Author: Jeremy Allison Date: Mon Feb 11 10:48:02 2013 -0800 tevent: Plumb in the panic fallback code into the epoll_panic() runtime call. Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher commit 04ba47e491d84f58562b57f937be632e75c204aa Author: Jeremy Allison Date: Mon Feb 11 10:43:39 2013 -0800 tevent: Add an internal function tevent_epoll_set_panic_fallback(). Can be set externally, allows us to fallback if epoll fails at runtime. Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher commit e4ef2ecf023c63ee28e40a1b60ecc6091a126001 Author: Stefan Metzmacher Date: Thu Feb 14 10:58:55 2013 +0100 tevent: pass 'bool replay' to epoll_panic() A fallback panic handler will need to know if there was an error while waiting for events
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/2013-02-15-0028/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2013-02-15-0028/samba3.stderr http://git.samba.org/autobuild.flakey/2013-02-15-0028/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2013-02-15-0028/samba.stderr http://git.samba.org/autobuild.flakey/2013-02-15-0028/samba.stdout The top commit at the time of the failure was: commit daada849209df893ef9b42ea2be5de77d2d4125f Author: Jeremy Allison Date: Mon Feb 11 11:42:08 2013 -0800 tevent: Remove the previous "standard" tevent backend implementation. This was a horrible hybrid of duplicated epoll and select() code. Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Feb 14 22:40:30 CET 2013 on sn-devel-104
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/2013-02-15-0214/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2013-02-15-0214/samba3.stderr http://git.samba.org/autobuild.flakey/2013-02-15-0214/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2013-02-15-0214/samba.stderr http://git.samba.org/autobuild.flakey/2013-02-15-0214/samba.stdout The top commit at the time of the failure was: commit daada849209df893ef9b42ea2be5de77d2d4125f Author: Jeremy Allison Date: Mon Feb 11 11:42:08 2013 -0800 tevent: Remove the previous "standard" tevent backend implementation. This was a horrible hybrid of duplicated epoll and select() code. Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Feb 14 22:40:30 CET 2013 on sn-devel-104
[SCM] CTDB repository - branch master updated - ctdb-2.1-25-g855ab34
The branch, master has been updated via 855ab348901edb3ec1327499a43f509d279b8182 (commit) from e204fac03412520e877ab04363b3ece02667c55b (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 855ab348901edb3ec1327499a43f509d279b8182 Author: Martin Schwenke Date: Fri Feb 15 11:18:45 2013 +1100 doc: Fix typo in ctdbd manpage Signed-off-by: Martin Schwenke --- Summary of changes: doc/ctdbd.1.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/doc/ctdbd.1.xml b/doc/ctdbd.1.xml index accc154..18fddc2 100644 --- a/doc/ctdbd.1.xml +++ b/doc/ctdbd.1.xml @@ -1099,7 +1099,7 @@ -Samba3AvoidDeadlock +Samba3AvoidDeadlocks Default: 0 Enable code that prevents deadlocks with Samba (only for Samba 3.x). -- CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 10b96e3 Fix the maxfids test so that it does not fork lots of
processes and so that it works for all cases of maxfids.
from daada84 tevent: Remove the previous "standard" tevent backend
implementation.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 10b96e3ffe1ccec4e6866b61ddd93e04a7863bbf
Author: Richard Sharpe
Date: Thu Feb 14 16:04:24 2013 -0800
Fix the maxfids test so that it does not fork lots of processes and so that
it works for all cases of maxfids.
Signed-off-by: Richard Sharpe
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Fri Feb 15 07:09:59 CET 2013 on sn-devel-104
---
Summary of changes:
source4/torture/basic/base.c |2 +-
source4/torture/basic/misc.c | 22 --
2 files changed, 5 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 5646100..5fba9b0 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -1938,7 +1938,7 @@ NTSTATUS torture_base_init(void)
torture_suite_add_smb_multi_test(suite, "bench-torture", run_torture);
torture_suite_add_1smb_test(suite, "scan-pipe_number", run_pipe_number);
torture_suite_add_1smb_test(suite, "scan-ioctl", torture_ioctl_test);
- torture_suite_add_smb_multi_test(suite, "scan-maxfid", run_maxfidtest);
+ torture_suite_add_1smb_test(suite, "scan-maxfid", torture_maxfid_test);
suite->description = talloc_strdup(suite,
"Basic SMB tests (imported from the
original smbtorture)");
diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index 213d923..721727b 100644
--- a/source4/torture/basic/misc.c
+++ b/source4/torture/basic/misc.c
@@ -295,7 +295,7 @@ bool torture_holdopen(struct torture_context *tctx,
/*
test how many open files this server supports on the one socket
*/
-bool run_maxfidtest(struct torture_context *tctx, struct smbcli_state *cli,
int dummy)
+bool torture_maxfid_test(struct torture_context *tctx, struct smbcli_state
*cli)
{
#define MAXFID_TEMPLATE "\\maxfid\\fid%d\\maxfid.%d.%d"
char *fname;
@@ -347,12 +347,11 @@ bool run_maxfidtest(struct torture_context *tctx, struct
smbcli_state *cli, int
}
}
torture_comment(tctx, "%6d\n", i);
- i--;
maxfid = i;
torture_comment(tctx, "cleaning up\n");
- for (i=0;itree, fnums[i]))) {
torture_comment(tctx, "Close of fnum %d failed - %s\n",
fnums[i], smbcli_errstr(cli->tree));
@@ -364,19 +363,8 @@ bool run_maxfidtest(struct torture_context *tctx, struct
smbcli_state *cli, int
}
free(fname);
- asprintf(&fname, MAXFID_TEMPLATE, (maxfid-i)/1000,
maxfid-i,(int)getpid());
- if (NT_STATUS_IS_ERR(smbcli_close(cli->tree, fnums[maxfid-i])))
{
- torture_comment(tctx, "Close of fnum %d failed - %s\n",
fnums[maxfid-i], smbcli_errstr(cli->tree));
- }
- if (NT_STATUS_IS_ERR(smbcli_unlink(cli->tree, fname))) {
- torture_comment(tctx, "unlink of %s failed (%s)\n",
- fname, smbcli_errstr(cli->tree));
- correct = false;
- }
- free(fname);
-
if (torture_setting_bool(tctx, "progress", true)) {
- torture_comment(tctx, "%6d %6d\r", i, maxfid-i);
+ torture_comment(tctx, "%6d\r", i);
fflush(stdout);
}
}
@@ -389,9 +377,7 @@ bool run_maxfidtest(struct torture_context *tctx, struct
smbcli_state *cli, int
}
torture_comment(tctx, "maxfid test finished\n");
- if (!torture_close_connection(cli)) {
- correct = false;
- }
+
return correct;
#undef MAXFID_TEMPLATE
}
--
Samba Shared Repository
