cleanup

[openldap] / servers / slapd / overlays / rwmdn.c

diff --git a/servers/slapd/overlays/rwmdn.c b/servers/slapd/overlays/rwmdn.c
index 8b26b9818ad38628eb73dde8d71678eb24b562f9..9348c70f119ad1cfa80e1fc44af7b6ebdcc36e53 100644 (file)
--- a/servers/slapd/overlays/rwmdn.c
+++ b/servers/slapd/overlays/rwmdn.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2007 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -159,9 +159,9 @@ rwm_dn_massage(
        struct berval   mdn;
        static char     *dmy = "";
 
-       assert( dc );
-       assert( in );
-       assert( dn );
+       assert( dc != NULL );
+       assert( in != NULL );
+       assert( dn != NULL );
 
        rc = rewrite_session( dc->rwmap->rwm_rw, dc->ctx,
                        ( in->bv_val ? in->bv_val : dmy ), 
@@ -202,6 +202,10 @@ rwm_dn_massage(
                BER_BVZERO( &mdn );
        }
 
+       if ( dn->bv_val == dmy ) {
+               BER_BVZERO( dn );
+       }
+
        return rc;
 }
 
@@ -221,9 +225,9 @@ rwm_dn_massage(
        int             i, src, dst;
        struct berval   tmpin;
 
-       assert( dc );
-       assert( in );
-       assert( dn );
+       assert( dc != NULL );
+       assert( in != NULL );
+       assert( dn != NULL );
 
        BER_BVZERO( dn );