fix small issues with dynacl and ACI in general

[openldap] / servers / slurpd / main.c

diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index 5f53a89e6b9aea63e4126a77e8c708258a1dfc0a..4984a6a50f8da9e4a9f34019a61fd959eb2c52d7 100644 (file)
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -1,10 +1,18 @@
 /* $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-2005 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -14,6 +22,12 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).  Additional significant contributors
+ * include:
+ *     Howard Chu
+ */
 
 
 /* 
@@ -46,6 +60,11 @@
 #define        MAIN_RETURN(x)  return(x)
 #endif
 
+#ifndef HAVE_MKVERSION
+const char Versionstr[] =
+       OPENLDAP_PACKAGE " " OPENLDAP_VERSION " Standalone LDAP Replicator (slurpd)";
+#endif
+
 #ifdef HAVE_NT_SERVICE_MANAGER
 void WINAPI ServiceMain( DWORD argc, LPTSTR *argv )
 #else
@@ -91,26 +110,14 @@ int main( int argc, char **argv )
                if ( i != NULL ) 
                {
                        ldap_debug = *i;
-#ifdef NEW_LOGGING
-                       lutil_log_initialize( argc, argv );
-                       LDAP_LOG( SLURPD, INFO, 
-                               "main: new debug level from registry is: %d\n", 
-                               ldap_debug, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_ANY, "new debug level from registry is: %d\n", ldap_debug, 0, 0 );
-#endif
                }
 
                newConfigFile = (char*)lutil_getRegParam( regService, "ConfigFile" );
                if ( newConfigFile != NULL ) 
                {
                        sglob->slapd_configfile = newConfigFile;
-#ifdef NEW_LOGGING
-                       LDAP_LOG( SLURPD, INFO, 
-                               "main: new config file from registry is: %s\n", sglob->slapd_configfile, 0, 0 );
-#else
                        Debug ( LDAP_DEBUG_ANY, "new config file from registry is: %s\n", sglob->slapd_configfile, 0, 0 );
-#endif
 
                }
        }
@@ -125,6 +132,16 @@ int main( int argc, char **argv )
        goto stop;
     }
 
+    if ( sglob->version ) {
+               fprintf(stderr, "%s\n", Versionstr);
+               if (sglob->version > 1 ) {
+                       rc = 1;
+                       goto stop;
+               }
+    }
+
+       Debug ( LDAP_DEBUG_ANY, "%s\n", Versionstr, 0, 0 );
+    
     /*
      * Read slapd config file and initialize Re (per-replica) structs.
      */
@@ -232,13 +249,8 @@ int main( int argc, char **argv )
     if ( ldap_pvt_thread_create( &(sglob->fm_tid),
                0, fm, (void *) NULL ) != 0 )
        {
-#ifdef NEW_LOGGING
-       LDAP_LOG ( SLURPD, ERR,
-               "main: file manager ldap_pvt_thread_create failed\n" , 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_ANY, "file manager ldap_pvt_thread_create failed\n",
                0, 0, 0 );
-#endif
        SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 21 );
        rc = 1;
        goto stop;
@@ -288,12 +300,12 @@ stop:
     /* destroy the thread package */
     ldap_pvt_thread_destroy();
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( SLURPD, RESULTS, "main: slurpd terminated\n", 0, 0, 0 );
-#else
-    Debug( LDAP_DEBUG_ANY, "slurpd: terminated.\n", 0, 0, 0 );
+#ifdef HAVE_TLS
+    ldap_pvt_tls_destroy();
 #endif
 
+    Debug( LDAP_DEBUG_ANY, "slurpd: terminated.\n", 0, 0, 0 );
+
     if ( slurpd_pid_file != NULL ) {
        unlink( slurpd_pid_file );
     }