X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdn2id.c;h=b0bef02a1da63cc72b7be709601cdcf6c8a9d7bc;hb=6df9b5459294bcc9adf27f048508d43eea58a203;hp=33fb362256a3b81177429a33ae8922e3d884508a;hpb=7f54a89f32c34ec0e109ef3ca41c36545fe42b7c;p=openldap diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c index 33fb362256..b0bef02a1d 100644 --- a/servers/slapd/back-bdb/dn2id.c +++ b/servers/slapd/back-bdb/dn2id.c @@ -64,13 +64,7 @@ bdb_dn2id_add( goto done; } - rc = dnParent( &ptr, &pdn ); - if ( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_ANY, - "=> bdb_dn2id_add: dnParent(\"%s\") failed\n", - ptr.bv_val, 0, 0 ); - goto done; - } + dnParent( &ptr, &pdn ); key.size = pdn.bv_len + 2; pdn.bv_val[-1] = DN_ONE_PREFIX; @@ -98,13 +92,7 @@ bdb_dn2id_add( ptr.bv_val, rc, 0 ); break; } - rc = dnParent( &ptr, &pdn ); - if ( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_ANY, - "=> bdb_dn2id_add: dnParent(\"%s\") failed\n", - ptr.bv_val, 0, 0 ); - goto done; - } + dnParent( &ptr, &pdn ); key.size = pdn.bv_len + 2; key.data = pdn.bv_val - 1; @@ -163,13 +151,7 @@ bdb_dn2id_delete( goto done; } - rc = dnParent( &ptr, &pdn ); - if ( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_ANY, - "=> bdb_dn2id_delete: dnParent(\"%s\") failed\n", - ptr.bv_val, 0, 0 ); - goto done; - } + dnParent( &ptr, &pdn ); key.size = pdn.bv_len + 2; pdn.bv_val[-1] = DN_ONE_PREFIX; @@ -196,13 +178,7 @@ bdb_dn2id_delete( ptr.bv_val, rc, 0 ); goto done; } - rc = dnParent( &ptr, &pdn ); - if ( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_ANY, - "=> bdb_dn2id_delete: dnParent(\"%s\") failed\n", - ptr.bv_val, 0, 0 ); - goto done; - } + dnParent( &ptr, &pdn ); key.size = pdn.bv_len + 2; key.data = pdn.bv_val - 1; @@ -319,13 +295,7 @@ bdb_dn2id_matched( struct berval pdn; if ( ! be_issuffix( be, &dn ) ) { - rc = dnParent( &dn, &pdn ); - if ( rc != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_TRACE, - "<= bdb_dn2id_matched: dnParent(\"%s\") failed\n", - dn.bv_val, 0, 0 ); - break; - } + dnParent( &dn, &pdn ); } else { Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_matched: no match\n",