Attachment 312931 Details for Bug 428232 – cvs diff ldap/servers/slapd/back-ldbm/ldbm_modrdn.c

[patch] cvs diff ldap/servers/slapd/back-ldbm/ldbm_modrdn.c

428232.diff (text/plain), 1.95 KB, created by Noriko Hosoi on 2008-07-29 20:19:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2008-07-29 20:19:53 UTC

Size: 1.95 KB

patch

obsolete

>Index: back-ldbm/ldbm_modrdn.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c,v
>retrieving revision 1.7
>diff -t -w -U4 -r1.7 ldbm_modrdn.c
>--- back-ldbm/ldbm_modrdn.c	18 Oct 2007 22:40:18 -0000	1.7
>+++ back-ldbm/ldbm_modrdn.c	29 Jul 2008 20:16:18 -0000
>@@ -262,14 +262,16 @@
>         {
>             ldap_result_code= -1;
>             goto error_return; /* error result sent by find_entry2modify() */
>         }
>-
>     /* Check that an entry with the same DN doesn't already exist. */
>         {
>                 Slapi_Entry *entry;
>                 slapi_pblock_get( pb, SLAPI_MODRDN_EXISTING_ENTRY, &entry);
>-                if(entry!=NULL)
>+                if((entry != NULL) && 
>+                        /* allow modrdn even if the src dn and dest dn are identical */
>+                   (0 != slapi_sdn_compare((const Slapi_DN *)&dn_newdn,
>+                                                                   (const Slapi_DN *)&dn_olddn)))
>                 {
>                         ldap_result_code= LDAP_ALREADY_EXISTS;
>                         goto error_return;
>                 }
>@@ -416,9 +418,13 @@
> 
>         slapi_entry_set_sdn( ec->ep_entry, &dn_newdn );
> 
>         /* create it in the cache - prevents others from creating it */
>-        if ( cache_add_tentative( &inst->inst_cache, ec, NULL ) != 0 ) {
>+        if (( cache_add_tentative( &inst->inst_cache, ec, NULL ) != 0 ) &&
>+                /* allow modrdn even if the src dn and dest dn are identical */
>+                ( 0 != slapi_sdn_compare((const Slapi_DN *)&dn_newdn,
>+                                                             (const Slapi_DN *)&dn_olddn)) )
>+        {
>                 /* somebody must've created it between dn2entry() and here */
>                 /* JCMREPL - Hmm... we can't permit this to happen...? */
>                 ldap_result_code= LDAP_ALREADY_EXISTS;
>                 goto error_return;

Actions: View | Diff

Attachments on bug 428232: 312887 | 312890 | 312925 | 312926 | 312931 | 312932