diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2010-02-01 13:59:53 -0800 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2010-02-01 13:59:53 -0800 |
| commit | 0544378b347be0aa9b5ded0abd75d841bfcfe9d3 (patch) | |
| tree | a08efa5e6c7b37fd44dd4ea1746460b368a1c135 /ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | |
| parent | c9c424c34c703082d7da3e4b2f3c366f81185a58 (diff) | |
| download | ds-0544378b347be0aa9b5ded0abd75d841bfcfe9d3.tar.gz ds-0544378b347be0aa9b5ded0abd75d841bfcfe9d3.tar.xz ds-0544378b347be0aa9b5ded0abd75d841bfcfe9d3.zip | |
Undo - 555577 - Syntax validation fails for "ou=NetscapeRoot" tree
https://bugzilla.redhat.com/show_bug.cgi?id=555577
Undoing the previous checkin.
The parameter "strict" is for the trength of the DN validation.
It should be confusing to use it for turning on/off the validation
itself.
Diffstat (limited to 'ldap/servers/slapd/back-ldbm/ldbm_modrdn.c')
| -rw-r--r-- | ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c index 40a5888b..7af84323 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c @@ -204,15 +204,12 @@ ldbm_back_modrdn( Slapi_PBlock *pb ) slapi_sdn_set_dn_passin(&dn_newdn,newdn); new_addr.dn = (char*)slapi_sdn_get_ndn (&dn_newdn); /* check dn syntax on newdn */ - if (config_get_dn_validate_strict()) + ldap_result_code = slapi_dn_syntax_check(pb, new_addr.dn, 1); + if (ldap_result_code) { - ldap_result_code = slapi_dn_syntax_check(pb, new_addr.dn, 1); - if (ldap_result_code) - { - ldap_result_code = LDAP_INVALID_DN_SYNTAX; - slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); - goto error_return; - } + ldap_result_code = LDAP_INVALID_DN_SYNTAX; + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); + goto error_return; } new_addr.uniqueid = NULL; ldap_result_code= get_copy_of_entry(pb, &new_addr, &txn, SLAPI_MODRDN_EXISTING_ENTRY, 0); @@ -272,15 +269,12 @@ ldbm_back_modrdn( Slapi_PBlock *pb ) /* find and lock the entry we are about to modify */ done_with_pblock_entry(pb,SLAPI_MODRDN_TARGET_ENTRY); /* Could be through this multiple times */ slapi_pblock_get (pb, SLAPI_TARGET_ADDRESS, &old_addr); - if (config_get_dn_validate_strict()) + ldap_result_code = slapi_dn_syntax_check(pb, old_addr->dn, 1); + if (ldap_result_code) { - ldap_result_code = slapi_dn_syntax_check(pb, old_addr->dn, 1); - if (ldap_result_code) - { - ldap_result_code = LDAP_INVALID_DN_SYNTAX; - slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); - goto error_return; - } + ldap_result_code = LDAP_INVALID_DN_SYNTAX; + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); + goto error_return; } ldap_result_code= get_copy_of_entry(pb, old_addr, &txn, SLAPI_MODRDN_TARGET_ENTRY, !is_replicated_operation); if(ldap_result_code==LDAP_OPERATIONS_ERROR || |