fix small issues with dynacl and ACI in general

[openldap] / servers / slurpd / rq.c

diff --git a/servers/slurpd/rq.c b/servers/slurpd/rq.c
index dad5e6c617e6988373ef0701a8e02cacb0c43700..4649118000a0075b299be3757eb82c8537cbf223 100644 (file)
--- a/servers/slurpd/rq.c
+++ b/servers/slurpd/rq.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -144,13 +144,8 @@ Rq_delhead(
     }
 
     if ( savedhead->re_getrefcnt( savedhead ) != 0 ) {
-#ifdef NEW_LOGGING
-       LDAP_LOG ( SLURPD, WARNING, "Rq_delhead: "
-               "Warning: attempt to delete when refcnt != 0\n", 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_ANY, "Warning: attempt to delete when refcnt != 0\n",
                0, 0, 0 );
-#endif
        return( -1 );
     }
 
@@ -197,27 +192,10 @@ Rq_add(
        rq->rq_head = re;
        rq->rq_tail = re;
        wasempty = 1;
-    } else if ( re->re_timestamp > rq->rq_tail->re_timestamp ||
-               ( re->re_timestamp == rq->rq_tail->re_timestamp &&
-                 re->re_seq > rq->rq_tail->re_seq )) {
-       rq->rq_tail->re_next = re;
-       rq->rq_tail = re;
     } else {
-       Re *p, *r;
-
-       for (r = rq->rq_head, p = NULL; r->re_timestamp < re->re_timestamp ||
-           (r->re_timestamp == re->re_timestamp && r->re_seq < re->re_seq);
-           p = r, r = r->re_next );
-       if ( !p ) {
-           re->re_next = rq->rq_head;
-           rq->rq_head = re;
-       } else {
-           re->re_next = p->re_next;
-           p->re_next = re;
-       }
+       rq->rq_tail->re_next = re;
     }
 
-#if 0
     /* set the sequence number */
     re->re_seq = 0;
     if ( !wasempty && ( rq->rq_tail->re_timestamp == re->re_timestamp )) {
@@ -228,14 +206,11 @@ Rq_add(
        re->re_seq = rq->rq_tail->re_seq + 1;
     }
     rq->rq_tail = re;
-#endif
 
     /* Increment count of items in queue */
     rq->rq_nre++;
-#if 0
     /* wake up any threads waiting for more work */
     ldap_pvt_thread_cond_broadcast( &rq->rq_more );
-#endif
 
     /* ... and unlock the queue */
     rq->rq_unlock( rq );
@@ -253,11 +228,7 @@ Rq_gc(
 )
 {
     if ( rq == NULL ) {
-#ifdef NEW_LOGGING
-       LDAP_LOG ( SLURPD, DETAIL1, "Rq_gc: rq is NULL!\n", 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_ANY, "Rq_gc: rq is NULL!\n", 0, 0, 0 );
-#endif
        return;
     }
     rq->rq_lock( rq ); 
@@ -285,42 +256,23 @@ Rq_dump(
     int                tmpfd;
 
     if ( rq == NULL ) {
-#ifdef NEW_LOGGING
-       LDAP_LOG ( SLURPD, ARGS, "Rq_dump: rq is NULL!\n", 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_ANY, "Rq_dump: rq is NULL!\n", 0, 0, 0 );
-#endif
        return;
     }
 
     if (unlink(SLURPD_DUMPFILE) == -1 && errno != ENOENT) {
-#ifdef NEW_LOGGING
-       LDAP_LOG ( SLURPD, ERR, "Rq_dump: "
-               "\"%s\" exists, cannot unlink\n", SLURPD_DUMPFILE, 0, 0 );
-#else
        Debug( LDAP_DEBUG_ANY, "Rq_dump: \"%s\" exists, and cannot unlink\n",
                SLURPD_DUMPFILE, 0, 0 );
-#endif
        return;
     }
     if (( tmpfd = open(SLURPD_DUMPFILE, O_CREAT|O_RDWR|O_EXCL, 0600)) == -1) {
-#ifdef NEW_LOGGING
-       LDAP_LOG ( SLURPD, ERR, "Rq_dump: "
-               "cannot open \"%s\" for write\n", SLURPD_DUMPFILE, 0, 0 );
-#else
        Debug( LDAP_DEBUG_ANY, "Rq_dump: cannot open \"%s\" for write\n",
                SLURPD_DUMPFILE, 0, 0 );
-#endif
        return;
     }
     if (( fp = fdopen( tmpfd, "w" )) == NULL ) {
-#ifdef NEW_LOGGING
-       LDAP_LOG ( SLURPD, ERR, "Rq_dump: "
-               "cannot fdopen \"%s\" for write\n", SLURPD_DUMPFILE, 0, 0 );
-#else
        Debug( LDAP_DEBUG_ANY, "Rq_dump: cannot fdopen \"%s\" for write\n",
                SLURPD_DUMPFILE, 0, 0 );
-#endif
        return;
     }
 
@@ -352,13 +304,8 @@ Rq_write(
        return -1;
     }
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( SLURPD, ENTRY, "Rq_write: "
-               "re-write on-disk replication log\n", 0, 0, 0 );
-#else
     Debug( LDAP_DEBUG_ARGS, "re-write on-disk replication log\n",
            0, 0, 0 );
-#endif
 #ifndef SEEK_SET
 #define SEEK_SET 0
 #endif
@@ -376,13 +323,8 @@ Rq_write(
     sglob->srpos = ftell( fp );        /* update replog file position */
     /* and truncate to correct len */
     if ( ftruncate( fileno( fp ), sglob->srpos ) < 0 ) {
-#ifdef NEW_LOGGING
-       LDAP_LOG ( SLURPD, ERR, "Rq_write: "
-               "Error truncating replication log: %s\n", sys_errlist[ errno ], 0, 0 );
-#else
        Debug( LDAP_DEBUG_ANY, "Error truncating replication log: %s\n",
                sys_errlist[ errno ], 0, 0 );
-#endif
     }
     rq->rq_ndel = 0;   /* reset count of deleted re's */
     time( &now );