fix ITS#3406 wrt/ dnattr; silence warning

[openldap] / servers / slapd / value.c

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index e22cab5144839088dc83a2c1fe0a545794e30f18..ebec9e348174b90c23b9ce1af187296a4c6e2fbd 100644 (file)
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55,13 +55,8 @@ value_add(
                *vals = (BerVarray) SLAP_MALLOC( (nn + 1)
                    * sizeof(struct berval) );
                if( *vals == NULL ) {
-#ifdef NEW_LOGGING
-                        LDAP_LOG( OPERATION, ERR,
-                     "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#else
                        Debug(LDAP_DEBUG_TRACE,
                      "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#endif
                        return LBER_ERROR_MEMORY;
                }
                n = 0;
@@ -73,13 +68,8 @@ value_add(
                *vals = (BerVarray) SLAP_REALLOC( (char *) *vals,
                    (n + nn + 1) * sizeof(struct berval) );
                if( *vals == NULL ) {
-#ifdef NEW_LOGGING
-                        LDAP_LOG( OPERATION, ERR,
-                     "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#else
                        Debug(LDAP_DEBUG_TRACE,
                      "value_add: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#endif
                        return LBER_ERROR_MEMORY;
                }
        }
@@ -105,13 +95,8 @@ value_add_one(
        if ( *vals == NULL ) {
                *vals = (BerVarray) SLAP_MALLOC( 2 * sizeof(struct berval) );
                if( *vals == NULL ) {
-#ifdef NEW_LOGGING
-                        LDAP_LOG( OPERATION, ERR,
-                     "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#else
                        Debug(LDAP_DEBUG_TRACE,
                      "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#endif
                        return LBER_ERROR_MEMORY;
                }
                n = 0;
@@ -123,13 +108,8 @@ value_add_one(
                *vals = (BerVarray) SLAP_REALLOC( (char *) *vals,
                    (n + 2) * sizeof(struct berval) );
                if( *vals == NULL ) {
-#ifdef NEW_LOGGING
-                        LDAP_LOG( OPERATION, ERR,
-                     "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#else
                        Debug(LDAP_DEBUG_TRACE,
                      "value_add_one: SLAP_MALLOC failed.\n", 0, 0, 0 );
-#endif
                        return LBER_ERROR_MEMORY;
                }
        }
@@ -205,7 +185,6 @@ int asserted_value_validate_normalize(
        return LDAP_SUCCESS;
 }
 
-
 int
 value_match(
        int *match,