mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clarify/standardize library version mismatch error messages

Browse Source
This commit is contained in:
Howard Chu 2003-09-12 00:54:21 +00:00
parent b3e8d9189c
commit 10811b6f51
3 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libraries/libldap/cyrus.c
View File

@ -57,22 +57,29 @@ int ldap_int_sasl_init( void )
};
#ifdef HAVE_SASL_VERSION
#define SASL_BUILD_VERSION ((SASL_VERSION_MAJOR << 24) |\
(SASL_VERSION_MINOR << 16) | SASL_VERSION_STEP)
/* stringify the version number, sasl.h doesn't do it for us */
#define VSTR0(maj, min, pat) #maj "." #min "." #pat
#define VSTR(maj, min, pat) VSTR0(maj, min, pat)
#define SASL_VERSION_STRING VSTR(SASL_VERSION_MAJOR, SASL_VERSION_MINOR, \
SASL_VERSION_STEP)
{ int rc;
sasl_version( NULL, &rc );
if ( ((rc >> 16) != ((SASL_VERSION_MAJOR << 8)|SASL_VERSION_MINOR)) ||
(rc & 0xffff) < SASL_VERSION_STEP) {
char version[sizeof("xxx.xxx.xxxxx")];
sprintf( version, "%d.%d.%d", rc >> 24, rc >> 16 * 0xff,
rc & 0xffff );
#ifdef NEW_LOGGING
LDAP_LOG( TRANSPORT, INFO,
"ldap_int_sasl_init: SASL version mismatch, got %x, wanted %x.\n",
rc, SASL_BUILD_VERSION, 0 );
"ldap_int_sasl_init: SASL library version mismatch:"
" expected " SASL_VERSION_STRING ","
" got %s\n", version, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"ldap_int_sasl_init: SASL version mismatch, got %x, wanted %x.\n",
rc, SASL_BUILD_VERSION, 0 );
"ldap_int_sasl_init: SASL library version mismatch:"
" expected " SASL_VERSION_STRING ","
" got %s\n", version, 0, 0 );
#endif
return -1;
}

11
servers/slapd/back-bdb/init.c
View File

@ -615,13 +615,14 @@ bdb_initialize(
{
#ifdef NEW_LOGGING
LDAP_LOG( BACK_BDB, ERR,
"bdb_db_initialize: version mismatch: "
"\texpected: %s \tgot: %s\n", DB_VERSION_STRING, version, 0 );
"bdb_initialize: BDB library version mismatch:"
" expected " DB_VERSION_STRING ","
" got %s\n", version, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"bdb_initialize: version mismatch\n"
"\texpected: " DB_VERSION_STRING "\n"
"\tgot: %s \n", version, 0, 0 );
"bdb_initialize: BDB library version mismatch:"
" expected " DB_VERSION_STRING ","
" got %s\n", version, 0, 0 );
#endif
}

21
servers/slapd/sasl.c
View File

@ -965,21 +965,28 @@ int slap_sasl_init( void )
};
#ifdef HAVE_SASL_VERSION
#define SASL_BUILD_VERSION ((SASL_VERSION_MAJOR << 24) |\
(SASL_VERSION_MINOR << 16) | SASL_VERSION_STEP)
/* stringify the version number, sasl.h doesn't do it for us */
#define VSTR0(maj, min, pat) #maj "." #min "." #pat
#define VSTR(maj, min, pat) VSTR0(maj, min, pat)
#define SASL_VERSION_STRING VSTR(SASL_VERSION_MAJOR, SASL_VERSION_MINOR, \
SASL_VERSION_STEP)
sasl_version( NULL, &rc );
if ( ((rc >> 16) != ((SASL_VERSION_MAJOR << 8)|SASL_VERSION_MINOR)) ||
(rc & 0xffff) < SASL_VERSION_STEP) {
char version[sizeof("xxx.xxx.xxxxx")];
sprintf( version, "%d.%d.%d", rc >> 24, rc >> 16 & 0xff,
rc & 0xffff );
#ifdef NEW_LOGGING
LDAP_LOG( TRANSPORT, INFO,
"slap_sasl_init: SASL version mismatch, got %x, wanted %x.\n",
rc, SASL_BUILD_VERSION, 0 );
"slap_sasl_init: SASL library version mismatch:"
" expected " SASL_VERSION_STRING ","
" got %s\n", version, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"slap_sasl_init: SASL version mismatch, got %x, wanted %x.\n",
rc, SASL_BUILD_VERSION, 0 );
"slap_sasl_init: SASL library version mismatch:"
" expected " SASL_VERSION_STRING ","
" got %s\n", version, 0, 0 );
#endif
return -1;
}