Merge branch 'master' of ssh://git.fedorahosted.org/git/389/ds

ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c

@@ -573,7 +573,8 @@ entryrdn_rename_subtree(backend *be,
         }
     }
     if (NULL == mynewsrdn && NULL == mynewsupsdn) {
-        slapi_log_error(SLAPI_LOG_FATAL, ENTRYRDN_TAG,
+        /* E.g., rename dn: cn=ABC    DEF,... --> cn=ABC DEF,... */
+        slapi_log_error(SLAPI_LOG_BACKLDBM, ENTRYRDN_TAG,
                         "entryrdn_rename_subtree: No new superior is given "
                         "and new rdn %s is identical to the original\n",
                         slapi_rdn_get_rdn(&oldsrdn));
@@ -1162,7 +1163,7 @@ entryrdn_lookup_dn(backend *be,
                    const char *rdn,
                    ID id,
                    char **dn,
-		   Slapi_RDN **psrdn,
+                   Slapi_RDN **psrdn,
                    back_txn *txn)
 {
     int rc = -1;
@@ -1351,9 +1352,9 @@ bail:
     /* it is guaranteed that db is not NULL. */
     dblayer_release_index_file(be, ai, db);
     if (psrdn) {
-	*psrdn = srdn;
+        *psrdn = srdn;
     } else {
-    	slapi_rdn_free(&srdn);
+        slapi_rdn_free(&srdn);
     }
     slapi_ch_free_string(&nrdn);
     slapi_ch_free_string(&keybuf);

ldap/servers/slapd/back-ldbm/ldbm_modrdn.c

@@ -166,7 +166,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
          * it's passed to slapi_sdn_init_normdn_byref */
         slapi_pblock_get( pb, SLAPI_MODRDN_NEWRDN, &newrdn );
         slapi_pblock_get( pb, SLAPI_MODRDN_NEWSUPERIOR_SDN, &dn_newsuperiordn );
-        slapi_sdn_init_normdn_byref(&dn_newrdn, newrdn);
+        slapi_sdn_init_dn_byref(&dn_newrdn, newrdn);
         /* slapi_sdn_init_normdn_byref(&dn_newsuperiordn, newsuperiordn); */
         slapi_sdn_get_parent(sdn, &dn_parentdn);
     }
@@ -245,7 +245,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
             slapi_pblock_get(pb, SLAPI_MODRDN_NEWRDN, &newrdn);
             slapi_ch_free_string(&newrdn);
             slapi_pblock_set(pb, SLAPI_MODRDN_NEWRDN, original_newrdn);
-            slapi_sdn_set_normdn_byref(&dn_newrdn, original_newrdn);
+            slapi_sdn_set_dn_byref(&dn_newrdn, original_newrdn);
             original_newrdn = slapi_ch_strdup(original_newrdn);
 
             slapi_pblock_get(pb, SLAPI_MODRDN_NEWSUPERIOR_SDN, &dn_newsuperiordn);
@@ -358,8 +358,8 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
                     /* newrdn is normalized, bu tno need to be case-ignored as 
                      * it's passed to slapi_sdn_init_normdn_byref */
                     slapi_pblock_get(pb, SLAPI_MODRDN_NEWRDN, &newrdn);
-                    slapi_sdn_init_normdn_byref(&dn_newrdn, newrdn);
-                    newdn= moddn_get_newdn(pb,sdn, &dn_newrdn, dn_newsuperiordn);
+                    slapi_sdn_init_dn_byref(&dn_newrdn, newrdn);
+                    newdn = moddn_get_newdn(pb,sdn, &dn_newrdn, dn_newsuperiordn);
                     slapi_sdn_set_dn_passin(&dn_newdn,newdn);
                     new_addr.sdn = &dn_newdn;
                     new_addr.udn = NULL;

ldap/servers/slapd/dn.c

@@ -912,7 +912,12 @@ slapi_dn_normalize_ext(char *src, size_t src_len, char **dest, size_t *dest_len)
                 }
                 state = B4SEPARATOR;
                 break;
-            } else { /* else if (SEPARATOR(*s)) */
+            } else if (ISSPACE(*s)) {
+                /* remove extra spaces, e.g., "cn=ABC   DEF" --> "cn=ABC DEF" */
+                *d++ = *s++;
+                while (ISSPACE(*s))
+                    s++;
+            } else {
                 *d++ = *s++;
             }
             if (state == INVALUE1ST) {
@@ -2419,7 +2424,30 @@ slapi_sdn_copy(const Slapi_DN *from, Slapi_DN *to)
 	SDN_DUMP( from, "slapi_sdn_copy from");
 	SDN_DUMP( to, "slapi_sdn_copy to");
 	slapi_sdn_done(to);
-	slapi_sdn_set_normdn_byval(to, slapi_sdn_get_dn(from));
+	if (from->udn)
+	{
+		to->flag = slapi_setbit_uchar(to->flag, FLAG_UDN);
+		to->udn= slapi_ch_strdup(from->udn);
+		PR_INCREMENT_COUNTER(slapi_sdn_counter_udn_created);
+		PR_INCREMENT_COUNTER(slapi_sdn_counter_udn_exist);
+	}
+	if (from->dn)
+	{
+		to->flag = slapi_setbit_uchar(to->flag, FLAG_DN);
+		to->dn = slapi_ch_strdup(from->dn);
+		/* dn is normalized; strlen(dn) == strlen(ndn) */
+		to->ndn_len = strlen(to->dn);
+		PR_INCREMENT_COUNTER(slapi_sdn_counter_dn_created);
+		PR_INCREMENT_COUNTER(slapi_sdn_counter_dn_exist);
+	}
+	if (from->ndn)
+	{
+		to->flag = slapi_setbit_uchar(to->flag, FLAG_NDN);
+		to->ndn = slapi_ch_strdup(from->ndn);
+		to->ndn_len = strlen(to->ndn);
+		PR_INCREMENT_COUNTER(slapi_sdn_counter_ndn_created);
+		PR_INCREMENT_COUNTER(slapi_sdn_counter_ndn_exist);
+	}
 }
 
 int

