ITS#5774

diff --git a/CHANGES b/CHANGES
index 5ff843489191fdd82eddef0c2df43317d9242c91..fdcdb4add4797d9e96222b8b6859260d5e6c1b63 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,7 @@ OpenLDAP 2.4.13 Engineering
        Added slapo-constraint "set" type (ITS#5702)
        Fixed slapo-constraint filter parsing error (ITS#5751)
        Added slapo-dynlist URI restriction ability (ITS#5761)
+       Fixed slapo-ldif file rename on windows (ITS#5774)
        Fixed slapo-ppolicy unaligned BerElement (ITS#5770)
        Fixed slapo-rwm objectClass preservation (ITS#5760)
        Fixed slapo-rwm rewriting undefined filter (ITS#5731)

diff --git a/servers/slapd/back-ldif/ldif.c b/servers/slapd/back-ldif/ldif.c
index 00608e7e0099156a59665224c8f8e52fa30f4915..3acb687fd2d17f503f3b00795adac989f16fca7f 100644 (file)
--- a/servers/slapd/back-ldif/ldif.c
+++ b/servers/slapd/back-ldif/ldif.c
@@ -336,7 +336,13 @@ spew_entry( Entry * e, struct berval * path, int dolock, int *save_errnop )
                                        tmpfname, STRERROR( save_errno ), 0 );
 
                        } else {
+#ifdef _WIN32
+                               /* returns 0 on failure, nonzero on success */
+                               res = MoveFileEx( tmpfname, path->bv_val,
+                                       MOVEFILE_REPLACE_EXISTING ) == 0;
+#else
                                res = rename( tmpfname, path->bv_val );
+#endif
                                if ( res == 0 ) {
                                        rs = LDAP_SUCCESS;