add logs; fix bug in group/dn selection logic

[openldap] / servers / slapd / dn.c

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index cb7fb5417293ee393d206f968fd755e839941cbb..67c9f52a78378ce75f212a954f1d80a6c8d9c7ed 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -259,7 +259,7 @@ LDAPDN_rewrite( LDAPDN dn, unsigned flags, void *ctx )
                        slap_mr_normalize_func *normf = NULL;
                        slap_syntax_transform_func *transf = NULL;
                        MatchingRule *mr = NULL;
-                       struct berval           bv = { 0, NULL };
+                       struct berval           bv = BER_BVNULL;
                        int                     do_sort = 0;
 
                        assert( ava );
@@ -843,7 +843,7 @@ build_new_dn( struct berval * new_dn,
 {
        char *ptr;
 
-       if ( parent_dn == NULL ) {
+       if ( parent_dn == NULL || parent_dn->bv_len == 0 ) {
                ber_dupbv( new_dn, newrdn );
                return;
        }