[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8697acd dsdb-cracknames: Always use talloc_zero() from d5d0a45 build(waf): Fix the --with-cluster build http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8697acd4b08354fb4185b05da07f4399bda917bc Author: Andrew Bartlett Date: Wed Oct 24 11:56:02 2012 +1100 dsdb-cracknames: Always use talloc_zero() Otherwise, we will return un-initialised values to the caller, which will attempt to push them onto the wire. Found by Greg Dickie . Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Wed Oct 24 05:12:04 CEST 2012 on sn-devel-104 --- Summary of changes: source4/dsdb/samdb/cracknames.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c index c366019..6ad8026 100644 --- a/source4/dsdb/samdb/cracknames.c +++ b/source4/dsdb/samdb/cracknames.c @@ -1472,7 +1472,7 @@ WERROR dcesrv_drsuapi_CrackNamesByNameFormat(struct ldb_context *sam_ctx, TALLOC uint32_t i, count; WERROR status; - *ctr1 = talloc(mem_ctx, struct drsuapi_DsNameCtr1); + *ctr1 = talloc_zero(mem_ctx, struct drsuapi_DsNameCtr1); W_ERROR_HAVE_NO_MEMORY(*ctr1); count = req1->count; -- Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.13-331-ge94070d
The branch, master has been updated via e94070de52232d6cefae0c6276df88b8fc380a4e (commit) from 6871415f6cb50c4f9753067359f0e264d3f93871 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit e94070de52232d6cefae0c6276df88b8fc380a4e Author: Amitay Isaacs Date: Wed Oct 24 12:58:57 2012 +1100 web: Update broken links to manpages Signed-off-by: Amitay Isaacs --- Summary of changes: web/documentation.html |8 +--- 1 files changed, 5 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/web/documentation.html b/web/documentation.html index 06e092a..d731edc 100644 --- a/web/documentation.html +++ b/web/documentation.html @@ -23,9 +23,11 @@ The following documentation should get you started with CTDB. Man pages: -http://ctdb.samba.org/~tridge/ctdb/doc/ctdb.1.html";>ctdb manual page -http://ctdb.samba.org/~tridge/ctdb/doc/ctdbd.1.html";>ctdbd manual page -http://ctdb.samba.org/~tridge/ctdb/doc/onnode.1.html";>onnode manual page +http://ctdb.samba.org/manpages/ctdb.1.html";>ctdb manual page +http://ctdb.samba.org/manpages/ctdbd.1.html";>ctdbd manual page +http://ctdb.samba.org/manpages/onnode.1.html";>onnode manual page +http://ctdb.samba.org/manpages/ltdbtool.1.html";>ltdbtool manual page +http://ctdb.samba.org/manpages/ping_pong.1.html";>ping_pong manual page Articles: -- CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.13-330-g6871415
The branch, master has been updated via 6871415f6cb50c4f9753067359f0e264d3f93871 (commit) via f3888712298f1de7cc7eb51f50c22080fa64e3c0 (commit) via 0019291371af1e63ee132ed173ba7f52a0291a44 (commit) via 19fb26346567d2249b1237f92d871022db2ba8cd (commit) via 69f0473b72aadab5bd5791ccff2facd0cd469d43 (commit) via 3274cffe2052953b34141a82de6053b747532a88 (commit) via db987eeb3c6e10552a1c1334bf263eb66fcad9ab (commit) via b3eac871895cc586bcc671835e882b136e466b98 (commit) via 12e4a3e2953842b4c3842bf920fe2086df4fe46c (commit) via 4250c7ebe369e73cf29ff910bb9bfc929735408c (commit) from c18ec8ec234cb71da6cc77b1aadc398f57187947 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 6871415f6cb50c4f9753067359f0e264d3f93871 Author: Amitay Isaacs Date: Mon Oct 22 18:04:09 2012 +1100 packaging: Bundle README, COPYING and html version of manpages Signed-off-by: Amitay Isaacs commit f3888712298f1de7cc7eb51f50c22080fa64e3c0 Author: Amitay Isaacs Date: Mon Oct 22 17:43:32 2012 +1100 doc: Do not keep the built version of manpages in version control Generated docs will be bundled with release tarballs. No need to keep them in git. This avoids the need to commit the generated doc version if source xml is modified. Signed-off-by: Amitay Isaacs commit 0019291371af1e63ee132ed173ba7f52a0291a44 Author: Amitay Isaacs Date: Mon Oct 22 15:12:50 2012 +1100 packaging: Use common code to generate VERSION string Signed-off-by: Amitay Isaacs commit 19fb26346567d2249b1237f92d871022db2ba8cd Author: Amitay Isaacs Date: Mon Oct 22 15:08:41 2012 +1100 packaging: Factor out the code to genreate VERSION string Signed-off-by: Amitay Isaacs commit 69f0473b72aadab5bd5791ccff2facd0cd469d43 Author: Amitay Isaacs Date: Mon Oct 22 15:55:33 2012 +1100 packaging: Build docs and include them in tarball Signed-off-by: Amitay Isaacs commit 3274cffe2052953b34141a82de6053b747532a88 Author: Amitay Isaacs Date: Wed Oct 17 10:09:26 2012 +1100 build: Extract building of manpages in a separate Makefile This can then be used to build manpages/html when creating tarball. Do not build docs during a regular build, but only for install. Signed-off-by: Amitay Isaacs commit db987eeb3c6e10552a1c1334bf263eb66fcad9ab Author: Amitay Isaacs Date: Mon Oct 22 10:52:06 2012 +1100 doc: README - add information about CTDB, license and website commit b3eac871895cc586bcc671835e882b136e466b98 Author: Amitay Isaacs Date: Wed Oct 17 11:27:32 2012 +1100 web: Add posix locking information to prerequisites Signed-off-by: Amitay Isaacs commit 12e4a3e2953842b4c3842bf920fe2086df4fe46c Author: Amitay Isaacs Date: Wed Oct 17 11:26:52 2012 +1100 web: Add the links to ftp/http ctdb download area Signed-off-by: Amitay Isaacs commit 4250c7ebe369e73cf29ff910bb9bfc929735408c Author: Amitay Isaacs Date: Wed Oct 17 11:25:46 2012 +1100 web: Remove reference to non-existent config files Signed-off-by: Amitay Isaacs --- Summary of changes: Makefile.in| 26 +- README |8 + doc/Makefile | 16 + doc/ctdb.1 | 1053 - doc/ctdb.1.html| 812 doc/ctdbd.1| 1117 doc/ctdbd.1.html | 995 --- doc/ltdbtool.1 | 258 -- doc/ltdbtool.1.html| 84 doc/onnode.1 | 239 -- doc/onnode.1.html | 129 - doc/ping_pong.1| 110 - doc/ping_pong.1.html | 37 -- packaging/RPM/ctdb.spec.in |7 + packaging/RPM/makerpms.sh | 30 +- packaging/maketarball.sh | 27 +- packaging/mkversion.sh | 50 ++ web/configuring.html |4 +- web/download.html | 11 +- web/prerequisites.html | 22 +- 20 files changed, 135 insertions(+), 4900 deletions(-) create mode 100644 README create mode 100644 doc/Makefile delete mode 100644 doc/ctdb.1 delete mode 100644 doc/ctdb.1.html delete mode 100644 doc/ctdbd.1 delete mode 100644 doc/ctdbd.1.html delete mode 100644 doc/ltdbtool.1 delete mode 100644 doc/ltdbtool.1.html delete mode 100644 doc/onnode.1 delete mode 100644 doc/onnode.1.html delete mode 100644 doc/ping_pong.1 delete mode 100644 doc/ping_pong.1.html create mode 100755 packaging/mkversion.sh Changeset truncated at 500 lines: diff --git a/Makefile.in b/Makefile.in index efc6622..3294503 100755 --- a/Makefile.in +++ b/Makefile.in @@ -110,9 +110,9 @@ SBINS = bin/ctdbd DIRS = lib bin tests/b
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d5d0a45 build(waf): Fix the --with-cluster build
from d2aa785 lib/tsocket: fix loop in tdgram_bsd_recvfrom() (bug #9184)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d5d0a454cef8c732235b554df89761d4dcd854ba
Author: Michael Adam
Date: Tue Oct 23 15:53:17 2012 +0200
build(waf): Fix the --with-cluster build
The problem with the cluster/ctdb configure checks in Samba
currently is, that the headers need to include .
If there are no system tdb headers, configure fails to find
tdb headers at this stage. Since the include is only required
for some defines (TDB_DATA), the workaround is to temporarily
add the included tdb copy's include path to the include search
path in the configure test. The ctdb we run against will most
likely have been compiled against a different version of TDB
anyways...
To properly fix this, we might need to change ctdb to rely
on an external tdb library. Or to incorporate ctdb into samba
as a component that uses the same shipped tdb version.
Signed-off-by: Michael Adam
Signed-off-by: Volker Lendecke
Signed-off-by: Stefan Metzmacher
Autobuild-User(master): Michael Adam
Autobuild-Date(master): Tue Oct 23 18:29:26 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/wscript |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript b/source3/wscript
index f049700..cc94053 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1302,6 +1302,9 @@ main() {
else:
includes = ''
+ if not conf.env.USING_SYSTEM_TDB:
+includes = includes + ' ' + srcdir + '/lib/tdb/include'
+
have_cluster_support = True
ctdb_broken = ""
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d2aa785 lib/tsocket: fix loop in tdgram_bsd_recvfrom() (bug #9184)
from 7138b21 build: Add #define FREEBSD on FreeBSD
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d2aa785290a283e06624f22a381a7ea02baae5ad
Author: Stefan Metzmacher
Date: Tue Oct 2 12:20:26 2012 +0200
lib/tsocket: fix loop in tdgram_bsd_recvfrom() (bug #9184)
If the socket is not readable yet, we need to retry
if tsocket_bsd_pending() returns 0.
See also
https://lists.samba.org/archive/samba-technical/2012-October/087164.html
metze
Autobuild-User(master): Andrew Bartlett
Autobuild-Date(master): Tue Oct 23 14:44:21 CEST 2012 on sn-devel-104
---
Summary of changes:
lib/tsocket/tsocket_bsd.c | 10 +-
1 files changed, 9 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index d5721b4..135fd02 100644
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -792,7 +792,7 @@ static int tdgram_bsd_set_writeable_handler(struct
tdgram_bsd *bsds,
struct tdgram_bsd_recvfrom_state {
struct tdgram_context *dgram;
-
+ bool first_try;
uint8_t *buf;
size_t len;
struct tsocket_address *src;
@@ -826,6 +826,7 @@ static struct tevent_req
*tdgram_bsd_recvfrom_send(TALLOC_CTX *mem_ctx,
}
state->dgram= dgram;
+ state->first_try= true;
state->buf = NULL;
state->len = 0;
state->src = NULL;
@@ -876,6 +877,13 @@ static void tdgram_bsd_recvfrom_handler(void *private_data)
bool retry;
ret = tsocket_bsd_pending(bsds->fd);
+ if (state->first_try && ret == 0) {
+ state->first_try = false;
+ /* retry later */
+ return;
+ }
+ state->first_try = false;
+
err = tsocket_bsd_error_from_errno(ret, errno, &retry);
if (retry) {
/* retry later */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7138b21 build: Add #define FREEBSD on FreeBSD
via 6d73fd0 lib/replace: Fix configure on FreeBSD: define_ret is not
correct here
via 80f42df lib/replace: Fix detection of prctl
via debb2b2 lib/replace: Fix detection of rpcsrv/yp_prot.h on FreeBSD
via 60a06ff vfs: Fix compilation of ACL support on solaris
from bd099c4 waf: Create a libnss_wins.so symlink.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7138b2138ba1f67386c6aa1e1c5ef49fde07cc41
Author: Andrew Bartlett
Date: Tue Oct 23 17:53:58 2012 +1100
build: Add #define FREEBSD on FreeBSD
This makes waf match autoconf
Autobuild-User(master): Andrew Bartlett
Autobuild-Date(master): Tue Oct 23 11:11:44 CEST 2012 on sn-devel-104
commit 6d73fd07f94ae23f3eacaab3b220ffca201b1300
Author: Andrew Bartlett
Date: Tue Oct 23 17:31:03 2012 +1100
lib/replace: Fix configure on FreeBSD: define_ret is not correct here
define_ret is for when the output of the compiled and run program
should be put into the configure define. This is not the case
here.
Andrew Bartlett
commit 80f42df4ec9194ff00aeeb3c2cf6acfa1f2ab5c3
Author: Andrew Bartlett
Date: Tue Oct 23 17:14:55 2012 +1100
lib/replace: Fix detection of prctl
commit debb2b2b9e9a495b0f9f31753ac5e75e4b2d5364
Author: Andrew Bartlett
Date: Tue Oct 23 17:14:43 2012 +1100
lib/replace: Fix detection of rpcsrv/yp_prot.h on FreeBSD
commit 60a06ff09cb62d4102a89194ce8fef5c4c5a2f16
Author: Andrew Bartlett
Date: Tue Oct 23 16:13:28 2012 +1100
vfs: Fix compilation of ACL support on solaris
---
Summary of changes:
lib/replace/wscript |6 --
source3/modules/vfs_solarisacl.h |6 --
source3/wscript |9 +
3 files changed, 17 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 732c664..c21a8f8 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -89,7 +89,10 @@ struct foo bar = { .y = 'X', .x = 1 };
conf.CHECK_HEADERS('rpcsvc/nis.h rpcsvc/ypclnt.h sys/prctl.h sys/sysctl.h')
conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h
sys/sysmacros.h')
-conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h rpcsvc/yp_prot.h')
+conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
+
+conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h',
define='HAVE_RPCSVC_YP_PROT_H')
+
conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
@@ -227,7 +230,6 @@ struct foo bar = { .y = 'X', .x = 1 };
msg="Checking correct behavior of strtoll",
headers = 'errno.h',
execute = True,
-define_ret = True,
define = 'HAVE_BSD_STRTOLL',
)
conf.CHECK_FUNCS('if_nametoindex strerror_r')
diff --git a/source3/modules/vfs_solarisacl.h b/source3/modules/vfs_solarisacl.h
index 84c2cb7..20f1051 100644
--- a/source3/modules/vfs_solarisacl.h
+++ b/source3/modules/vfs_solarisacl.h
@@ -22,10 +22,12 @@
SMB_ACL_T solarisacl_sys_acl_get_file(vfs_handle_struct *handle,
const char *path_p,
- SMB_ACL_TYPE_T type);
+ SMB_ACL_TYPE_T type,
+ TALLOC_CTX *mem_ctx);
SMB_ACL_T solarisacl_sys_acl_get_fd(vfs_handle_struct *handle,
- files_struct *fsp);
+ files_struct *fsp,
+ TALLOC_CTX *mem_ctx);
int solarisacl_sys_acl_set_file(vfs_handle_struct *handle,
const char *name,
diff --git a/source3/wscript b/source3/wscript
index 92575c8..f049700 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -266,6 +266,14 @@ __sys_llseek syslog _telldir __telldir textdomain timegm
utimensat vsyslog _write __write __xstat
''')
+conf.CHECK_CODE('''
+#ifdef HAVE_SYS_PRCTL_H
+#include
+#endif
+int i; i = prtcl(0);
+''',
+'HAVE_PRCTL', link=False)
+
conf.CHECK_SAMBA3_CHARSET() # see build/charset.py
# FIXME: these should be tests for features, but the old build system just
@@ -289,6 +297,7 @@ utimensat vsyslog _write __write __xstat
conf.ADD_CFLAGS('-fno-common')
conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
elif (host_os.rfind('freebsd') > -1):
+conf.DEFINE('FREEBSD', 1)
if conf.CHECK_HEADERS('sunacl.h'):
conf.DEFINE('HAVE_FREEBSD_SUNACL_H', '1')
