ITS#3534, 3546, 3571 revert abandon behavior

[openldap] / servers / slapd / nt_svc.c

diff --git a/servers/slapd/nt_svc.c b/servers/slapd/nt_svc.c
index b4e3bc6905363fb738ce16a6b217684c2938e60e..ce3480602cfd2cee72c4408e1816b2b1ec02dba8 100644 (file)
--- a/servers/slapd/nt_svc.c
+++ b/servers/slapd/nt_svc.c
@@ -1,101 +1,110 @@
-// nt_main.c
+/* $OpenLDAP$ */
+/* 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 the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
 #include "portable.h"
 #include <stdio.h>
-
-//#include <ac/signal.h>
-//#include <ac/socket.h>
 #include <ac/string.h>
-//#include <ac/time.h>
-//#include <ac/unistd.h>
-//#include <ac/wait.h>
-//#include <ac/signal.h>
-//#include <ac/errno.h>
-
-#include "ldap_defaults.h"
 #include "slap.h"
+#include "lutil.h"
 
-/* kludge a path for now */
-#include "../../libraries/liblutil/slapdmsg.h"
-
-#define SCM_NOTIFICATION_INTERVAL      5000
-#define THIRTY_SECONDS                         (30 * 1000)
-
-#define SERVICE_NAME           "OpenLDAP"
-
-ldap_pvt_thread_cond_t started_event,          stopped_event;
-ldap_pvt_thread_t              start_status_tid,       stop_status_tid;
-
+#ifdef HAVE_NT_SERVICE_MANAGER
 
-// in main.c
+/* in main.c */
 void WINAPI ServiceMain( DWORD argc, LPTSTR *argv );
 
-
-// in wsa_err.c
-char *WSAGetLastErrorString( void );
-
-// in nt_err.c
-char *GetLastErrorString( void );
-
-// in ntservice.c
-int srv_install( char* service, char* filename );
-int srv_remove ( char* service, char* filename );
-
-void nt_main( DWORD argc, LPTSTR *argv )
+/* in ntservice.c */
+int main( int argc, LPTSTR *argv )
 {
        int             length;
        char    filename[MAX_PATH], *fname_start;
-       extern int is_NT_Service;
+
+       /*
+        * Because the service was registered as SERVICE_WIN32_OWN_PROCESS,
+        * the lpServiceName element of the SERVICE_TABLE_ENTRY will be
+        * ignored.
+        */
 
        SERVICE_TABLE_ENTRY             DispatchTable[] = {
-               {       SERVICE_NAME,   (LPSERVICE_MAIN_FUNCTION) ServiceMain   },
+               {       "",     (LPSERVICE_MAIN_FUNCTION) ServiceMain   },
                {       NULL,                   NULL    }
        };
 
-       // set the service's current directory to being the installation directory for the service.
-       // this way we don't have to write absolute paths in the configuration files
+       /*
+        * set the service's current directory to the installation directory
+        * for the service. this way we don't have to write absolute paths
+        * in the configuration files
+        */
        GetModuleFileName( NULL, filename, sizeof( filename ) );
        fname_start = strrchr( filename, *LDAP_DIRSEP );
-       *fname_start = '\0';
-       SetCurrentDirectory( filename );
 
        if ( argc > 1 ) {
                if ( _stricmp( "install", argv[1] ) == 0 ) 
                {
-                       if ( (length = GetModuleFileName(NULL, filename, sizeof( filename ))) == 0 ) 
-                       {
-                               fputs( "unable to retrieve file name for the service.\n", stderr  );
-                               return;
-                       }
-                       if ( !srv_install(SERVICE_NAME, filename) ) 
+                       char *svcName = SERVICE_NAME;
+                       char *displayName = "OpenLDAP Directory Service";
+                       BOOL auto_start = FALSE;
+
+                       if ( (argc > 2) && (argv[2] != NULL) )
+                               svcName = argv[2];
+
+                       if ( argc > 3 && argv[3])
+                               displayName = argv[3];
+
+                       if ( argc > 4 && stricmp(argv[4], "auto") == 0)
+                               auto_start = TRUE;
+
+                       strcat(filename, " service");
+                       if ( !lutil_srv_install(svcName, displayName, filename, auto_start) ) 
                        {
                                fputs( "service failed installation ...\n", stderr  );
-                               return;
+                               return EXIT_FAILURE;
                        }
                        fputs( "service has been installed ...\n", stderr  );
-                       return;
+                       return EXIT_SUCCESS;
                }
 
                if ( _stricmp( "remove", argv[1] ) == 0 ) 
                {
-                       if ( (length = GetModuleFileName(NULL, filename, sizeof( filename ))) == 0 ) 
-                       {
-                               fputs( "unable to retrieve file name for the service.\n", stderr  );
-                               return;
-                       }
-                       if ( !srv_remove(SERVICE_NAME, filename) ) 
+                       char *svcName = SERVICE_NAME;
+                       if ( (argc > 2) && (argv[2] != NULL) )
+                               svcName = argv[2];
+                       if ( !lutil_srv_remove(svcName, filename) ) 
                        {
                                fputs( "failed to remove the service ...\n", stderr  );
-                               return;
+                               return EXIT_FAILURE;
                        }
                        fputs( "service has been removed ...\n", stderr );
-                       return;
+                       return EXIT_SUCCESS;
+               }
+               if ( _stricmp( "service", argv[1] ) == 0 )
+               {
+                       is_NT_Service = 1;
+                       *fname_start = '\0';
+                       SetCurrentDirectory( filename );
                }
        }
 
-       puts( "starting slapd..." );
-       if ( !StartServiceCtrlDispatcher(DispatchTable) )
+       if (is_NT_Service)
+       {
+               StartServiceCtrlDispatcher(DispatchTable);
+       } else
        {
-               is_NT_Service = 0;
                ServiceMain( argc, argv );
        }
+
+       return EXIT_SUCCESS;
 }
+
+#endif