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/2014-10-10-0449/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2014-10-10-0449/samba.stderr http://git.samba.org/autobuild.flakey/2014-10-10-0449/samba.stdout The top commit at the time of the failure was: commit aa2a6c7b18e2e2bd3979ffb53208564764b8b9cf Author: Jeremy Allison Date: Wed Oct 8 09:06:06 2014 -0700 s3: smbd: Preparation for leases code merge. Ensure VFS is ready for 4.2.0. Signed-off-by: Jeremy Allison Reviewed-by: Volker Lendecke Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Oct 10 02:55:53 CEST 2014 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via aa2a6c7 s3: smbd: Preparation for leases code merge. Ensure VFS is
ready for 4.2.0.
from fa331f6 pidl-wireshark: insure that we have an entire match for the
variable name
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit aa2a6c7b18e2e2bd3979ffb53208564764b8b9cf
Author: Jeremy Allison
Date: Wed Oct 8 09:06:06 2014 -0700
s3: smbd: Preparation for leases code merge. Ensure VFS is ready for 4.2.0.
Signed-off-by: Jeremy Allison
Reviewed-by: Volker Lendecke
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Fri Oct 10 02:55:53 CEST 2014 on sn-devel-104
---
Summary of changes:
source3/include/vfs.h |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 3702b75..b0f00e8 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -158,6 +158,7 @@
/* Bump to version 32 - Samba 4.2 will ship with that. */
/* Version 32 - Add "lease" to CREATE_FILE operation */
+/* Version 32 - Add "lease" to struct files_struct */
#define SMB_VFS_INTERFACE_VERSION 32
@@ -202,6 +203,11 @@ struct fd_handle {
unsigned long gen_id;
};
+struct fsp_lease {
+ size_t ref_count;
+ struct smb2_lease lease;
+};
+
typedef struct files_struct {
struct files_struct *next, *prev;
uint64_t fnum;
@@ -225,6 +231,7 @@ typedef struct files_struct {
bool write_time_forced;
int oplock_type;
+ struct fsp_lease *lease; /* Not yet used. Placeholder for leases. */
int sent_oplock_break;
struct tevent_timer *oplock_timeout;
struct lock_struct last_lock_failure;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via fa331f6 pidl-wireshark: insure that we have an entire match for the
variable name
via 5d0d45c pidl-wireshark: generate an error for the new Pipe type in
typedef
via 87fb54b pidl-wireshark: add the type dom_sid28 and call ad-hoc
dissector
via 755bc4e pidl-wireshark: add a function to change the type of a
hf_field
via 7e5048d pidl-wireshark: cosmetic reformat
via 343db53 pidl-wireshark: Handle the case when the DATA_TYPE is not a
simple type
via 5740a06 pidl: Improve string delection in function ContainsString
via 4986359 pidl: Make the compilation of PIDL producing the same
results if the content hasn't change
from 9ae65ba ncacn_http: fix GNUism
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit fa331f64d1a40350496c7acf68c20cb3fead6eaf
Author: Matthieu Patou
Date: Thu Oct 3 09:45:19 2013 -0700
pidl-wireshark: insure that we have an entire match for the variable name
Signed-off-by: Matthieu Patou
Reviewed-by: Stefan Metzmacher
Autobuild-User(master): Stefan Metzmacher
Autobuild-Date(master): Fri Oct 10 00:32:40 CEST 2014 on sn-devel-104
commit 5d0d45c9a71f137dc29ca79d49bd558f34bf1ff5
Author: Matthieu Patou
Date: Sun Sep 29 00:42:36 2013 -0700
pidl-wireshark: generate an error for the new Pipe type in typedef
Pair-Programmed-With: Stefan Metzmacher
Signed-off-by: Matthieu Patou
Signed-off-by: Stefan Metzmacher
commit 87fb54b77f4b9caaf2b25635b7813e29a448aaa6
Author: Matthieu Patou
Date: Tue Oct 1 12:04:02 2013 -0700
pidl-wireshark: add the type dom_sid28 and call ad-hoc dissector
Signed-off-by: Matthieu Patou
Reviewed-by: Stefan Metzmacher
commit 755bc4ed29c89fc15d4230ce8b828b3afcfa2912
Author: Matthieu Patou
Date: Thu Oct 3 01:10:48 2013 -0700
pidl-wireshark: add a function to change the type of a hf_field
We can use this to change the type FT_BYTE when we realize that the
object dissected is an array of bytes
Change-Id: I2d09c557fd050d0c279b8fff0a27db53403366ca
Signed-off-by: Matthieu Patou
Reviewed-by: Stefan Metzmacher
commit 7e5048d28e86595357be399d0e55cf97a0781703
Author: Matthieu Patou
Date: Thu Oct 3 01:07:55 2013 -0700
pidl-wireshark: cosmetic reformat
Change-Id: I86a0d4f13575e5ef7c6968b93ce126e5df981873
Signed-off-by: Matthieu Patou
Reviewed-by: Stefan Metzmacher
commit 343db5326b369cbdef4b723e3056acc2a866a887
Author: Matthieu Patou
Date: Tue Sep 23 01:28:40 2014 -0700
pidl-wireshark: Handle the case when the DATA_TYPE is not a simple type
Pair-Programmed-With: Stefan Metzmacher
Change-Id: If78f241333c1372c60c7d00211c1e6aeb22c9719
Signed-off-by: Matthieu Patou
Signed-off-by: Stefan Metzmacher
commit 5740a06b320d56840439fb7fe3b8b27f341ddaa7
Author: Matthieu Patou
Date: Sat Oct 4 21:19:12 2014 -0700
pidl: Improve string delection in function ContainsString
Change-Id: I037e8b5f54fca8b512fd14edbefa34e59cb7f953
Signed-off-by: Matthieu Patou
Reviewed-by: Stefan Metzmacher
commit 4986359816704f38d4fad3ddd0d07a0f0a25b335
Author: Matthieu Patou
Date: Mon Sep 22 21:52:14 2014 -0700
pidl: Make the compilation of PIDL producing the same results if the
content hasn't change
Newer perl versions don't generate stable results anymore.
Pair-Programmed-With: Stefan Metzmacher
Change-Id: I2fb1e12da392ca85bfd0fb8b50b69851076144ee
Signed-off-by: Matthieu Patou
Signed-off-by: Stefan Metzmacher
---
Summary of changes:
pidl/lib/Parse/Pidl/Dump.pm |4 +-
pidl/lib/Parse/Pidl/NDR.pm | 10 +
pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm |2 +-
pidl/lib/Parse/Pidl/Samba4/Header.pm |2 +-
pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm |2 +-
pidl/lib/Parse/Pidl/Samba4/Python.pm | 48 +
pidl/lib/Parse/Pidl/Util.pm |1 +
pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 66 --
8 files changed, 99 insertions(+), 36 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/Dump.pm b/pidl/lib/Parse/Pidl/Dump.pm
index bf5811c..4e623db 100644
--- a/pidl/lib/Parse/Pidl/Dump.pm
+++ b/pidl/lib/Parse/Pidl/Dump.pm
@@ -39,7 +39,7 @@ sub DumpProperties($)
my $res = "";
foreach my $d ($props) {
- foreach my $k (keys %{$d}) {
+ foreach my $k (sort(keys %{$d})) {
if ($k eq "in") {
$res .= "[in] ";
next;
@@ -244,7 +244,7 @@ sub DumpInterfaceProperties($)
my($res);
$res .= "[\n";
-foreach my $k (keys %{$data}) {
+foreach my $k (sort(keys %{$data})) {
$first || ($res .= ",\n");
[SCM] Samba Shared Repository - branch v4-2-test updated
The branch, v4-2-test has been updated via 02e1c6b SO_PROTOCOL is platform-dependent via 13c7b80 regedit: remove an old comment via a38ad98 regedit: print error msg if opening registry fails via 96a5321 regedit: handle pgup/pgdn/home/end keys on lists via 0b70ddd regedit: handle del and backspace in hexeditor via fb01459 regedit: grow hexedit buffer as the user types via 0f548f9 regedit: add a button to resize hexedit buffer via 6c736e2 regedit: add a number input box via cf71665 regedit: don't expand single line text field buffer with cursor movement via 7720184 regedit: handle DEL key in text fields via 27e99f6 regedit: adjust some variable names to make them more distinct via d9b67e6 regedit: find previous items via 05be096 regedit: search values and repeat search from cursor positions via 45afe22 regedit: flesh out search dialog and simplify search opts via 60b6297 regedit: don't use subwindows in hexedit via afafda2 regedit: use pad as a canvas for dialogs via 77d9d4c regedit: clear value list after creating new key via 00ff031 regedit: use the right function to reopen a hive via a226a52 regedit: move cursor to edited value in list and report edit errors via 47caf0b regedit: Introduce a new API to build the dialogs. via ceafd11 regedit: improvements for hexedit via 7e11ecb regedit: add padding to fit REG_MULTI_SZ to the text field via bff6822 regedit: simplify cleanup after loading children via 1fb0690 regedit: add a panic handler to restore terminal via 5e3df48 regedit: make all hives descend from a root node via 8bc4a73 regedit: add a refresh command to clear cache and reload current path via ee89de1 regedit: reopen key after editing or removing values via 894f516 regedit: reopen parent keys when adding or removing subkeys via 6d61540 regedit: set cursor after creating a new key via 36cd9af regedit: set cursor to the parent node when ascending via 92d302f regedit: don't fail loading keys if just a few are unavailable via d4c1b36 regedit: include error description in popups via 544c4ec regedit: notify user if there's a failure loading subkeys via 4867e76 regedit: handle awkward window sizes better via 2b74ee0 regedit: use talloc typesafety features via fe5b9cd regedit: restore list cursor when window is resized via db7aef6 regedit: make value list display data in multiple columns via 1ca1c74 regedit: add multicolumn list widget via ca81665 regedit: add search feature. via f5ac8ec regedit: add a color scheme for path and context help sections via 1ab3b87 regedit: sort keys via 196055d regedit: free value list subwindow via 93aa394 regedit: add borders around key and value lists, and change headings via bb1b0ab regedit: add padding for key labels when there's not a prefix. via c7802fc regedit: add white on blue color scheme via 0288af3 regedit: silence some warnings via c7ebcd6 s3: smb2cli: query info return length check was reversed. via ce0c5f6 registry: Don't leave dangling transactions via ff9dd62 WHATSNEW: Fix typo. from 137c096 VERSION: Re-enable git snapshots. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-2-test - Log - commit 02e1c6bc55d6137ff7694973a3d6e8602839eeae Author: Jakub Hrozek Date: Thu Oct 2 07:04:15 2014 +0200 SO_PROTOCOL is platform-dependent SO_PROTOCOL is not defined on all platforms. In particular, OSX doesn't include it and so far I haven't found any compatible declaration. Signed-off-by: Jakub Hrozek Reviewed-by: Andreas Schneider Reviewed-by: Michael Adam (cherry picked from commit 5e70d80e7d7752a1df16b871d57fbcd8334a44e6) Bug: https://bugzilla.samba.org/show_bug.cgi?id=10861 socket_wrapper does not build on systems without SO_PROTOCOL (< Linux 2.6.32) Autobuild-User(v4-2-test): Karolin Seeger Autobuild-Date(v4-2-test): Thu Oct 9 23:38:36 CEST 2014 on sn-devel-104 commit 13c7b805bf0e38bf488986196d614450a1cece37 Author: Michael Adam Date: Wed Oct 1 11:36:36 2014 +0200 regedit: remove an old comment Signed-off-by: Michael Adam Reviewed-by: Andreas Schneider Autobuild-User(master): Michael Adam Autobuild-Date(master): Wed Oct 1 16:55:05 CEST 2014 on sn-devel-104 (cherry picked from commit fa9630e368df2446c5893b2fe51bada7a38760aa) The last 45 patches address bug #10859 (Improve samba-regedit). commit a38ad98674e05143be76fcc161ef6af8089fa558 Author: Chris Davis Date: Thu Aug 7 06:17:28 2014 -0700 regedit: print error msg if opening registry fails Signed-off-by:
[SCM] Samba Shared Repository - branch v4-1-test updated
The branch, v4-1-test has been updated via 429ddb1 s3: smb2cli: query info return length check was reversed. via 0e17b3f s3-libads: Add all machine account principals to the keytab. via 6602ad3 registry: Don't leave dangling transactions via f2f050c s3-winbindd: Do not use domain SID from LookupSids for Sids2UnixIDs call via a0eb3dd s3: Move init_lsa_ref_domain_list to lib via 2cd2490 idmap_rfc2307: Fix a crash after connection problem to DC via 043415e s3-libnet: Make sure we do not overwrite precreated SPNs. via 306e7e3 s3-libnet: Add libnet_join_get_machine_spns(). via f42d65e s3-libads: Add function to search for an element in an array. via 5923c9a s3-libads: Add a function to retrieve the SPNs of a computer account. from bff195a s3-libads: Improve service principle guessing. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-test - Log - commit 429ddb19e7b36e535b9c59664999d52bee99806f Author: Jeremy Allison Date: Wed Oct 1 14:20:10 2014 -0700 s3: smb2cli: query info return length check was reversed. Make it identical to the check in libcli/smb/smb2cli_ioctl.c https://bugzilla.samba.org/show_bug.cgi?id=10848 Signed-off-by: Jeremy Allison Reviewed-by: "Stefan (metze) Metzmacher" Reviewed-by: David Disseldorp Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Oct 2 04:42:26 CEST 2014 on sn-devel-104 (cherry picked from commit 6c05cd3e895831be7d9a68a51de2048d04c188a0) Autobuild-User(v4-1-test): Karolin Seeger Autobuild-Date(v4-1-test): Thu Oct 9 23:43:36 CEST 2014 on sn-devel-104 commit 0e17b3f3c7ef06b953f5c636ca5fb6f0801dac58 Author: Andreas Schneider Date: Wed Sep 24 10:51:33 2014 +0200 s3-libads: Add all machine account principals to the keytab. This adds all SPNs defined in the DC for the computer account to the keytab using 'net ads keytab create -P'. BUG: https://bugzilla.samba.org/show_bug.cgi?id=9985 Signed-off-by: Andreas Schneider Reviewed-by: Guenther Deschner (cherry picked from commit 5d58b92f8fcbc509f4fe2bd3617bcaeada1806b6) commit 6602ad3be3753503423bd2c3ba0e03961a2a4038 Author: Volker Lendecke Date: Wed Oct 8 15:39:28 2014 +0200 registry: Don't leave dangling transactions When a createkey fails due to access denied, we need to do a transaction_cancel. Otherwise the lock on the db will stay around. Signed-off-by: Volker Lendecke Reviewed-by: Guenther Deschner Bug: https://bugzilla.samba.org/show_bug.cgi?id=10860 commit f2f050ccb9a07fc1219f4f4b73ef2875ca37ab9e Author: Christof Schmitt Date: Thu Sep 11 16:39:21 2014 -0700 s3-winbindd: Do not use domain SID from LookupSids for Sids2UnixIDs call Create a new lsa_RefDomainList and populate it with the domain SID from the original query. That avoids the problem that for migrated objects, LookupSids returns the SID of the new domain, and combining that with the RID from the input results in an invalid SID. A better fix would be querying the RID of the user in the new domain, but the approach here at least avoids id mappings entries for invalid SIDs. Signed-off-by: Christof Schmitt Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Mon Sep 29 13:15:18 CEST 2014 on sn-devel-104 (cherry picked from commit 9c9216410faf707edc4ba05f2b715d45f7f51ca4) Bug: https://bugzilla.samba.org/show_bug.cgi?id=10838 Invalid id mappings for users/groups migrated from another domain commit a0eb3ddd761235e0308fa8f8982ef027ea179805 Author: Christof Schmitt Date: Thu Sep 11 16:11:06 2014 -0700 s3: Move init_lsa_ref_domain_list to lib This will be used in the next patch in winbind. Signed-off-by: Christof Schmitt Reviewed-by: Volker Lendecke (cherry picked from commit 16594e7fc0a46249a48d0d0635de0c1050ecd340) commit 2cd2490f356fcb3642aa1bd60729f69906ffca81 Author: Christof Schmitt Date: Wed Sep 17 13:23:11 2014 -0700 idmap_rfc2307: Fix a crash after connection problem to DC When the connection to the DC has a problem, the code behind ads_do_search_retry closes the current connection and opens a new one. The new connection has a new struct LDAP to represent the connection. In this case, the LDAP pointer in the idmap_rfc2307_context becomes invalid. Fix this problem by updating the local pointer after calling ads_do_search_retry. Signed-off-by: Christof Schmitt Bug: https://bugzilla.samba.org/show_bug.cgi?id=10837 winbind crash in idmap_rfc2307 module commit 043415e1d69db9bc81f4a51cc392529d58955004 Author: Günther Deschner Date: Fri Sep 26 03:35:43 2014 +0200 s3-libnet: Ma
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via 6642684 s3: smb2cli: query info return length check was reversed. via c6493fc s3-libads: Add all machine account principals to the keytab. via bbf24d3 registry: Don't leave dangling transactions via f88c106 s3-winbindd: Do not use domain SID from LookupSids for Sids2UnixIDs call via f42f4d0 s3: Move init_lsa_ref_domain_list to lib via 372f228 s3-libnet: Make sure we do not overwrite precreated SPNs. via f0b99bc s3-libnet: Add libnet_join_get_machine_spns(). via 4e2e567 s3-libads: Add function to search for an element in an array. via 1d16c07 s3-libads: Add a function to retrieve the SPNs of a computer account. from 29f42cb s3-libads: Improve service principle guessing. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit 6642684cc01545e59613ee0845c1ee2dfffee478 Author: Jeremy Allison Date: Wed Oct 1 14:20:10 2014 -0700 s3: smb2cli: query info return length check was reversed. Make it identical to the check in libcli/smb/smb2cli_ioctl.c https://bugzilla.samba.org/show_bug.cgi?id=10848 Signed-off-by: Jeremy Allison Reviewed-by: "Stefan (metze) Metzmacher" Reviewed-by: David Disseldorp Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Oct 2 04:42:26 CEST 2014 on sn-devel-104 (cherry picked from commit 6c05cd3e895831be7d9a68a51de2048d04c188a0) Autobuild-User(v4-0-test): Karolin Seeger Autobuild-Date(v4-0-test): Thu Oct 9 23:25:47 CEST 2014 on sn-devel-104 commit c6493fcfb5a5d3a91f4b1b0134fef9e0f2754470 Author: Andreas Schneider Date: Wed Sep 24 10:51:33 2014 +0200 s3-libads: Add all machine account principals to the keytab. This adds all SPNs defined in the DC for the computer account to the keytab using 'net ads keytab create -P'. BUG: https://bugzilla.samba.org/show_bug.cgi?id=9985 Signed-off-by: Andreas Schneider Reviewed-by: Guenther Deschner (cherry picked from commit 5d58b92f8fcbc509f4fe2bd3617bcaeada1806b6) commit bbf24d39b4c0ba81767bcdb67d5cd7c01604b16c Author: Volker Lendecke Date: Wed Oct 8 15:39:28 2014 +0200 registry: Don't leave dangling transactions When a createkey fails due to access denied, we need to do a transaction_cancel. Otherwise the lock on the db will stay around. Signed-off-by: Volker Lendecke Reviewed-by: Guenther Deschner Bug: https://bugzilla.samba.org/show_bug.cgi?id=10860 commit f88c10665e628eed0b03bcabef3216b32e1bc05b Author: Christof Schmitt Date: Thu Sep 11 16:39:21 2014 -0700 s3-winbindd: Do not use domain SID from LookupSids for Sids2UnixIDs call Create a new lsa_RefDomainList and populate it with the domain SID from the original query. That avoids the problem that for migrated objects, LookupSids returns the SID of the new domain, and combining that with the RID from the input results in an invalid SID. A better fix would be querying the RID of the user in the new domain, but the approach here at least avoids id mappings entries for invalid SIDs. Signed-off-by: Christof Schmitt Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Mon Sep 29 13:15:18 CEST 2014 on sn-devel-104 (cherry picked from commit 9c9216410faf707edc4ba05f2b715d45f7f51ca4) Bug: https://bugzilla.samba.org/show_bug.cgi?id=10838 Invalid id mappings for users/groups migrated from another domain commit f42f4d0a197f73050fdabd663a6472d396a74b80 Author: Christof Schmitt Date: Thu Sep 11 16:11:06 2014 -0700 s3: Move init_lsa_ref_domain_list to lib This will be used in the next patch in winbind. Signed-off-by: Christof Schmitt Reviewed-by: Volker Lendecke (cherry picked from commit 16594e7fc0a46249a48d0d0635de0c1050ecd340) commit 372f22891a654b7d99d9e98083b05955d5bc89be Author: Günther Deschner Date: Fri Sep 26 03:35:43 2014 +0200 s3-libnet: Make sure we do not overwrite precreated SPNs. BUG: https://bugzilla.samba.org/show_bug.cgi?id=9984 Signed-off-by: Günther Deschner Reviewed-by: Andreas Schneider Autobuild-User(master): Günther Deschner Autobuild-Date(master): Fri Sep 26 08:22:45 CEST 2014 on sn-devel-104 (cherry picked from commit 0aacbe78bb40d76b65087c2a197c92b0101e625e) commit f0b99bc57240bb8c65fcc6974353eed6cd740773 Author: Andreas Schneider Date: Fri Sep 26 03:09:08 2014 +0200 s3-libnet: Add libnet_join_get_machine_spns(). BUG: https://bugzilla.samba.org/show_bug.cgi?id=9984 Signed-off-by: Andreas Schneider Reviewed-by: Guenther Deschner (cherry picked from commit 7e0b8fcce5572c88d50993a1dbd90f65638ba90f) commit 4e2e567feb583aed0107c139
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9ae65ba ncacn_http: fix GNUism
via ccb0d9d lib/texpect: portability fix, include signal.h
from 644e53d configure: Unload the wrappers so waf configure succeeds.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9ae65baf3cd6382678624864f13fc053d942d013
Author: Ralph Boehme
Date: Thu Oct 9 16:41:10 2014 +0200
ncacn_http: fix GNUism
%a format conversion is a GNU extension, use the more portable %m.
It's at least in SUSv4, supported by glibc since 2.7 and FreeBSD 10.
Signed-off-by: Ralph Boehme
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Thu Oct 9 22:05:26 CEST 2014 on sn-devel-104
commit ccb0d9d6169594e8dd1c8935c9dfec51ee7125c4
Author: Ralph Boehme
Date: Thu Oct 9 14:34:02 2014 +0200
lib/texpect: portability fix, include signal.h
Signed-off-by: Ralph Boehme
Reviewed-by: Jeremy Allison
---
Summary of changes:
lib/texpect/texpect.c |1 +
source4/lib/http/http.c |4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/texpect/texpect.c b/lib/texpect/texpect.c
index c1a6a99..ac88979 100644
--- a/lib/texpect/texpect.c
+++ b/lib/texpect/texpect.c
@@ -62,6 +62,7 @@
#include
#include
#include
+#include
struct command {
enum { CMD_EXPECT = 0, CMD_SEND, CMD_PASSWORD } type;
diff --git a/source4/lib/http/http.c b/source4/lib/http/http.c
index 314ceed..c3bd728 100644
--- a/source4/lib/http/http.c
+++ b/source4/lib/http/http.c
@@ -112,7 +112,7 @@ static enum http_read_status http_parse_headers(struct
http_read_response_state
return HTTP_ALL_DATA_READ;
}
- n = sscanf(line, "%a[^:]: %a[^\r\n]\r\n", &key, &value);
+ n = sscanf(line, "%m[^:]: %m[^\r\n]\r\n", &key, &value);
if (n != 2) {
DEBUG(0, ("%s: Error parsing header '%s'\n", __func__, line));
status = HTTP_DATA_CORRUPTED;
@@ -158,7 +158,7 @@ static bool http_parse_response_line(struct
http_read_response_state *state)
return false;
}
- n = sscanf(line, "%a[^/]/%c.%c %d %a[^\r\n]\r\n",
+ n = sscanf(line, "%m[^/]/%c.%c %d %m[^\r\n]\r\n",
&protocol, &major, &minor, &code, &msg);
DEBUG(11, ("%s: Header parsed(%i): protocol->%s, major->%c, minor->%c, "
--
Samba Shared 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/2014-10-09-2009/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2014-10-09-2009/samba.stderr http://git.samba.org/autobuild.flakey/2014-10-09-2009/samba.stdout The top commit at the time of the failure was: commit c1f4b6c39beff7008a2746e65a9d8703b399f6a7 Author: Björn Baumbach Date: Thu Oct 9 10:54:51 2014 +0200 build: do not install texpect binary anymore. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10862 Signed-off-by: Bjoern Baumbach Reviewed-by: Guenther Deschner Reviewed-by: Stefan Metzmacher Autobuild-User(master): Günther Deschner Autobuild-Date(master): Thu Oct 9 17:10:12 CEST 2014 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 644e53d configure: Unload the wrappers so waf configure succeeds.
from c1f4b6c build: do not install texpect binary anymore.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 644e53d615beecc44185b0e8b691e34b4ced7e7c
Author: Andreas Schneider
Date: Thu Oct 9 15:55:36 2014 +0200
configure: Unload the wrappers so waf configure succeeds.
Signed-off-by: Andreas Schneider
Reviewed-by: Volker Lendecke
Autobuild-User(master): Andreas Schneider
Autobuild-Date(master): Thu Oct 9 19:32:16 CEST 2014 on sn-devel-104
---
Summary of changes:
configure |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/configure b/configure
index 30858df..a94c835 100755
--- a/configure
+++ b/configure
@@ -9,6 +9,9 @@ WAF=./buildtools/bin/waf
JOBS=1
export JOBS
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+
cd . || exit 1
${PYTHON:=python} $WAF configure "$@" || exit 1
cd $PREVPATH
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c1f4b6c build: do not install texpect binary anymore.
from 678b75d nwrap: Bump version of nss_wrapper to 1.0.3.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c1f4b6c39beff7008a2746e65a9d8703b399f6a7
Author: Björn Baumbach
Date: Thu Oct 9 10:54:51 2014 +0200
build: do not install texpect binary anymore.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10862
Signed-off-by: Bjoern Baumbach
Reviewed-by: Guenther Deschner
Reviewed-by: Stefan Metzmacher
Autobuild-User(master): Günther Deschner
Autobuild-Date(master): Thu Oct 9 17:10:12 CEST 2014 on sn-devel-104
---
Summary of changes:
lib/texpect/wscript |6 ++
1 files changed, 2 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/texpect/wscript b/lib/texpect/wscript
index 51602f1..4163ca1 100644
--- a/lib/texpect/wscript
+++ b/lib/texpect/wscript
@@ -1,9 +1,7 @@
#!/usr/bin/env python
def configure(conf):
- conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h
util.h libutil.h')
+conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h
util.h libutil.h')
def build(bld):
- bld.SAMBA_BINARY('texpect',
- 'texpect.c',
- deps='popt util')
+bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util', install=False)
--
Samba Shared 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/2014-10-09-1709/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2014-10-09-1709/samba.stderr http://git.samba.org/autobuild.flakey/2014-10-09-1709/samba.stdout The top commit at the time of the failure was: commit 678b75d9c7e3a14f292f224a19df5f66ba2d74f0 Author: Andreas Schneider Date: Thu Oct 9 09:17:37 2014 +0200 nwrap: Bump version of nss_wrapper to 1.0.3. Signed-off-by: Andreas Schneider Reviewed-by: Michael Adam Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Thu Oct 9 14:47:16 CEST 2014 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 678b75d nwrap: Bump version of nss_wrapper to 1.0.3.
via c298542 nwrap: Make sure addr is initialized.
via 2bbd403 nwrap: Use DNS_NAME_MAX cause it is not available on BSD.
via 895b32b nwrap: Don't overflow the in_addr if convert IPv6.
via 94c87d1 nwrap: Fix resolving hostnames with a trailing dot.
via 6979082 nwrap: Fall back to RTLD_NEXT if we can't find libc.
from 1b27b73 s3-net: display full value of
"msDS-SupportedEncryptionTypes".
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 678b75d9c7e3a14f292f224a19df5f66ba2d74f0
Author: Andreas Schneider
Date: Thu Oct 9 09:17:37 2014 +0200
nwrap: Bump version of nss_wrapper to 1.0.3.
Signed-off-by: Andreas Schneider
Reviewed-by: Michael Adam
Autobuild-User(master): Andreas Schneider
Autobuild-Date(master): Thu Oct 9 14:47:16 CEST 2014 on sn-devel-104
commit c298542fe29c6b38c353417b22dc56c9c8722f6a
Author: Andreas Schneider
Date: Thu Oct 9 09:17:07 2014 +0200
nwrap: Make sure addr is initialized.
CID #72755
Signed-off-by: Andreas Schneider
Reviewed-by: Stefan Metzmacher
commit 2bbd403f39eb5bc6025014fe1514751dd5872207
Author: Andreas Schneider
Date: Thu Oct 9 09:16:33 2014 +0200
nwrap: Use DNS_NAME_MAX cause it is not available on BSD.
Also HOST_NAME_MAX is only for the value returned by gethostname(). It
is normally limited to 64 chars on Linux.
Signed-off-by: Andreas Schneider
Reviewed-by: Stefan Metzmacher
commit 895b32b2e39417072bc40afeb21293a08181399f
Author: Andreas Schneider
Date: Thu Oct 9 09:15:59 2014 +0200
nwrap: Don't overflow the in_addr if convert IPv6.
Signed-off-by: Andreas Schneider
Reviewed-by: Stefan Metzmacher
commit 94c87d134723a432d2d4e908d3c5d44b39fde1ae
Author: Andreas Schneider
Date: Thu Oct 9 09:14:57 2014 +0200
nwrap: Fix resolving hostnames with a trailing dot.
Signed-off-by: Andreas Schneider
Reviewed-by: Stefan Metzmacher
commit 697908277951dc7fb9570e17f2662d8734aab986
Author: Andreas Schneider
Date: Thu Oct 9 09:13:48 2014 +0200
nwrap: Fall back to RTLD_NEXT if we can't find libc.
Signed-off-by: Andreas Schneider
Reviewed-by: Michael Adam
---
Summary of changes:
lib/nss_wrapper/nss_wrapper.c | 79 ++--
lib/nss_wrapper/wscript |2 +-
2 files changed, 44 insertions(+), 37 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/nss_wrapper/nss_wrapper.c b/lib/nss_wrapper/nss_wrapper.c
index a012cbd..a41de9e 100644
--- a/lib/nss_wrapper/nss_wrapper.c
+++ b/lib/nss_wrapper/nss_wrapper.c
@@ -121,6 +121,10 @@ typedef nss_status_t NSS_STATUS;
#define __location__ __FILE__ ":" __LINESTR__
#endif
+#ifndef DNS_NAME_MAX
+#define DNS_NAME_MAX 255
+#endif
+
/* GCC have printf type attribute check. */
#ifdef HAVE_ATTRIBUTE_PRINTF_FORMAT
#define PRINTF_ATTRIBUTE(a,b) __attribute__ ((__format__ (__printf__, a, b)))
@@ -562,10 +566,6 @@ static void *nwrap_load_lib_handle(enum nwrap_lib lib)
void *handle = NULL;
int i;
-#ifdef HAVE_APPLE
- return RTLD_NEXT;
-#endif
-
#ifdef RTLD_DEEPBIND
flags |= RTLD_DEEPBIND;
#endif
@@ -619,10 +619,17 @@ static void *nwrap_load_lib_handle(enum nwrap_lib lib)
}
if (handle == NULL) {
+#ifdef RTLD_NEXT
+ handle = nwrap_main_global->libc->handle
+ = nwrap_main_global->libc->sock_handle
+ = nwrap_main_global->libc->nsl_handle
+ = RTLD_NEXT;
+#else
NWRAP_LOG(NWRAP_LOG_ERROR,
"Failed to dlopen library: %s\n",
dlerror());
exit(-1);
+#endif
}
return handle;
@@ -2348,10 +2355,18 @@ static void nwrap_files_endgrent(struct nwrap_backend
*b)
static struct hostent *nwrap_files_gethostbyname(const char *name, int af)
{
struct hostent *he;
+ char canon_name[DNS_NAME_MAX] = { 0 };
+ size_t name_len;
int i;
nwrap_files_cache_reload(nwrap_he_global.cache);
+ name_len = strlen(name);
+ if (name_len < sizeof(canon_name) && name[name_len - 1] == '.') {
+ strncpy(canon_name, name, name_len - 1);
+ name = canon_name;
+ }
+
for (i = 0; i < nwrap_he_global.num; i++) {
int j;
@@ -3842,13 +3857,20 @@ static int nwrap_getaddrinfo(const char *node,
struct addrinfo *p = NULL;
unsigned short port = 0;
struct hostent *he;
- struct in_addr in;
- bool is_addr_ipv4 = false;
- bool is_addr_ipv6 = false;
+ struct {
+ int family;
+ union {
+
