ITS#2851

[openldap] / servers / slurpd / lock.c

diff --git a/servers/slurpd/lock.c b/servers/slurpd/lock.c
index a7d7279cfe79d43d132ec777c2c0ecb15958433e..8b8060d2b5a151d2ab2d897a7242f5bcea4bdef9 100644 (file)
--- a/servers/slurpd/lock.c
+++ b/servers/slurpd/lock.c
@@ -1,10 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 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-2003 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).
+ */
 
 /*
  * lock.c - routines to open and apply an advisory lock to a file
@@ -47,11 +59,16 @@ lock_fopen(
        char    buf[MAXPATHLEN];
 
        /* open the lock file */
-       strcpy( buf, fname );
-       strcat( buf, ".lock" );
+       snprintf( buf, sizeof buf, "%s.lock", fname );
+
        if ( (*lfp = fopen( buf, "w" )) == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( SLURPD, ERR, "lock_fopen: "
+                       "Error: could not open \"%s\"\n", buf, 0, 0 );
+#else
                Debug( LDAP_DEBUG_ANY,
                        "Error: could not open \"%s\"\n", buf, 0, 0 );
+#endif
                return( NULL );
        }
 
@@ -60,8 +77,13 @@ lock_fopen(
 
        /* open the log file */
        if ( (fp = fopen( fname, type )) == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( SLURPD, ERR, "lock_fopen: "
+                       "Error: could not open \"%s\"\n", fname, 0, 0 );
+#else
                Debug( LDAP_DEBUG_ANY,
                        "Error: could not open \"%s\"\n", fname, 0, 0 );
+#endif
                ldap_unlockf( fileno(*lfp) );
                fclose( *lfp );
                *lfp = NULL;
@@ -99,9 +121,15 @@ acquire_lock(
 )
 {
     if (( *rfp = lock_fopen( file, "r+", lfp )) == NULL ) {
+#ifdef NEW_LOGGING
+       LDAP_LOG ( SLURPD, ERR, "acquire_lock: "
+               "Error: acquire_lock(%ld): Could not acquire lock on \"%s\"\n",
+               (long) getpid(), file, 0 );
+#else
        Debug( LDAP_DEBUG_ANY,
                "Error: acquire_lock(%ld): Could not acquire lock on \"%s\"\n",
                (long) getpid(), file, 0);
+#endif
        return( -1 );
     }
     return( 0 );
@@ -121,9 +149,15 @@ relinquish_lock(
 )
 {
     if ( lock_fclose( rfp, lfp ) == EOF ) {
+#ifdef NEW_LOGGING
+       LDAP_LOG ( SLURPD, ERR, "relinguish_lock: "
+               "Error: relinquish_lock (%ld): Error closing \"%s\"\n",
+               (long) getpid(), file, 0 );
+#else
        Debug( LDAP_DEBUG_ANY,
                "Error: relinquish_lock (%ld): Error closing \"%s\"\n",
                (long) getpid(), file, 0 );
+#endif
        return( -1 );
     }
     return( 0 );