unifdef -UNEW_LOGGING

[openldap] / servers / slapd / passwd.c

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index f0e97b6b9bd5e008812bc90bb39437fe6e20458c..6832098f956275ef0b3912d315bf31cda01f8c58 100644 (file)
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -269,13 +269,8 @@ int slap_passwd_parse( struct berval *reqdata,
        tag = ber_scanf( ber, "{" /*}*/ );
 
        if( tag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, ERR, 
-                       "slap_passwd_parse: decoding error\n", 0, 0, 0 );
-#else
                Debug( LDAP_DEBUG_TRACE,
                        "slap_passwd_parse: decoding error\n", 0, 0, 0 );
-#endif
                rc = LDAP_PROTOCOL_ERROR;
                goto done;
        }
@@ -283,13 +278,8 @@ int slap_passwd_parse( struct berval *reqdata,
        tag = ber_peek_tag( ber, &len );
        if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_ID ) {
                if( id == NULL ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, ERR,
-                          "slap_passwd_parse: ID not allowed.\n", 0, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID not allowed.\n",
                                0, 0, 0 );
-#endif
 
                        *text = "user must change own password";
                        rc = LDAP_UNWILLING_TO_PERFORM;
@@ -299,13 +289,8 @@ int slap_passwd_parse( struct berval *reqdata,
                tag = ber_scanf( ber, "m", id );
 
                if( tag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, ERR,
-                          "slap_passwd_parse:  ID parse failed.\n", 0, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID parse failed.\n",
                                0, 0, 0 );
-#endif
 
                        goto decoding_error;
                }
@@ -315,13 +300,8 @@ int slap_passwd_parse( struct berval *reqdata,
 
        if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_OLD ) {
                if( oldpass == NULL ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, ERR,
-                          "slap_passwd_parse: OLD not allowed.\n" , 0, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD not allowed.\n",
                                0, 0, 0 );
-#endif
 
                        *text = "use bind to verify old password";
                        rc = LDAP_UNWILLING_TO_PERFORM;
@@ -331,13 +311,8 @@ int slap_passwd_parse( struct berval *reqdata,
                tag = ber_scanf( ber, "m", oldpass );
 
                if( tag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, ERR,
-                          "slap_passwd_parse:  ID parse failed.\n" , 0, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID parse failed.\n",
                                0, 0, 0 );
-#endif
 
                        goto decoding_error;
                }
@@ -347,13 +322,8 @@ int slap_passwd_parse( struct berval *reqdata,
 
        if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_NEW ) {
                if( newpass == NULL ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, ERR,
-                          "slap_passwd_parse:  NEW not allowed.\n", 0, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: NEW not allowed.\n",
                                0, 0, 0 );
-#endif
 
                        *text = "user specified passwords disallowed";
                        rc = LDAP_UNWILLING_TO_PERFORM;
@@ -363,13 +333,8 @@ int slap_passwd_parse( struct berval *reqdata,
                tag = ber_scanf( ber, "m", newpass );
 
                if( tag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, ERR,
-                          "slap_passwd_parse:  OLD parse failed.\n", 0, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD parse failed.\n",
                                0, 0, 0 );
-#endif
 
                        goto decoding_error;
                }
@@ -379,14 +344,9 @@ int slap_passwd_parse( struct berval *reqdata,
 
        if( len != 0 ) {
 decoding_error:
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, ERR, 
-                       "slap_passwd_parse: decoding error, len=%ld\n", (long)len, 0, 0 );
-#else
                Debug( LDAP_DEBUG_TRACE,
                        "slap_passwd_parse: decoding error, len=%ld\n",
                        (long) len, 0, 0 );
-#endif
 
                *text = "data decoding error";
                rc = LDAP_PROTOCOL_ERROR;
@@ -407,13 +367,8 @@ struct berval * slap_passwd_return(
 
        assert( cred != NULL );
 
-#ifdef NEW_LOGGING
-       LDAP_LOG( OPERATION, ENTRY, 
-               "slap_passwd_return: %ld\n",(long)cred->bv_len, 0, 0 );
-#else
        Debug( LDAP_DEBUG_TRACE, "slap_passwd_return: %ld\n",
                (long) cred->bv_len, 0, 0 );
-#endif
        
        ber_init_w_nullc( ber, LBER_USE_DER );
 
@@ -466,11 +421,7 @@ slap_passwd_check(
 void
 slap_passwd_generate( struct berval *pass )
 {
-#ifdef NEW_LOGGING
-       LDAP_LOG( OPERATION, ENTRY, "slap_passwd_generate: begin\n", 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_TRACE, "slap_passwd_generate\n", 0, 0, 0 );
-#endif
        pass->bv_val = NULL;
        pass->bv_len = 0;