summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-01-30 13:32:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:06:19 -0500
commit7de55b30b739ac59f22c9e8ed91e36662e5b5b12 (patch)
treeeb3863c1d81937712728bcebe0bd08600d04c825
parent99fc191d5142ea2d6bcab9beb504d5e90b61742f (diff)
downloadsamba-7de55b30b739ac59f22c9e8ed91e36662e5b5b12.tar.gz
samba-7de55b30b739ac59f22c9e8ed91e36662e5b5b12.tar.bz2
samba-7de55b30b739ac59f22c9e8ed91e36662e5b5b12.zip
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)
-rw-r--r--source3/nsswitch/wbinfo.c6
-rwxr-xr-xsource3/script/mkversion.sh7
2 files changed, 9 insertions, 4 deletions
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