ITS#2846 - make veryclean

[openldap] / servers / slapd / main.c

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index ea41382b9ae95507c589fd3c77ba9b6f7b584243..2304208e90a137ba7faf9f28b7346673ed0d0725 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -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.
  */
+
 #include "portable.h"
 
 #include <stdio.h>
@@ -92,6 +112,7 @@ usage( char *name )
        fprintf( stderr,
                "\t-4\t\tIPv4 only\n"
                "\t-6\t\tIPv6 only\n"
+               "\t-c cookie\tSync cookie of consumer\n"
                "\t-d level\tDebug level" "\n"
                "\t-f filename\tConfiguration file\n"
 #if defined(HAVE_SETUID) && defined(HAVE_SETGID)
@@ -144,6 +165,10 @@ int main( int argc, char **argv )
        char        *serverName = NULL;
        int         serverMode = SLAP_SERVER_MODE;
 
+       struct berval cookie = { 0, NULL };
+       struct sync_cookie *scp = NULL;
+       struct sync_cookie *scp_entry = NULL;
+
 #ifdef CSRIMALLOC
        FILE *leakfile;
        if( ( leakfile = fopen( "slapd.leak", "w" )) == NULL ) {
@@ -214,7 +239,7 @@ int main( int argc, char **argv )
 #endif
 
        while ( (i = getopt( argc, argv,
-                            "d:f:h:s:n:t"
+                            "c:d:f:h:s:n:t"
 #if LDAP_PF_INET6
                                "46"
 #endif
@@ -241,7 +266,32 @@ int main( int argc, char **argv )
                case 'h':       /* listen URLs */
                        if ( urls != NULL ) free( urls );
                        urls = ch_strdup( optarg );
-           break;
+                       break;
+
+               case 'c':       /* provide sync cookie, override if exist in replica */
+                       scp = (struct sync_cookie *) ch_calloc( 1,
+                                                                               sizeof( struct sync_cookie ));
+                       ber_str2bv( optarg, strlen( optarg ), 1, &cookie );
+                       ber_bvarray_add( &scp->octet_str, &cookie );
+                       slap_parse_sync_cookie( scp );
+
+                       LDAP_STAILQ_FOREACH( scp_entry, &slap_sync_cookie, sc_next ) {
+                               if ( scp->rid == scp_entry->rid ) {
+#ifdef NEW_LOGGING
+                                       LDAP_LOG( OPERATION, CRIT,
+                                                       "main: duplicated replica id in cookies\n",
+                                                       0, 0, 0 );
+#else
+                                       Debug( LDAP_DEBUG_ANY,
+                                                   "main: duplicated replica id in cookies\n",
+                                                       0, 0, 0 );
+#endif
+                                       slap_sync_cookie_free( scp, 1 );
+                                       goto destroy;
+                               }
+                       }
+                       LDAP_STAILQ_INSERT_TAIL( &slap_sync_cookie, scp, sc_next );
+                       break;
 
                case 'd':       /* set debug level and 'do not detach' flag */
                        no_detach = 1;
@@ -373,12 +423,6 @@ int main( int argc, char **argv )
        }
 #endif
 
-       if ( slap_init( serverMode, serverName ) != 0 ) {
-               rc = 1;
-               SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 18 );
-               goto destroy;
-       }
-
        if ( slap_schema_init( ) != 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, CRIT, "main: schema initialization error\n", 0, 0, 0 );
@@ -391,6 +435,12 @@ int main( int argc, char **argv )
                goto destroy;
        }
 
+       if ( slap_init( serverMode, serverName ) != 0 ) {
+               rc = 1;
+               SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 18 );
+               goto destroy;
+       }
+
        if ( slap_controls_init( ) != 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, CRIT, "main: controls initialization error\n", 0, 0, 0 );
@@ -592,6 +642,12 @@ destroy:
        /* remember an error during destroy */
        rc |= slap_destroy();
 
+       while ( !LDAP_STAILQ_EMPTY( &slap_sync_cookie )) {
+               scp = LDAP_STAILQ_FIRST( &slap_sync_cookie );
+               LDAP_STAILQ_REMOVE_HEAD( &slap_sync_cookie, sc_next );
+               ch_free( scp );
+       }
+
 #ifdef SLAPD_MODULES
        module_kill();
 #endif