The branch, v3-6-test has been updated
via 1daeb4a replace: Add missing eval to m4 script
via a87aee5 socket_wrapper: avoid c++ style comments.
from 310a478 libwbclient: doxygen: mark wbcSetGidHwm deprecated
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 1daeb4a87f3ae3afeb6fe00c6afce9c7a04e4f9d
Author: Sumit Bose <[email protected]>
Date: Tue Feb 8 10:55:06 2011 +0100
replace: Add missing eval to m4 script
Autobuild-User: Günther Deschner <[email protected]>
Autobuild-Date: Thu Feb 10 16:14:21 CET 2011 on sn-devel-104
(cherry picked from commit d02b5cd65574a3f0af3fa73439af251e728c87d8)
commit a87aee592f39899d9d32eeb88469f65c22e45630
Author: Günther Deschner <[email protected]>
Date: Thu Feb 10 14:20:34 2011 +0100
socket_wrapper: avoid c++ style comments.
Seen on the aix s3-waf build where it causes the build to fail.
Guenther
(cherry picked from commit 2f6d76a95fea8aa1696c039516818d9e3bfe35d1)
-----------------------------------------------------------------------
Summary of changes:
lib/replace/libreplace_macros.m4 | 4 ++--
lib/socket_wrapper/socket_wrapper.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/libreplace_macros.m4 b/lib/replace/libreplace_macros.m4
index 1856eac..46aedd3 100644
--- a/lib/replace/libreplace_macros.m4
+++ b/lib/replace/libreplace_macros.m4
@@ -293,9 +293,9 @@ AC_DEFUN(AC_VERIFY_C_PROTOTYPE,
$2
}
])],[
- AS_TR_SH([ac_cv_c_prototype_$1])=yes
+ eval AS_TR_SH([ac_cv_c_prototype_$1])=yes
],[
- AS_TR_SH([ac_cv_c_prototype_$1])=no
+ eval AS_TR_SH([ac_cv_c_prototype_$1])=no
])
)
AS_IF([test $AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4])
diff --git a/lib/socket_wrapper/socket_wrapper.c
b/lib/socket_wrapper/socket_wrapper.c
index 2985d00..594b807 100644
--- a/lib/socket_wrapper/socket_wrapper.c
+++ b/lib/socket_wrapper/socket_wrapper.c
@@ -969,7 +969,7 @@ static uint8_t *swrap_packet_init(struct timeval *tval,
ip->v6.ver_prio = 0x60; /* version 4 and 5 * 32 bit
words */
ip->v6.flow_label_high = 0x00;
ip->v6.flow_label_low = 0x0000;
- ip->v6.payload_length = htons(wire_len -
icmp_truncate_len);//TODO
+ ip->v6.payload_length = htons(wire_len - icmp_truncate_len);
/* TODO */
ip->v6.next_header = protocol;
memcpy(ip->v6.src_addr, src_in6->sin6_addr.s6_addr, 16);
memcpy(ip->v6.dest_addr, dest_in6->sin6_addr.s6_addr, 16);
@@ -1019,7 +1019,7 @@ static uint8_t *swrap_packet_init(struct timeval *tval,
ip->v6.ver_prio = 0x60; /* version 4 and 5 * 32
bit words */
ip->v6.flow_label_high = 0x00;
ip->v6.flow_label_low = 0x0000;
- ip->v6.payload_length = htons(wire_len -
icmp_truncate_len);//TODO
+ ip->v6.payload_length = htons(wire_len -
icmp_truncate_len); /* TODO */
ip->v6.next_header = protocol;
memcpy(ip->v6.src_addr, dest_in6->sin6_addr.s6_addr,
16);
memcpy(ip->v6.dest_addr, src_in6->sin6_addr.s6_addr,
16);
--
Samba Shared Repository
