/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
/*
* Copyright (c) 1996 Regents of the University of Michigan.
* All rights reserved.
#include <stdio.h>
+#include <ac/stdlib.h>
#include <ac/errno.h>
#include <ac/unistd.h>
#include "slurp.h"
#include "globals.h"
+#ifdef _WIN32
+#define PORTSEP ","
+#else
+#define PORTSEP ":"
+#endif
+
/*
* Write a replication record to a reject file. The reject file has the
* same name as the replica's private copy of the file but with ".rej"
int rc;
ldap_pvt_thread_mutex_lock( &sglob->rej_mutex );
- sprintf( rejfile, "%s/%s:%d.rej", sglob->slurpd_rdir,
- ri->ri_hostname, ri->ri_port );
+ snprintf( rejfile, sizeof rejfile, "%s" LDAP_DIRSEP "%s" PORTSEP "%d.rej",
+ sglob->slurpd_rdir, ri->ri_hostname, ri->ri_port );
if ( access( rejfile, F_OK ) < 0 ) {
/* Doesn't exist - try to create */
int rjfd;
- if (( rjfd = open( rejfile, O_RDWR | O_APPEND | O_CREAT,
+ if (( rjfd = open( rejfile, O_RDWR|O_APPEND|O_CREAT|O_EXCL,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP )) < 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR, "write_reject: "
+ "Error: Cannot create \"%s\":%s\n",
+ rejfile, sys_errlist[ errno ], 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"Error: write_reject: Cannot create \"%s\": %s\n",
rejfile, sys_errlist[ errno ], 0 );
+#endif
ldap_pvt_thread_mutex_unlock( &sglob->rej_mutex );
return;
} else {
}
}
if (( rc = acquire_lock( rejfile, &rfp, &lfp )) < 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR, "write_reject: "
+ "Error: Cannot open reject file \"%s\"\n", rejfile, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY, "Error: cannot open reject file \"%s\"\n",
rejfile, 0, 0 );
+#endif
} else {
fseek( rfp, 0, 2 );
if ( errmsg != NULL ) {
fprintf( rfp, "%s: %s\n", ERROR_STR, ldap_err2string( lderr ));
}
if ((rc = re->re_write( ri, re, rfp )) < 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR, "write_reject: "
+ "Error: Cannot write reject file \"%s\"\n", rejfile, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"Error: cannot write reject file \"%s\"\n",
rejfile, 0, 0 );
+#endif
}
(void) relinquish_lock( rejfile, rfp, lfp );
+#ifdef NEW_LOGGING
+ LDAP_LOG ( SLURPD, ERR, "write_reject: "
+ "Error: ldap operation failed, data written to \"%s\"\n",
+ rejfile, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"Error: ldap operation failed, data written to \"%s\"\n",
rejfile, 0, 0 );
+#endif
}
ldap_pvt_thread_mutex_unlock( &sglob->rej_mutex );
return;