svn commit: samba r13229 - branches/SAMBA_3_0/source/nsswitch branches/SAMBA_3_0/source/script trunk/source/nsswitch trunk/source/script

[jerry at samba.org]

Author: jerry
Date: 2006-01-30 13:32:41 +0000 (Mon, 30 Jan 2006)
New Revision: 13229

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13229

Log:
* fix bad comparison caught by the AIX compiler in wbinfo code
* update output from mkversion.sh to include the SAMBA_VENDOR_PATCH


Modified:
   branches/SAMBA_3_0/source/nsswitch/wbinfo.c
   branches/SAMBA_3_0/source/script/mkversion.sh
   trunk/source/nsswitch/wbinfo.c
   trunk/source/script/mkversion.sh


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/wbinfo.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/wbinfo.c	2006-01-30 08:12:35 UTC (rev 13228)
+++ branches/SAMBA_3_0/source/nsswitch/wbinfo.c	2006-01-30 13:32:41 UTC (rev 13229)
@@ -47,7 +47,7 @@
 	    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 @@
 	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 @@
 			break;
 		case OPT_SEPARATOR: {
 			const char sep = winbind_separator_int(True);
-			if (sep == -1) {
+			if ( !sep ) {
 				goto done;
 			}
 			d_printf("%c\n", sep);

Modified: branches/SAMBA_3_0/source/script/mkversion.sh
===================================================================
--- branches/SAMBA_3_0/source/script/mkversion.sh	2006-01-30 08:12:35 UTC (rev 13228)
+++ branches/SAMBA_3_0/source/script/mkversion.sh	2006-01-30 13:32:41 UTC (rev 13229)
@@ -102,7 +102,12 @@
 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

Modified: trunk/source/nsswitch/wbinfo.c
===================================================================
--- trunk/source/nsswitch/wbinfo.c	2006-01-30 08:12:35 UTC (rev 13228)
+++ trunk/source/nsswitch/wbinfo.c	2006-01-30 13:32:41 UTC (rev 13229)
@@ -47,7 +47,7 @@
 	    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 @@
 	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();
@@ -1344,7 +1344,7 @@
 			break;
 		case OPT_SEPARATOR: {
 			const char sep = winbind_separator_int(True);
-			if (sep == -1) {
+			if ( !sep ) {
 				goto done;
 			}
 			d_printf("%c\n", sep);

Modified: trunk/source/script/mkversion.sh
===================================================================
--- trunk/source/script/mkversion.sh	2006-01-30 08:12:35 UTC (rev 13228)
+++ trunk/source/script/mkversion.sh	2006-01-30 13:32:41 UTC (rev 13229)
@@ -102,7 +102,12 @@
 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