mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-04-06 15:00:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix line 62 of bprint.c "#elif" line with no expression.

Browse Source 
Add check for to configure.in vsprintf, since HAVE_VSPRINTF is presumably
what was intended there.  Finally, also protected a bunch of if test
expressions with double quotes, as they were producing illegal test
commands.
This commit is contained in:
Randy Kunkee 1998-12-24 01:31:40 +00:00
parent 9da13f321c
commit a451ccc50b
4 changed files with 441 additions and 460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

858
configure vendored
View File

File diff suppressed because it is too large Load Diff

38
configure.in
View File

@ -1147,7 +1147,7 @@ AC_FUNC_VPRINTF
if test $ac_cv_func_vprintf = yes ; then
dnl check for vsnprintf
AC_CHECK_FUNCS(vsnprintf)
AC_CHECK_FUNCS(vsnprintf vsprintf)
fi
AC_FUNC_WAIT3
@ -1214,71 +1214,71 @@ OL_SYS_ERRLIST
dnl ----------------------------------------------------------------
dnl Sort out defines
if test $ol_enable_debug != no ; then
if test "$ol_enable_debug" != no ; then
AC_DEFINE(LDAP_DEBUG,1)
fi
if test $ol_enable_syslog = yes ; then
if test "$ol_enable_syslog" = yes ; then
AC_DEFINE(LDAP_SYSLOG,1)
fi
if test $ol_enable_libui = yes ; then
if test "$ol_enable_libui" = yes ; then
AC_DEFINE(LDAP_LIBUI,1)
fi
if test $ol_enable_cache = no ; then
if test "$ol_enable_cache" = no ; then
AC_DEFINE(LDAP_NOCACHE,1)
fi
if test $ol_enable_dns != no ; then
if test "$ol_enable_dns" != no ; then
AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_DNS,LDAP_API_VENDOR_VERSION,1)
fi
if test $ol_enable_proctitle != no ; then
if test "$ol_enable_proctitle" != no ; then
AC_DEFINE(LDAP_PROCTITLE,1)
fi
if test $ol_enable_referrals != no ; then
if test "$ol_enable_referrals" != no ; then
AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_API_VENDOR_VERSION,1)
fi
if test $ol_enable_cldap != no ; then
if test "$ol_enable_cldap" != no ; then
AC_DEFINE(LDAP_CONNECTIONLESS,1)
fi
if test $ol_enable_aclgroups != no ; then
if test "$ol_enable_aclgroups" != no ; then
AC_DEFINE(SLAPD_ACLGROUPS,1)
fi
if test $ol_enable_crypt != no ; then
if test "$ol_enable_crypt" != no ; then
AC_DEFINE(SLAPD_CRYPT,1)
fi
if test $ol_enable_cleartext != no ; then
if test "$ol_enable_cleartext" != no ; then
AC_DEFINE(SLAPD_CLEARTEXT,1)
fi
if test $ol_enable_phonetic != no ; then
if test "$ol_enable_phonetic" != no ; then
AC_DEFINE(SLAPD_PHONETIC,1)
fi
if test $ol_enable_rlookups != no ; then
if test "$ol_enable_rlookups" != no ; then
AC_DEFINE(SLAPD_RLOOKUPS,1)
fi
if test $ol_link_ldbm != no ; then
if test "$ol_link_ldbm" != no ; then
AC_DEFINE(SLAPD_LDBM,1)
BUILD_SLAPD=yes
BUILD_LDBM=yes
fi
if test $ol_enable_passwd != no ; then
if test "$ol_enable_passwd" != no ; then
AC_DEFINE(SLAPD_PASSWD,1)
BUILD_SLAPD=yes
BUILD_PASSWD=yes
fi
if test $ol_enable_shell != no ; then
if test "$ol_enable_shell" != no ; then
AC_DEFINE(SLAPD_SHELL,1)
BUILD_SLAPD=yes
BUILD_SHELL=yes
fi
if test $ol_enable_slurpd != no -a $ol_link_threads != no -a \
if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \
$BUILD_SLAPD = yes ; then
BUILD_SLURPD=yes
fi
if test $ol_link_isode != no ; then
if test "$ol_link_isode" != no ; then
BUILD_LDAPD=yes
fi

3
include/portable.h.in
View File

@ -425,6 +425,9 @@ is provided ``as is'' without express or implied warranty.
/* Define if you have the vsnprintf function. */
#undef HAVE_VSNPRINTF
/* Define if you have the vsprintf function. */
#undef HAVE_VSPRINTF
/* Define if you have the waitpid function. */
#undef HAVE_WAITPID

2
libraries/liblber/bprint.c
View File

@ -59,7 +59,7 @@ va_dcl
#ifdef HAVE_VSNPRINTF
buf[sizeof(buf) - 1] = '\0';
vsnprintf( buf, sizeof(buf)-1, fmt, ap );
#elif
#elif HAVE_VSPRINTF
vsprintf( buf, fmt, ap ); /* hope it's not too long */
#else
/* use doprnt() */