From 7de55b30b739ac59f22c9e8ed91e36662e5b5b12 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 30 Jan 2006 13:32:41 +0000
Subject: r13229: * fix bad comparison caught by the AIX compiler in wbinfo
 code * update output from mkversion.sh to include the SAMBA_VENDOR_PATCH
 (This used to be commit 485f0370942880a71095da5096e414b28193b150)

---
 source3/nsswitch/wbinfo.c   | 6 +++---
 source3/script/mkversion.sh | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'source3')

diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c
index b7c3b0a98c..793a05f179 100644
--- a/source3/nsswitch/wbinfo.c
+++ b/source3/nsswitch/wbinfo.c
@@ -47,7 +47,7 @@ static char winbind_separator_int(BOOL strict)
 	    NSS_STATUS_SUCCESS) {
 		d_fprintf(stderr, "could not obtain winbind separator!\n");
 		if (strict) {
-			return -1;
+			return 0;
 		}
 		/* HACK: (this module should not call lp_ funtions) */
 		return *lp_winbind_separator();
@@ -59,7 +59,7 @@ static char winbind_separator_int(BOOL strict)
 	if (!sep) {
 		d_fprintf(stderr, "winbind separator was NULL!\n");
 		if (strict) {
-			return -1;
+			return 0;
 		}
 		/* HACK: (this module should not call lp_ funtions) */
 		sep = *lp_winbind_separator();
@@ -1217,7 +1217,7 @@ int main(int argc, char **argv)
 			break;
 		case OPT_SEPARATOR: {
 			const char sep = winbind_separator_int(True);
-			if (sep == -1) {
+			if ( !sep ) {
 				goto done;
 			}
 			d_printf("%c\n", sep);
diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index 1ba7cd6369..5784054921 100755
--- a/source3/script/mkversion.sh
+++ b/source3/script/mkversion.sh
@@ -102,7 +102,12 @@ echo "#define SAMBA_VERSION_STRING samba_version_string()" >> $OUTPUT_FILE
 echo "$0: 'include/version.h' created for Samba(\"${SAMBA_VERSION_STRING}\")"
 
 if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then
-    echo "$0: with VENDOR_SUFFIX = ${SAMBA_VERSION_VENDOR_SUFFIX}"
+    echo -n "$0: with VENDOR_SUFFIX = \""
+    echo -n ${SAMBA_VERSION_VENDOR_SUFFIX} | sed 's/"//g'
+    if test -n ${SAMBA_VENDOR_PATCH}; then
+       echo -n "-${SAMBA_VENDOR_PATCH}"
+   fi
+   echo "\""
 fi
 
 exit 0
-- 
cgit