switch to openldap-data directory

[openldap] / servers / slapd / backglue.c

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index ca467b19140af5e58bd277ca6b84d5bdcfb60d99..61bdf574d53f9ff4fe0e3abf80dabb9f8ec6255c 100644 (file)
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -806,7 +806,6 @@ glue_sub_init( )
        BackendDB *b1, *be;
        BackendInfo *bi;
        glueinfo *gi;
-       struct berval bv;
 
        /* While there are subordinate backends, search backwards through the
         * backends and connect them to their superior.
@@ -885,14 +884,7 @@ glue_sub_init( )
                                        gi->nodes * sizeof(gluenode));
                        }
                        gi->n[gi->nodes].be = be;
-                       if ( dnParent( be->be_nsuffix[0]->bv_val, 
-                                       (const char **)&bv.bv_val ) 
-                                       != LDAP_SUCCESS ) {
-                               return -1;
-                       }
-                       bv.bv_len = be->be_nsuffix[0]->bv_len - (bv.bv_val -
-                               be->be_nsuffix[0]->bv_val);
-                       gi->n[gi->nodes].pdn = bv;
+                       dnParent( be->be_nsuffix[0], &gi->n[gi->nodes].pdn ); 
                        gi->nodes++;
                }
                if (gi) {
@@ -900,14 +892,7 @@ glue_sub_init( )
                        gi = (glueinfo *)ch_realloc(gi,
                                sizeof(glueinfo) + gi->nodes * sizeof(gluenode));
                        gi->n[gi->nodes].be = gi->be;
-                       if ( dnParent( b1->be_nsuffix[0]->bv_val, 
-                                       (const char **)&bv.bv_val ) 
-                                       != LDAP_SUCCESS ) {
-                               return -1;
-                       }
-                       bv.bv_len = be->be_nsuffix[0]->bv_len - (bv.bv_val -
-                               be->be_nsuffix[0]->bv_val);
-                       gi->n[gi->nodes].pdn = bv;
+                       dnParent( b1->be_nsuffix[0], &gi->n[gi->nodes].pdn );
                        gi->nodes++;
                        b1->be_private = gi;
                        b1->bd_info = bi;