r13229: * fix bad comparison caught by the AIX compiler in wbinfo code

* update output from mkversion.sh to include the SAMBA_VENDOR_PATCH

diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index b7c3b0a98c5b3cd478eee07fe8d702c2a2bfce35..793a05f1790e095b210e4d16a7a7e0eb90843b90 100644 (file)
--- a/source/nsswitch/wbinfo.c
+++ b/source/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/source/script/mkversion.sh b/source/script/mkversion.sh
index 1ba7cd63699c1edac82178d2eae971ed233e545b..578405492135e1172b83cf5e5f48e410faa3a4f9 100755 (executable)
--- a/source/script/mkversion.sh
+++ b/source/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