fix NOOP return code (ITS#4563; I'll check and confirm it later; NOOP support might...

[openldap] / servers / slurpd / reject.c

diff --git a/servers/slurpd/reject.c b/servers/slurpd/reject.c
index d3346cf50902bd53205307c82ea02e22b170ee93..4f49f6a4e02e899f231ee5db2c3a40df206f139c 100644 (file)
--- a/servers/slurpd/reject.c
+++ b/servers/slurpd/reject.c
@@ -1,10 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -14,6 +22,10 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
+ */
 
 
 /*
@@ -26,6 +38,8 @@
 
 #include <stdio.h>
 
+#include <ac/stdlib.h>
+#include <ac/string.h>
 #include <ac/errno.h>
 #include <ac/unistd.h>
 
@@ -35,6 +49,15 @@
 #include "slurp.h"
 #include "globals.h"
 
+#include "lber_pvt.h"
+#include "lutil.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"
@@ -56,23 +79,17 @@ write_reject(
     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 (( "reject", LDAP_LEVEL_ERR, "write_reject: "
-                       "Error: Cannot create \"%s\":%s\n", 
-                       rejfile, sys_errlist[ errno ] ));
-#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 {
@@ -80,39 +97,57 @@ write_reject(
        }
     }
     if (( rc = acquire_lock( rejfile, &rfp, &lfp )) < 0 ) {
-#ifdef NEW_LOGGING
-       LDAP_LOG (( "reject", LDAP_LEVEL_ERR, "write_reject: "
-               "Error: Cannot open reject file \"%s\"\n", rejfile ));
-#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, errmsg );
+       struct berval   bv = BER_BVNULL,
+                       errstrbv,
+                       errmsgbv = BER_BVNULL;
+       char            *ptr;
+
+       ber_str2bv( ldap_err2string( lderr ), 0, 0, &errstrbv );
+       if ( errmsg && *errmsg ) {
+               ber_str2bv( errmsg, 0, 0, &errmsgbv );
+               bv.bv_len = errstrbv.bv_len
+                       + STRLENOF( ": " ) + errmsgbv.bv_len;
+
+               ptr = bv.bv_val = ber_memalloc( bv.bv_len + 1 );
+               ptr = lutil_strcopy( ptr, errstrbv.bv_val );
+               ptr = lutil_strcopy( ptr, ": " );
+               ptr = lutil_strcopy( ptr, errmsgbv.bv_val );
+
        } else {
-           fprintf( rfp, "%s: %s\n", ERROR_STR, ldap_err2string( lderr ));
+               bv = errstrbv;
+       }
+
+       fseek( rfp, 0, 2 );
+
+       ptr = ldif_put( LDIF_PUT_VALUE, ERROR_STR, bv.bv_val, bv.bv_len );
+       if ( bv.bv_val != errstrbv.bv_val ) {
+               ber_memfree( bv.bv_val );
        }
+       if ( ptr == NULL ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "Error: cannot convert error message(s) \"%s%s%s\" "
+                       "into LDIF format\n",
+                       errstrbv.bv_val,
+                       BER_BVISNULL( &errmsgbv ) ? "" : ": ",
+                       BER_BVISNULL( &errmsgbv ) ? "" : errmsgbv.bv_val );
+               return;
+       }
+
+       fputs( ptr, rfp );
+       ber_memfree( ptr );
+
        if ((rc = re->re_write( ri, re, rfp )) < 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG (( "reject", LDAP_LEVEL_ERR, "write_reject: "
-                       "Error: Cannot write reject file \"%s\"\n", rejfile ));
-#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 (( "reject", LDAP_LEVEL_ERR, "write_reject: "
-               "Error: ldap operation failed, data written to \"%s\"\n", rejfile ));
-#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;