diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index 41e74eda9b..bac5ff3586 100644
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -671,7 +671,7 @@ int
 bdb_dn2id_add(
 	BackendDB	*be,
 	DB_TXN *txn,
-	const char	*pdn,
+	char	*pdn,
 	Entry		*e )
 {
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index a82be0b649..a8b1eb654b 100644
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -373,7 +373,7 @@ int dn_rdnlen(
 	Backend	*be,
 	const char	*dn_in )
 {
-	char	*dn, *s;
+	char	*s;
 	int	inquote;
 
 	if( dn_in == NULL ) {
@@ -392,11 +392,9 @@ int dn_rdnlen(
 		return( 0 );
 	}
 
-	dn = dn_in;
-
 	inquote = 0;
 
-	for ( s = dn; *s; s++ ) {
+	for ( s = (char *)dn_in; *s; s++ ) {
 		if ( *s == '\\' ) {
 			if ( *(s + 1) ) {
 				s++;
@@ -416,7 +414,7 @@ int dn_rdnlen(
 		}
 	}
 
-	return( s - dn );
+	return( s - dn_in );
 }
 
 char * dn_rdn(