ldap/servers/slapd/entry.c

@@ -189,11 +189,13 @@ str2entry_fast( const char *rawdn, const Slapi_RDN *srdn, char *s, int flags, in
 	CSNSet *valuecsnset= NULL; /* Moved to this level so that the JCM csn_free call below gets useful */
 	CSN *maxcsn = NULL;
 	char *normdn = NULL;
-	int strict = 0;
 	Slapi_Attr **a = NULL;
 
-    /* Check if we should be performing strict validation. */
-    strict = config_get_dn_validate_strict();
+#ifdef OBSOLETE_DN_SYNTAX_CHECK
+	int strict = 0;
+	/* Check if we should be performing strict validation. */
+	strict = config_get_dn_validate_strict();
+#endif
 
 	/*
 	 * In string format, an entry looks like either of these:
@@ -456,7 +458,7 @@ str2entry_fast( const char *rawdn, const Slapi_RDN *srdn, char *s, int flags, in
 			/* moved the value setting code here to check Slapi_Attr 'a'
 			 * to retrieve the attribute syntax info */
 			svalue = value_new(NULL, CSN_TYPE_NONE, NULL);
-#if 0
+#ifdef OBSOLETE_DN_SYNTAX_CHECK
 			if (slapi_attr_is_dn_syntax_attr(*a)) {
 				int rc = 0;
 				char *dn_aval = NULL;
@@ -3085,14 +3087,18 @@ slapi_entry_add_rdn_values( Slapi_Entry *e )
 {
     const char *dn;
     char	**dns, **rdns;
+    const Slapi_DN *sdn;
     int	i, rc = LDAP_SUCCESS;
     Slapi_Value *foundVal;
     Slapi_Attr *attr;
 
-    if ( NULL == e || (dn = slapi_entry_get_dn_const(e))==NULL ) {
+    if (NULL == e || NULL == (sdn = slapi_entry_get_sdn_const(e))) {
         return( LDAP_SUCCESS );
     }
 
+    /* Preserve the original in case the RDN is missing as an attr-val pair
+     * in the entry. */
+    dn = slapi_sdn_get_udn(sdn);
     if (slapi_is_rootdse(dn)) {
         return( LDAP_SUCCESS );
     }

ldap/servers/slapd/modrdn.c

@@ -74,7 +74,6 @@ do_modrdn( Slapi_PBlock *pb )
 	BerElement	*ber;
 	char		*rawdn = NULL, *rawnewsuperior = NULL;
 	const char	*dn = NULL, *newsuperior = NULL;
-	char		*rawnewrdn = NULL;
 	char		*newrdn = NULL;
 	int		err = 0, deloldrdn = 0;
 	ber_len_t	len = 0;
@@ -106,8 +105,7 @@ do_modrdn( Slapi_PBlock *pb )
 	 *	}
 	 */
 
-	if ( ber_scanf( ber, "{aab", &rawdn, &rawnewrdn, &deloldrdn )
-	    == LBER_ERROR ) {
+	if (ber_scanf(ber, "{aab", &rawdn, &newrdn, &deloldrdn) == LBER_ERROR) {
 		LDAPDebug( LDAP_DEBUG_ANY,
 		    "ber_scanf failed (op=ModRDN; params=DN,newRDN,deleteOldRDN)\n",
 		    0, 0, 0 );
@@ -128,7 +126,7 @@ do_modrdn( Slapi_PBlock *pb )
 			send_ldap_result( pb, LDAP_PROTOCOL_ERROR, NULL,
 			    "received newSuperior in LDAPv2 modrdn", 0, NULL );
 			slapi_ch_free_string( &rawdn );
-			slapi_ch_free_string( &rawnewrdn );
+			slapi_ch_free_string( &newrdn );
 			goto free_and_return;
 		}
 		if ( ber_scanf( ber, "a", &rawnewsuperior ) == LBER_ERROR ) {
@@ -139,7 +137,7 @@ do_modrdn( Slapi_PBlock *pb )
 			send_ldap_result( pb, LDAP_PROTOCOL_ERROR, NULL,
 			    "unable to decode newSuperior parameter", 0, NULL );
 			slapi_ch_free_string( &rawdn );
-			slapi_ch_free_string( &rawnewrdn );
+			slapi_ch_free_string( &newrdn );
 			goto free_and_return;
 		}
 	}
@@ -154,19 +152,19 @@ do_modrdn( Slapi_PBlock *pb )
 			send_ldap_result(pb, LDAP_INVALID_DN_SYNTAX, 
 							 NULL, "invalid dn", 0, NULL);
 			slapi_ch_free_string( &rawdn );
-			slapi_ch_free_string( &rawnewrdn );
+			slapi_ch_free_string( &newrdn );
 			slapi_ch_free_string( &rawnewsuperior );
 			goto free_and_return;
 		}
 		/* check that the new rdn is formatted correctly */
-		err = slapi_dn_syntax_check(pb, rawnewrdn, 1);
+		err = slapi_dn_syntax_check(pb, newrdn, 1);
 		if (err) { /* syntax check failed */
-			op_shared_log_error_access(pb, "MODRDN", rawnewrdn?rawnewrdn:"", 
+			op_shared_log_error_access(pb, "MODRDN", newrdn?newrdn:"", 
 							"strict: invalid new rdn");
 			send_ldap_result(pb, LDAP_INVALID_DN_SYNTAX, 
 							 NULL, "invalid new rdn", 0, NULL);
 			slapi_ch_free_string( &rawdn );
-			slapi_ch_free_string( &rawnewrdn );
+			slapi_ch_free_string( &newrdn );
 			slapi_ch_free_string( &rawnewsuperior );
 			goto free_and_return;
 		}
@@ -178,20 +176,10 @@ do_modrdn( Slapi_PBlock *pb )
 		op_shared_log_error_access(pb, "MODRDN", rawdn, "invalid dn");
 		send_ldap_result(pb, LDAP_INVALID_DN_SYNTAX, NULL, 
 		                 "invalid dn", 0, NULL);
-		slapi_ch_free_string( &rawnewrdn );
+		slapi_ch_free_string( &newrdn );
 		slapi_ch_free_string( &rawnewsuperior );
 		goto free_and_return;
 	}
-	newrdn = slapi_create_dn_string("%s", rawnewrdn);
-	if (rawnewrdn && (NULL == newrdn)) {
-		op_shared_log_error_access(pb, "MODRDN", rawnewrdn, "invalid newrdn");
-		send_ldap_result(pb, LDAP_INVALID_DN_SYNTAX,
-		                 NULL, "invalid newrdn", 0, NULL);
-		slapi_ch_free_string( &rawnewrdn );
-		slapi_ch_free_string( &rawnewsuperior );
-		goto free_and_return;
-	}
-	slapi_ch_free_string( &rawnewrdn );
 
 	if (rawnewsuperior) {
 		if (config_get_dn_validate_strict()) {
@@ -219,7 +207,7 @@ do_modrdn( Slapi_PBlock *pb )
 	newdn = slapi_ch_smprintf("%s,%s", newrdn, parent);
 	/* slapi_sdn_init_normdn_passin expects normalized but NOT
 	 * decapitalized dn */
-	slapi_sdn_init_normdn_passin(&snewdn, newdn); /* newdn is normalized */
+	slapi_sdn_init_dn_passin(&snewdn, newdn);
 	if (0 == slapi_sdn_compare(&sdn, snewsuperior) ||
 	    0 == slapi_sdn_compare(&snewdn, snewsuperior)) {
 		op_shared_log_error_access(pb, "MODRDN", newsuperior,