sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-29 02:50:28 +03:00
Code

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

Browse Source 
* update output from mkversion.sh to include the SAMBA_VENDOR_PATCH
(This used to be commit 485f0370942880a71095da5096e414b28193b150)
This commit is contained in:
Gerald Carter 2006-01-30 13:32:41 +00:00 committed by Gerald (Jerry) Carter
parent 99fc191d51
commit 7de55b30b7
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/nsswitch/wbinfo.c
View File

@ -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);

7
source3/script/mkversion.sh
View File

@ -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