Remove lint

[openldap] / servers / slapd / syncrepl.c

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index a9d246e20eee15840b4b9cbdc951909ca39a883e..429638165d3516e79146d68f203d8dfaf832fe11 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -632,14 +632,14 @@ do_syncrep2(
                                        entry = NULL;
                                        modlist = NULL;
                                        if ( syncrepl_message_to_op( si, op, msg ) == LDAP_SUCCESS &&
-                                               !BER_BVISNULL( &syncCookie.octet_str ) ) {
+                                               !BER_BVISNULL( &syncCookie.ctxcsn ) ) {
                                                syncrepl_updateCookie( si, op, psub, &syncCookie );
                                        }
                                } else if ( syncrepl_message_to_entry( si, op, msg,
                                        &modlist, &entry, syncstate ) == LDAP_SUCCESS ) {
                                        rc_efree = syncrepl_entry( si, op, entry, &modlist,
                                                syncstate, &syncUUID, &syncCookie_req, &syncCookie.ctxcsn );
-                                       if ( !BER_BVISNULL( &syncCookie.octet_str ) )
+                                       if ( !BER_BVISNULL( &syncCookie.ctxcsn ) )
                                        {
                                                syncrepl_updateCookie( si, op, psub, &syncCookie );
                                        }
@@ -697,7 +697,7 @@ do_syncrep2(
                                                &syncCookie_req.ctxcsn, &syncCookie.ctxcsn,
                                                &text );
                                }
-                               if ( !BER_BVISNULL( &syncCookie.octet_str ) &&
+                               if ( !BER_BVISNULL( &syncCookie.ctxcsn ) &&
                                        match < 0 && err == LDAP_SUCCESS )
                                {
                                        syncrepl_updateCookie( si, op, psub, &syncCookie );
@@ -1145,6 +1145,7 @@ syncrepl_changelog_mods(
        struct berval *vals
 )
 {
+       return NULL;    /* FIXME */
 }
 
 static int
@@ -1211,6 +1212,7 @@ syncrepl_message_to_op(
                                        "syncrepl_message_to_op : unknown op %s",
                                        bvals[0].bv_val, 0, 0 );
                                ch_free( bvals );
+                               rc = -1;
                                goto done;
                        }
                        op->o_tag = modops[i].mask;
@@ -1232,8 +1234,10 @@ syncrepl_message_to_op(
        }
 
        /* If we didn't get a mod type or a target DN, bail out */
-       if ( op->o_tag == LBER_DEFAULT || BER_BVISNULL( &dn ))
+       if ( op->o_tag == LBER_DEFAULT || BER_BVISNULL( &dn )) {
+               rc = -1;
                goto done;
+       }
 
        op->o_callback = &cb;
 
@@ -1301,6 +1305,7 @@ done:
                        ch_free( prdn.bv_val );
        }
        ber_free ( ber, 0 );
+       return rc;
 }
 
 static int