The branch, master has been updated
via 15cebf3 util: fix build on platforms without IPv6 support
via 67ef65a s3: enable winbind also for upcoming FreeBSD/NetBSD
releases >=10
from e9f9f37 script/commit_mark.sh: add the current branch name
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 15cebf38c173db0d255010528eaff11e8aa4f258
Author: Björn Jacke <[email protected]>
Date: Wed Jun 6 21:37:46 2012 +0200
util: fix build on platforms without IPv6 support
something like this on World IPv6 Day II ... ;-)
Autobuild-User(master): Björn Jacke <[email protected]>
Autobuild-Date(master): Thu Jun 7 03:09:49 CEST 2012 on sn-devel-104
commit 67ef65a234ea01101e79e8f891c1049913a6ff81
Author: Björn Jacke <[email protected]>
Date: Wed Jun 6 13:20:08 2012 +0200
s3: enable winbind also for upcoming FreeBSD/NetBSD releases >=10
-----------------------------------------------------------------------
Summary of changes:
lib/util/util_net.c | 2 +-
source3/configure.in | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/util_net.c b/lib/util/util_net.c
index 36b3fcb..83afda4 100644
--- a/lib/util/util_net.c
+++ b/lib/util/util_net.c
@@ -93,10 +93,10 @@ static bool interpret_string_addr_pref(struct
sockaddr_storage *pss,
bool prefer_ipv4)
{
struct addrinfo *res = NULL;
+ int int_flags;
#if defined(HAVE_IPV6)
char addr[INET6_ADDRSTRLEN];
unsigned int scope_id = 0;
- int int_flags;
if (strchr_m(str, ':')) {
char *p = strchr_m(str, '%');
diff --git a/source3/configure.in b/source3/configure.in
index a11e96b..cf4e13e 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5774,7 +5774,7 @@ case "$host_os" in
NSSSONAMEVERSIONSUFFIX=".2"
WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
;;
- *freebsd[[5-9]]*)
+ *freebsd[[5-9]]* | *freebsd1[[0-9]]*)
# FreeBSD winbind client is implemented as a wrapper around
# the Linux version.
NSSSONAMEVERSIONSUFFIX=".1"
@@ -5784,7 +5784,7 @@ case "$host_os" in
WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT"
;;
- *netbsd*[[3-9]]*)
+ *netbsd*[[3-9]]* | *netbsd1[[0-9]]*)
# NetBSD winbind client is implemented as a wrapper
# around the Linux version. It needs getpwent_r() to
# indicate libc's use of the correct nsdispatch API.
--
Samba Shared Repository
