First stable an implementing latest namedref specification.

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 238c8f1d0b7068aaa17e0ea80b1eb6e816ba8572..6d733cf81d5bdd85cd95b23b2589de34cbeeba5c 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -209,8 +209,13 @@ do_add( Connection *conn, Operation *op )
         */
        be = select_backend( e->e_ndn, manageDSAit );
        if ( be == NULL ) {
+               struct berval **ref = referral_rewrite( default_referral,
+                       NULL, e->e_dn, LDAP_SCOPE_DEFAULT );
+
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-                       NULL, NULL, default_referral, NULL );
+                       NULL, NULL, ref ? ref : default_referral, NULL );
+
+               ber_bvecfree( ref );
                goto done;
        }
 
@@ -294,8 +299,15 @@ do_add( Connection *conn, Operation *op )
 
 #ifndef SLAPD_MULTIMASTER
                } else {
+                       struct berval **defref = be->be_update_refs
+                               ? be->be_update_refs : default_referral;
+                       struct berval **ref = referral_rewrite( defref,
+                               NULL, e->e_dn, LDAP_SCOPE_DEFAULT );
+
                        send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
-                               be->be_update_refs ? be->be_update_refs : default_referral, NULL );
+                               ref ? ref : defref, NULL );
+
+                       ber_bvecfree( ref );
 #endif
                }
        } else {
@@ -387,4 +399,3 @@ static int slap_mods2entry(
 
        return LDAP_SUCCESS;
 }
-