ITS#2846 - make veryclean

[openldap] / servers / slapd / syncrepl.c

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 90e58e5adb5217ffa66bd85818040bda752ad012..c2a757a4e467d2702c4740adda569dae87e257e4 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1,33 +1,19 @@
+/* syncrepl.c -- Replication Engine which uses the LDAP Sync protocol */
 /* $OpenLDAP$ */
-/*
- * Replication Engine which uses the LDAP Sync protocol
- */
-/*
- * Copyright 2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/* Copyright (c) 2003 by International Business Machines, Inc.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-/* Modified by Howard Chu
+ * Copyright 2003 The OpenLDAP Foundation.
+ * Portions Copyright 2003 by IBM Corporation.
+ * Portions Copyright 2003 by Howard Chu, Symas Corporation.
+ * All rights reserved.
  *
- * Copyright (c) 2003 by Howard Chu, Symas Corporation
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
  *
- * Modifications provided under the terms of the OpenLDAP public license.
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -310,15 +296,15 @@ do_syncrep1(
 
        /* get syncrepl cookie of shadow replica from subentry */
 
-       assert( si->si_id < 1000 );
+       assert( si->si_rid < 1000 );
        syncrepl_cn_bv.bv_val = syncrepl_cbuf;
        syncrepl_cn_bv.bv_len = snprintf(syncrepl_cbuf, sizeof(syncrepl_cbuf),
-               CN_STR "syncrepl%d", si->si_id );
+               CN_STR "syncrepl%ld", si->si_rid );
        build_new_dn( &op->o_req_ndn, psub, &syncrepl_cn_bv, op->o_tmpmemctx );
        op->o_req_dn = op->o_req_ndn;
 
        LDAP_STAILQ_FOREACH( sc, &slap_sync_cookie, sc_next ) {
-               if ( si->si_id == sc->rid ) {
+               if ( si->si_rid == sc->rid ) {
                        cmdline_cookie_found = 1;
                        break;
                }
@@ -681,12 +667,12 @@ do_syncrep2(
                                        default:
 #ifdef NEW_LOGGING
                                        LDAP_LOG( OPERATION, ERR,
-                                               "do_syncrep2 : unknown syncinfo tag (%d)\n",
-                                               si_tag, 0, 0 );
+                                               "do_syncrep2 : unknown syncinfo tag (%ld)\n",
+                                               (long) si_tag, 0, 0 );
 #else
                                        Debug( LDAP_DEBUG_ANY,
-                                               "do_syncrep2 : unknown syncinfo tag (%d)\n",
-                                               si_tag, 0, 0 );
+                                               "do_syncrep2 : unknown syncinfo tag (%ld)\n",
+                                               (long) si_tag, 0, 0 );
 #endif
                                                ldap_memfree( retoid );
                                                ber_bvfree( retdata );
@@ -1492,10 +1478,10 @@ syncrepl_updateCookie(
        modtail = &mod->sml_next;
 
        ber_dupbv( &cnbva[0], (struct berval *) &slap_syncrepl_bvc );
-       assert( si->si_id < 1000 );
+       assert( si->si_rid < 1000 );
        cnbva[0].bv_len = snprintf( cnbva[0].bv_val,
                slap_syncrepl_bvc.bv_len,
-               "syncrepl%d", si->si_id );
+               "syncrepl%ld", si->si_rid );
        mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ));
        mod->sml_op = LDAP_MOD_REPLACE;
        mod->sml_desc = slap_schema.si_ad_cn;
@@ -1545,10 +1531,10 @@ syncrepl_updateCookie(
        e = ( Entry * ) ch_calloc( 1, sizeof( Entry ));
 
        slap_syncrepl_cn_bv.bv_val = syncrepl_cbuf;
-       assert( si->si_id < 1000 );
+       assert( si->si_rid < 1000 );
        slap_syncrepl_cn_bv.bv_len = snprintf( slap_syncrepl_cn_bv.bv_val,
                slap_syncrepl_cn_bvc.bv_len,
-               "cn=syncrepl%d", si->si_id );
+               "cn=syncrepl%ld", si->si_rid );
 
        build_new_dn( &slap_syncrepl_dn_bv, pdn, &slap_syncrepl_cn_bv,
                op->o_tmpmemctx );