The branch, v4-2-test has been updated
via 6eaa807 lib: texpect. Fix the build on Solaris.
via d770ca9 lib/texpect: prefer bsd/libutil.h if available
via dcb39ce lib/texpect: fix compiler warnings
via 447c9bf lib/texpect: make the code more portable by using
"replace.h" and "system/wait.h"
via 3ad9fc5 lib/texpect: portability fix, include signal.h
via b3d812b build:wafadmin: fix use of spaces instead of tabs.
via d020a34 waf: Fix the build on openbsd
via 5eb19c7 Initialize dwFlags field of DNS_RPC_NODE structure
from cb42626 VERSION: Bump version up to 4.2.1...
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test
- Log -----------------------------------------------------------------
commit 6eaa807faa330cd21accd6ac0eeef3a5eb64a766
Author: Tom Schulz <[email protected]>
Date: Fri Feb 13 13:47:14 2015 -0800
lib: texpect. Fix the build on Solaris.
Bug 11092 - texpect requires routines err and errx
https://bugzilla.samba.org/show_bug.cgi?id=11092
Signed-off-by: Tom Schulz <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Tue Feb 17 18:09:52 CET 2015 on sn-devel-104
(cherry picked from commit 4bbfc54d09d813d1fb827de5855ce40e8eab1095)
Autobuild-User(v4-2-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-2-test): Tue Mar 10 00:21:35 CET 2015 on sn-devel-104
commit d770ca99655d5386284b8238b87d3ed5d371aee5
Author: Stefan Metzmacher <[email protected]>
Date: Wed Dec 10 12:23:04 2014 +0000
lib/texpect: prefer bsd/libutil.h if available
Reviewed-by: Guenther Deschner <[email protected]>
Autobuild-User(master): Günther Deschner <[email protected]>
Autobuild-Date(master): Thu Dec 18 16:31:48 CET 2014 on sn-devel-104
(cherry picked from commit 0da7295fbc34170385d2b6bd165685aa092ab0ec)
commit dcb39ce24fe12ba24033a789b27feb15d9c720eb
Author: Stefan Metzmacher <[email protected]>
Date: Fri Sep 26 09:06:59 2014 +0200
lib/texpect: fix compiler warnings
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Günther Deschner <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit e27a23e6aa27ae2a9b6ae2e2a2560943157aaa5c)
commit 447c9bff1f2606371f45aebf3f85c1a4ae54fae0
Author: Stefan Metzmacher <[email protected]>
Date: Wed Oct 29 11:48:59 2014 +0100
lib/texpect: make the code more portable by using "replace.h" and
"system/wait.h"
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit 0f0148e020b6f85447f26de17c2b0b002bcdf498)
commit 3ad9fc5a979cdfc9aa22e53eab6ed5138d73b1e2
Author: Ralph Boehme <[email protected]>
Date: Thu Oct 9 14:34:02 2014 +0200
lib/texpect: portability fix, include signal.h
Signed-off-by: Ralph Boehme <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit ccb0d9d6169594e8dd1c8935c9dfec51ee7125c4)
commit b3d812b9278649e242460e36127fb60c07637120
Author: Michael Adam <[email protected]>
Date: Tue Mar 3 13:33:10 2015 +0100
build:wafadmin: fix use of spaces instead of tabs.
Indentation should not be a mixture of tabs and spaces.
Waf uses tabs.
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: David Disseldorp <[email protected]>
(cherry picked from commit 1826f06be7b286c8e343f272766fdb81a930013f)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10476
commit d020a34650b4ab10408b6fb51a15e3f051c508f2
Author: Volker Lendecke <[email protected]>
Date: Mon Feb 2 21:08:25 2015 +0100
waf: Fix the build on openbsd
We have single-digit vnum='0', make the assignment deal with it
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
Autobuild-User(master): Michael Adam <[email protected]>
Autobuild-Date(master): Tue Mar 3 03:33:24 CET 2015 on sn-devel-104
(cherry picked from commit a3adad7a1799703c6620d7e6590321d796291831)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10476
commit 5eb19c72788c8b361e06457cd970b1031bfbd5d3
Author: Samuel Cabrero <[email protected]>
Date: Mon Oct 20 14:31:01 2014 +0200
Initialize dwFlags field of DNS_RPC_NODE structure
This fixes issue #9791, where the MMC shows random data
listing the zone contents.
Signed-off-by: Samuel Cabrero <[email protected]>
Reviewed-by: Kamen Mazdrashki <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
(cherry picked from commit 13f0b6fe7720f7c81f11a896337b366a5f050546)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9791
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafadmin/Tools/ccroot.py | 4 +++-
lib/texpect/texpect.c | 32 +++++++++++++++-----------------
lib/texpect/wscript | 4 ++--
source4/rpc_server/dnsserver/dnsdata.c | 1 +
4 files changed, 21 insertions(+), 20 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafadmin/Tools/ccroot.py
b/buildtools/wafadmin/Tools/ccroot.py
index d59cf26..25c5179 100644
--- a/buildtools/wafadmin/Tools/ccroot.py
+++ b/buildtools/wafadmin/Tools/ccroot.py
@@ -184,7 +184,9 @@ def get_target_name(self):
# the import lib file name stays unversionned.
name = name + '-' + nums[0]
elif self.env.DEST_OS == 'openbsd':
- pattern = '%s.%s.%s' % (pattern, nums[0], nums[1])
+ pattern = '%s.%s' % (pattern, nums[0])
+ if len(nums) >= 2:
+ pattern += '.%s' % nums[1]
return os.path.join(dir, pattern % name)
diff --git a/lib/texpect/texpect.c b/lib/texpect/texpect.c
index c1a6a99..9256b5e 100644
--- a/lib/texpect/texpect.c
+++ b/lib/texpect/texpect.c
@@ -31,27 +31,19 @@
* SUCH DAMAGE.
*/
-#include "config.h"
+#include "replace.h"
+#include "system/filesys.h"
+#include "system/wait.h"
-#ifndef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
#ifdef HAVE_PTY_H
#include <pty.h>
#endif
#ifdef HAVE_UTIL_H
#include <util.h>
#endif
-#ifdef HAVE_LIBUTIL_H
+#ifdef HAVE_BSD_LIBUTIL_H
+#include <bsd/libutil.h>
+#elif defined HAVE_LIBUTIL_H
#include <libutil.h>
#endif
@@ -60,8 +52,12 @@
#endif /* STREAMPTY */
#include <popt.h>
-#include <errno.h>
+
+#ifdef HAVE_ERR_H
#include <err.h>
+#else
+#include <ccan/err/err.h>
+#endif
struct command {
enum { CMD_EXPECT = 0, CMD_SEND, CMD_PASSWORD } type;
@@ -369,8 +365,9 @@ int main(int argc, const char **argv)
pid_t pid;
poptContext pc;
const char *instruction_file;
+ const char **args;
const char *program;
- char* const *program_args;
+ char * const *program_args;
pc = poptGetContext("texpect",
argc,
@@ -388,7 +385,8 @@ int main(int argc, const char **argv)
}
instruction_file = poptGetArg(pc);
- program_args = poptGetArgs(pc);
+ args = poptGetArgs(pc);
+ program_args = (char * const *)discard_const_p(char *, args);
program = program_args[0];
if (opt_verbose) {
diff --git a/lib/texpect/wscript b/lib/texpect/wscript
index 4163ca1..3dd4740 100644
--- a/lib/texpect/wscript
+++ b/lib/texpect/wscript
@@ -1,7 +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 bsd/libutil.h libutil.h')
def build(bld):
- bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util', install=False)
+ bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util ccan',
install=False)
diff --git a/source4/rpc_server/dnsserver/dnsdata.c
b/source4/rpc_server/dnsserver/dnsdata.c
index 63e35d9..067654a 100644
--- a/source4/rpc_server/dnsserver/dnsdata.c
+++ b/source4/rpc_server/dnsserver/dnsdata.c
@@ -805,6 +805,7 @@ WERROR dns_fill_records_array(TALLOC_CTX *mem_ctx,
recs->rec[i].wLength = 0;
recs->rec[i].wRecordCount = 0;
recs->rec[i].dwChildCount = num_children;
+ recs->rec[i].dwFlags = 0;
/* The base records returned with empty name */
/* Children records returned with names */
--
Samba Shared Repository
