ITS#2846 - make veryclean

[openldap] / servers / slapd / proto-slap.h

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 3f88cf474620a03a08d26978044afd2a35262f6c..129445bbafbcd7a9f546fe1d9575cdb701ce01bc 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1,8 +1,28 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 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 the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
+
 #ifndef PROTO_SLAP_H
 #define PROTO_SLAP_H
 
@@ -551,7 +571,7 @@ LDAP_SLAPD_V( const struct berval ) slap_empty_bv;
 LDAP_SLAPD_V( const struct berval ) slap_unknown_bv;
 LDAP_SLAPD_V( const struct berval ) slap_true_bv;
 LDAP_SLAPD_V( const struct berval ) slap_false_bv;
-LDAP_SLAPD_V( struct sync_cookie * ) slap_sync_cookie;
+LDAP_SLAPD_V( struct slap_sync_cookie_s ) slap_sync_cookie;
 
 /*
  * index.c
@@ -584,12 +604,15 @@ LDAP_SLAPD_F (int) slap_build_sync_state_ctrl LDAP_P((
                                int, int, struct berval * ));
 LDAP_SLAPD_F (int) slap_build_sync_done_ctrl LDAP_P((
                                Operation *, SlapReply *, LDAPControl **,
-                               int, int, struct berval * ));
+                               int, int, struct berval *, int ));
 LDAP_SLAPD_F (int) slap_build_sync_state_ctrl_from_slog LDAP_P((
                                Operation *, SlapReply *, struct slog_entry *, int,
                                LDAPControl **, int, int, struct berval * ));
+LDAP_SLAPD_F (int) slap_send_syncinfo LDAP_P((
+                               Operation *, SlapReply *, int,
+                               struct berval *, int, BerVarray, int ));
 LDAP_SLAPD_F (void) slap_compose_sync_cookie LDAP_P((
-                               Operation *, struct berval *, struct berval *, int ));
+                               Operation *, struct berval *, struct berval *, int, int ));
 LDAP_SLAPD_F (void) slap_sync_cookie_free LDAP_P((
                                struct sync_cookie *, int free_cookie ));
 LDAP_SLAPD_F (int) slap_parse_sync_cookie LDAP_P((
@@ -598,6 +621,8 @@ LDAP_SLAPD_F (int) slap_init_sync_cookie_ctxcsn LDAP_P((
                                struct sync_cookie * ));
 LDAP_SLAPD_F (struct sync_cookie *) slap_dup_sync_cookie LDAP_P((
                                struct sync_cookie *, struct sync_cookie * ));
+LDAP_SLAPD_F (int) slap_build_syncUUID_set LDAP_P((
+                               Operation *, BerVarray *, Entry * ));
 
 /*
  * limits.c
@@ -1077,7 +1102,7 @@ LDAP_SLAPD_F (Entry*) syncrepl_message_to_entry LDAP_P((
 LDAP_SLAPD_F (int) syncrepl_entry LDAP_P((
                                        syncinfo_t *, Operation*, Entry*,
                                        Modifications*,int, struct berval*,
-                                       struct sync_cookie *, int ));
+                                       struct sync_cookie * ));
 LDAP_SLAPD_F (void) syncrepl_updateCookie LDAP_P((
                                        syncinfo_t *, Operation *, struct berval *,
                                        struct sync_cookie * ));
@@ -1086,6 +1111,8 @@ LDAP_SLAPD_F (void)  syncrepl_add_glue LDAP_P((
 LDAP_SLAPD_F (Entry*) slap_create_syncrepl_entry LDAP_P((
                                        Backend *, struct berval *,
                                        struct berval *, struct berval * ));
+LDAP_SLAPD_F (struct berval *) slap_uuidstr_from_normalized LDAP_P((
+                                       struct berval *, struct berval *, void * ));
 
 /* syntax.c */
 LDAP_SLAPD_F (Syntax *) syn_find LDAP_P((