Diff for /servers/slapd/nt_svc.c between versions 1.22 and 1.23

version 1.22, 2003/03/03 05:42:16 version 1.23, 2003/03/03 10:46:33
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/servers/slapd/nt_svc.c,v 1.21 2003/01/03 19:20:54 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/nt_svc.c,v 1.22 2003/03/03 05:42:16 hyc Exp $ */
 /*  /*
  * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.   * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file   * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 16 Line 16
 void WINAPI ServiceMain( DWORD argc, LPTSTR *argv );  void WINAPI ServiceMain( DWORD argc, LPTSTR *argv );
   
 /* in ntservice.c */  /* in ntservice.c */
 int srv_install( char* service, char * displayName, char* filename,  
                  BOOL auto_start );  
 int srv_remove ( char* service, char* filename );  
 DWORD svc_installed (LPTSTR lpszServiceName, LPTSTR lpszBinaryPathName);  
 DWORD svc_running (LPTSTR lpszServiceName);  
   
 int main( int argc, LPTSTR *argv )  int main( int argc, LPTSTR *argv )
 {  {
         int             length;          int             length;
Line 30  int main( int argc, LPTSTR *argv ) Line 24  int main( int argc, LPTSTR *argv )
         /*          /*
          * Because the service was registered as SERVICE_WIN32_OWN_PROCESS,           * Because the service was registered as SERVICE_WIN32_OWN_PROCESS,
          * the lpServiceName element of the SERVICE_TABLE_ENTRY will be           * the lpServiceName element of the SERVICE_TABLE_ENTRY will be
          * ignored. Since we don't even know the name of the service at           * ignored.
          * this point (since it could have been installed under a name  
          * different than SERVICE_NAME), we might as well just provide  
          * the parameter as "".  
          */           */
   
         SERVICE_TABLE_ENTRY             DispatchTable[] = {          SERVICE_TABLE_ENTRY             DispatchTable[] = {
Line 42  int main( int argc, LPTSTR *argv ) Line 33  int main( int argc, LPTSTR *argv )
         };          };
   
         /*          /*
         // set the service's current directory to being the installation directory for the service.           * set the service's current directory to the installation directory
         // this way we don't have to write absolute paths in the configuration files           * for the service. this way we don't have to write absolute paths
         */           * in the configuration files
            */
         GetModuleFileName( NULL, filename, sizeof( filename ) );          GetModuleFileName( NULL, filename, sizeof( filename ) );
         fname_start = strrchr( filename, *LDAP_DIRSEP );          fname_start = strrchr( filename, *LDAP_DIRSEP );
   
Line 65  int main( int argc, LPTSTR *argv ) Line 57  int main( int argc, LPTSTR *argv )
                                 auto_start = TRUE;                                  auto_start = TRUE;
   
                         strcat(filename, " service");                          strcat(filename, " service");
                         if ( !srv_install(svcName, displayName, filename, auto_start) )                           if ( !lutil_srv_install(svcName, displayName, filename, auto_start) ) 
                         {                          {
                                 fputs( "service failed installation ...\n", stderr  );                                  fputs( "service failed installation ...\n", stderr  );
                                 return EXIT_FAILURE;                                  return EXIT_FAILURE;
Line 79  int main( int argc, LPTSTR *argv ) Line 71  int main( int argc, LPTSTR *argv )
                         char *svcName = SERVICE_NAME;                          char *svcName = SERVICE_NAME;
                         if ( (argc > 2) && (argv[2] != NULL) )                          if ( (argc > 2) && (argv[2] != NULL) )
                                 svcName = argv[2];                                  svcName = argv[2];
                         if ( !srv_remove(svcName, filename) )                           if ( !lutil_srv_remove(svcName, filename) ) 
                         {                          {
                                 fputs( "failed to remove the service ...\n", stderr  );                                  fputs( "failed to remove the service ...\n", stderr  );
                                 return EXIT_FAILURE;                                  return EXIT_FAILURE;

Removed from v.1.22  
changed lines
  Added in v.1.23


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org