From e4f22de69c1e972ea4f5d8191cc20788311dc0e9 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Mon, 10 Nov 2008 20:38:55 +0000 Subject: [PATCH] ITS#5774 --- CHANGES | 1 + servers/slapd/back-ldif/ldif.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/CHANGES b/CHANGES index 5ff8434891..fdcdb4add4 100644 --- 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 00608e7e00..3acb687fd2 100644 --- 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; -- 2.39.5