Import ITS#2007 and ITS#2009 bug fixes from HEAD

[openldap] / servers / slapd / referral.c

diff --git a/servers/slapd/referral.c b/servers/slapd/referral.c
index d3caa3ffd4a0c39c767160ae4fc48ea1f04d1a92..a836657fe1bc18ea74429b2ba47401b545e66d9d 100644 (file)
--- a/servers/slapd/referral.c
+++ b/servers/slapd/referral.c
@@ -152,9 +152,9 @@ int validate_global_referral( const char *url )
        default:
                /* other error, bail */
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
+               LDAP_LOG( CONFIG, CRIT, 
                        "referral: invalid URL (%s): %s (%d)\n",
-                       url, "" /* ldap_url_error2str(rc) */, rc ));
+                       url, "" /* ldap_url_error2str(rc) */, rc );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "referral: invalid URL (%s): %s (%d)\n",
@@ -167,9 +167,7 @@ int validate_global_referral( const char *url )
 
        if( lurl->lud_dn && *lurl->lud_dn ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
-                       "referral: URL (%s): contains DN\n",
-                       url ));
+               LDAP_LOG( CONFIG, CRIT, "referral: URL (%s): contains DN\n", url, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "referral: URL (%s): contains DN\n",
@@ -179,9 +177,8 @@ int validate_global_referral( const char *url )
 
        } else if( lurl->lud_attrs ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
-                       "referral: URL (%s): requests attributes\n",
-                       url ));
+               LDAP_LOG( CONFIG, CRIT, 
+                       "referral: URL (%s): requests attributes\n", url, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "referral: URL (%s): requests attributes\n",
@@ -191,9 +188,8 @@ int validate_global_referral( const char *url )
 
        } else if( lurl->lud_scope != LDAP_SCOPE_DEFAULT ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
-                       "referral: URL (%s): contains explicit scope\n",
-                       url ));
+               LDAP_LOG( CONFIG, CRIT, 
+                       "referral: URL (%s): contains explicit scope\n", url, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "referral: URL (%s): contains explicit scope\n",
@@ -203,9 +199,8 @@ int validate_global_referral( const char *url )
 
        } else if( lurl->lud_filter ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
-                       "referral: URL (%s): contains explicit filter\n",
-                       url ));
+               LDAP_LOG( CONFIG, CRIT, 
+                       "referral: URL (%s): contains explicit filter\n", url, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "referral: URL (%s): contains explicit filter\n",
@@ -314,7 +309,7 @@ BerVarray get_entry_referrals(
 
                /* trim the label */
                for( k=0; k<jv->bv_len; k++ ) {
-                       if( isspace(jv->bv_val[k]) ) {
+                       if( isspace( (unsigned char) jv->bv_val[k] ) ) {
                                jv->bv_val[k] = '\0';
                                jv->bv_len = k;
                                break;