[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 087d32c s3:build: install libtdb with full version number instead of only SO version via 15502f3 s3:build: install libtalloc with full version number instead of only SO version (cherry picked from commit 4acb8c3f5976c5496aa666a52cd96739836ced2a) via 8cc2dc4 s3:build: build libtalloc.so.$VERSION with full version number instead only SO version (cherry picked from commit d04efc703ba0f195fcef832a30b27a160a787413) via d1682e2 s3:build: build libtdb.so.$VERSION with full version number instead only SO version (cherry picked from commit 9c76fdd80c93ec23099987b1559f3a3f0f7b6ca5) via 43b29fe s3:build: link libtdb as shared lib if using shared libs at all (cherry picked from commit 3f222513cc99b7ce048bcdaa8cc10f7b91616904) via 095a83d s3:build: determine full version of libtdb for the samba build (cherry picked from commit 23637b5789a43fe75bb4eadabd33fb321272b42b) via a3b0582 s3:build: link libtalloc as shared lib if using shared libs at all (cherry picked from commit 6c300ec4b51bfd57837d193f0b17b60cb152fc27) via d579ae8 s3:build: determine full version of libtalloc for the samba build (cherry picked from commit 472cabbdea3d5def7e7a36b19c5851a0cf0d8d83) via c01873e s3:build: fix typo in definition of --enable-external-libtdb (cherry picked from commit b731b6e032d9ba1469c349d6c46bd7bb52b18c28) via 2eeb5f2 s3:build: reformat AC_ARG_ENABLE(external_libtalloc...) (cherry picked from commit abef191fb9fa9edbdb68d7cbbf017e1fa74583f2) via 6a35fc2 s3:build: print the full version number in the showlibs targets (cherry picked from commit 7e230b31d19fcd37d5765e9649ccfca39af5541d) via 2a633d1 s3:build: add LIBWBCLIENT_FULLVER for consistency with SMB_LIBRARY() (cherry picked from commit d5d53ba5148d57bae207ded7525a4a38fcb5836f) via a0b51c3 s3:build: add an optional full version argument to the SMB_LIBRARY() macro. (cherry picked from commit adb3fc2f1d85f7621043d087ed2afb0fd053a009) via 80d05f7 s3:configure: add --enable-smbtorture4 switch (cherry picked from commit f8e32980f4fab8d6cad5c9f95fab0d1828717cd2) from f07f3d5 Fix 3.6 headers http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 087d32cf48018572f7c2f0c355db294bf9792f88 Author: Michael Adam ob...@samba.org Date: Fri May 6 17:10:13 2011 +0200 s3:build: install libtdb with full version number instead of only SO version (cherry picked from commit 5bcc0b2138b60fcecea94093ca43aaca4bc4d4ec) commit 15502f3206a059a2fe7ced52e0450a57e375bd73 Author: Michael Adam ob...@samba.org Date: Fri May 6 17:10:13 2011 +0200 s3:build: install libtalloc with full version number instead of only SO version (cherry picked from commit 4acb8c3f5976c5496aa666a52cd96739836ced2a) commit 8cc2dc490a27deda5fdae8aaac00c07ea12a58ec Author: Michael Adam ob...@samba.org Date: Fri May 6 17:00:32 2011 +0200 s3:build: build libtalloc.so.$VERSION with full version number instead only SO version (cherry picked from commit d04efc703ba0f195fcef832a30b27a160a787413) commit d1682e2d62bc320a419bf768c1d76a29666e7f75 Author: Michael Adam ob...@samba.org Date: Fri May 6 17:00:32 2011 +0200 s3:build: build libtdb.so.$VERSION with full version number instead only SO version (cherry picked from commit 9c76fdd80c93ec23099987b1559f3a3f0f7b6ca5) commit 43b29fe6affe3dde1cbf191cc9c46d52f83df3db Author: Michael Adam ob...@samba.org Date: Fri May 6 16:43:31 2011 +0200 s3:build: link libtdb as shared lib if using shared libs at all (cherry picked from commit 3f222513cc99b7ce048bcdaa8cc10f7b91616904) commit 095a83d7fbb23c5df5cadf2d9e5136a7fc396a1f Author: Michael Adam ob...@samba.org Date: Fri May 6 16:42:53 2011 +0200 s3:build: determine full version of libtdb for the samba build (cherry picked from commit 23637b5789a43fe75bb4eadabd33fb321272b42b) commit a3b058206e3c2f7670083f370d7d4540a0a7e29f Author: Michael Adam ob...@samba.org Date: Fri May 6 16:42:07 2011 +0200 s3:build: link libtalloc as shared lib if using shared libs at all (cherry picked from commit 6c300ec4b51bfd57837d193f0b17b60cb152fc27) commit d579ae8a2a3cad5f953a3587024a398add7ccfea Author: Michael Adam ob...@samba.org Date: Fri May 6 16:40:59 2011 +0200 s3:build: determine full version of libtalloc for the samba build (cherry picked from commit 472cabbdea3d5def7e7a36b19c5851a0cf0d8d83) commit c01873ebd9e90572c8e4fab28568328871a12be2 Author: Michael Adam ob...@samba.org Date: Fri May 6 16:39:03 2011 +0200 s3:build: fix typo in definition of --enable-external-libtdb (cherry picked from commit b731b6e032d9ba1469c349d6c46bd7bb52b18c28) commit 2eeb5f27a2773972e14a154aac74b8bec136ff50 Author: Michael Adam ob...@samba.org Date: Fri May 6 16:38:38 2011 +0200 s3:build: reformat
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f1cdce6 s3: Paranoia in smbsock_connect_state_destructor from 46168e9 s3-param Deprecate a number of security parameters for 3.6 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f1cdce6c135574bd0552f1e368c9b47daf633c73 Author: Volker Lendecke v...@samba.org Date: Sat May 14 13:15:19 2011 +0200 s3: Paranoia in smbsock_connect_state_destructor Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Sat May 14 14:19:01 CEST 2011 on sn-devel-104 --- Summary of changes: source3/libsmb/smbsock_connect.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libsmb/smbsock_connect.c b/source3/libsmb/smbsock_connect.c index df2dbad..88b4533 100644 --- a/source3/libsmb/smbsock_connect.c +++ b/source3/libsmb/smbsock_connect.c @@ -271,6 +271,7 @@ static int smbsock_connect_state_destructor( { if (state-sock != -1) { close(state-sock); + state-sock = -1; } return 0; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via affe06f s3: Paranoia in smbsock_connect_state_destructor from 087d32c s3:build: install libtdb with full version number instead of only SO version http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit affe06f513b94b414b7a8ae5e6ffe6f98fc7706c Author: Volker Lendecke v...@samba.org Date: Sat May 14 13:15:19 2011 +0200 s3: Paranoia in smbsock_connect_state_destructor Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Sat May 14 14:19:01 CEST 2011 on sn-devel-104 (cherry picked from commit f1cdce6c135574bd0552f1e368c9b47daf633c73) --- Summary of changes: source3/libsmb/smbsock_connect.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libsmb/smbsock_connect.c b/source3/libsmb/smbsock_connect.c index aa98099..f09820e 100644 --- a/source3/libsmb/smbsock_connect.c +++ b/source3/libsmb/smbsock_connect.c @@ -271,6 +271,7 @@ static int smbsock_connect_state_destructor( { if (state-sock != -1) { close(state-sock); + state-sock = -1; } return 0; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 30be9fe s3: Makeuse set_socket_addr_v4 via 115d0ec Use ZERO_STRUCTP in util_net from f1cdce6 s3: Paranoia in smbsock_connect_state_destructor http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 30be9fe554af0f63e1c5fe0b3dd60b8a084cf2c8 Author: Volker Lendecke v...@samba.org Date: Sat May 14 18:04:49 2011 +0200 s3: Makeuse set_socket_addr_v4 Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Sat May 14 18:57:57 CEST 2011 on sn-devel-104 commit 115d0ecf88a5cae2d684264f570892fb763d54d2 Author: Volker Lendecke v...@samba.org Date: Sat May 14 17:39:40 2011 +0200 Use ZERO_STRUCTP in util_net --- Summary of changes: lib/util/util_net.c|4 ++-- source3/libsmb/namequery.c | 26 ++ 2 files changed, 16 insertions(+), 14 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/util_net.c b/lib/util/util_net.c index 7d678c9..98eef3b 100644 --- a/lib/util/util_net.c +++ b/lib/util/util_net.c @@ -405,7 +405,7 @@ bool is_zero_addr(const struct sockaddr_storage *pss) */ void zero_ip_v4(struct in_addr *ip) { - memset(ip, '\0', sizeof(struct in_addr)); + ZERO_STRUCTP(ip); } /** @@ -415,7 +415,7 @@ void in_addr_to_sockaddr_storage(struct sockaddr_storage *ss, struct in_addr ip) { struct sockaddr_in *sa = (struct sockaddr_in *)ss; - memset(ss, '\0', sizeof(*ss)); + ZERO_STRUCTP(ss); sa-sin_family = AF_INET; sa-sin_addr = ip; } diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index 417d4ff..1cd5eb7 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -197,6 +197,17 @@ char *saf_fetch( const char *domain ) return server; } +static void set_socket_addr_v4(struct sockaddr_storage *addr) +{ + if (!interpret_string_addr(addr, lp_socket_address(), + AI_NUMERICHOST|AI_PASSIVE)) { + zero_sockaddr(addr); + } + if (addr-ss_family != AF_INET) { + zero_sockaddr(addr); + } +} + / Generate a random trn_id. / @@ -705,10 +716,7 @@ struct tevent_req *node_status_query_send(TALLOC_CTX *mem_ctx, in_addr = (struct sockaddr_in *)(void *)state-addr; in_addr-sin_port = htons(NMB_PORT); - if (!interpret_string_addr(state-my_addr, lp_socket_address(), - AI_NUMERICHOST|AI_PASSIVE)) { - zero_sockaddr(state-my_addr); - } + set_socket_addr_v4(state-my_addr); ZERO_STRUCT(p); nmb-header.name_trn_id = generate_trn_id(); @@ -892,10 +900,7 @@ bool name_status_find(const char *q_name, return false; } - if (!interpret_string_addr(ss, lp_socket_address(), - AI_NUMERICHOST|AI_PASSIVE)) { - zero_sockaddr(ss); - } + set_socket_addr_v4(ss); /* W2K PDC's seem not to respond to '*'#0. JRA */ make_nmb_name(nname, q_name, q_type); @@ -1202,10 +1207,7 @@ struct tevent_req *name_query_send(TALLOC_CTX *mem_ctx, in_addr = (struct sockaddr_in *)(void *)state-addr; in_addr-sin_port = htons(NMB_PORT); - if (!interpret_string_addr(state-my_addr, lp_socket_address(), - AI_NUMERICHOST|AI_PASSIVE)) { - zero_sockaddr(state-my_addr); - } + set_socket_addr_v4(state-my_addr); ZERO_STRUCT(p); nmb-header.name_trn_id = generate_trn_id(); -- Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.10-207-g2266586
The branch, master has been updated via 2266586c1839af032622be54dc7f71e39d2bd9ef (commit) from 307e915459c26a728a1ec16bd735d983d493df53 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 2266586c1839af032622be54dc7f71e39d2bd9ef Author: Mathieu Parent math.par...@gmail.com Date: Wed Mar 23 22:16:18 2011 +0100 Fix bashism ... again ;-) Signed-off-by: Michael Adam ob...@samba.org --- Summary of changes: config/events.d/60.ganesha |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/config/events.d/60.ganesha b/config/events.d/60.ganesha index b7bc923..6559dd0 100644 --- a/config/events.d/60.ganesha +++ b/config/events.d/60.ganesha @@ -13,7 +13,7 @@ start_nfs() { loadconfig nfs -[ $NFS_SERVER_MODE == GANESHA ] || exit 0 +[ $NFS_SERVER_MODE = GANESHA ] || exit 0 service_name=nfs-ganesha-gpfs -- 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-05-15-0409/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-05-15-0409/samba3.stderr http://git.samba.org/autobuild.flakey/2011-05-15-0409/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-05-15-0409/samba4.stderr http://git.samba.org/autobuild.flakey/2011-05-15-0409/samba4.stdout The top commit at the time of the failure was: commit 30be9fe554af0f63e1c5fe0b3dd60b8a084cf2c8 Author: Volker Lendecke v...@samba.org Date: Sat May 14 18:04:49 2011 +0200 s3: Makeuse set_socket_addr_v4 Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Sat May 14 18:57:57 CEST 2011 on sn-devel-104