s3-svcctl: use pidl defined constants in services implementation.

Guenther

diff --git a/source3/services/svc_netlogon.c b/source3/services/svc_netlogon.c
index 2745695a1604bf01762e8fc5fce34106ecf1ddd9..931f774024e379a870e122f570758b2e798cde4f 100644 (file)
--- a/source3/services/svc_netlogon.c
+++ b/source3/services/svc_netlogon.c
@@ -1,18 +1,18 @@
-/* 
+/*
  *  Unix SMB/CIFS implementation.
  *  Service Control API Implementation
  *  Copyright (C) Gerald Carter                   2005.
- *  
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
@@ -28,16 +28,16 @@ static WERROR netlogon_status( const char *service, struct SERVICE_STATUS *servi
 {
        ZERO_STRUCTP( service_status );
 
-        service_status->type              = 0x20;
-        service_status->controls_accepted = SVCCTL_ACCEPT_NONE;
+        service_status->type                   = SERVICE_TYPE_WIN32_SHARE_PROCESS;
+        service_status->controls_accepted      = SVCCTL_ACCEPT_NONE;
 
        if ( lp_servicenumber("NETLOGON") != -1 ) {
-               service_status->state              = SVCCTL_RUNNING;
-               service_status->win32_exit_code    = WERR_SERVICE_NEVER_STARTED;
+               service_status->state           = SVCCTL_RUNNING;
+               service_status->win32_exit_code = WERR_SERVICE_NEVER_STARTED;
        }
        else
-               service_status->state              = SVCCTL_STOPPED;
-       
+               service_status->state           = SVCCTL_STOPPED;
+
        return WERR_OK;
 }
 

diff --git a/source3/services/svc_rcinit.c b/source3/services/svc_rcinit.c
index 5e9a5466fea56e8acaa982a3682ae209a7b5d5c7..3f56676fe1497c58202f218465882415b598063f 100644 (file)
--- a/source3/services/svc_rcinit.c
+++ b/source3/services/svc_rcinit.c
@@ -1,18 +1,18 @@
-/* 
+/*
  *  Unix SMB/CIFS implementation.
  *  Service Control API Implementation
  *  Copyright (C) Gerald Carter                   2005.
- *  
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
@@ -44,9 +44,11 @@ static WERROR rcinit_stop( const char *service, struct SERVICE_STATUS *status )
        SAFE_FREE(command);
 
        ZERO_STRUCTP( status );
-       status->type = 0x0020;
-       status->state = (ret == 0 ) ? 0x0001 : 0x0004;
-       status->controls_accepted = 0x0005;
+
+       status->type                    = SERVICE_TYPE_WIN32_SHARE_PROCESS;
+       status->state                   = (ret == 0 ) ? SVCCTL_STOPPED : SVCCTL_RUNNING;
+       status->controls_accepted       = SVCCTL_ACCEPT_STOP |
+                                         SVCCTL_ACCEPT_SHUTDOWN;
 
        return ( ret == 0 ) ? WERR_OK : WERR_ACCESS_DENIED;
 }
@@ -105,9 +107,11 @@ static WERROR rcinit_status( const char *service, struct SERVICE_STATUS *status
        SAFE_FREE(command);
 
        ZERO_STRUCTP( status );
-       status->type = 0x0020;
-       status->state = (ret == 0 ) ? 0x0004 : 0x0001;
-       status->controls_accepted = 0x0005;
+
+       status->type                    = SERVICE_TYPE_WIN32_SHARE_PROCESS;
+       status->state                   = (ret == 0 ) ? SVCCTL_RUNNING : SVCCTL_STOPPED;
+       status->controls_accepted       = SVCCTL_ACCEPT_STOP |
+                                         SVCCTL_ACCEPT_SHUTDOWN;
 
        return WERR_OK;
 }

diff --git a/source3/services/svc_spoolss.c b/source3/services/svc_spoolss.c
index 3bf659271d59e313bce475bd3a2729179099d65e..bb2b892c809206f059a12ec48e8934726ee81804 100644 (file)
--- a/source3/services/svc_spoolss.c
+++ b/source3/services/svc_spoolss.c
@@ -1,18 +1,18 @@
-/* 
+/*
  *  Unix SMB/CIFS implementation.
  *  Service Control API Implementation
  *  Copyright (C) Gerald Carter                   2005.
- *  
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
@@ -27,12 +27,13 @@
 static WERROR spoolss_stop( const char *service, struct SERVICE_STATUS *service_status )
 {
        ZERO_STRUCTP( service_status );
-       
+
        lp_set_spoolss_state( SVCCTL_STOPPED );
 
-       service_status->type              = 0x110;
-       service_status->state             = SVCCTL_STOPPED;
-       service_status->controls_accepted = SVCCTL_ACCEPT_STOP;
+       service_status->type                    = SERVICE_TYPE_INTERACTIVE_PROCESS |
+                                                 SERVICE_TYPE_WIN32_OWN_PROCESS;
+       service_status->state                   = SVCCTL_STOPPED;
+       service_status->controls_accepted       = SVCCTL_ACCEPT_STOP;
 
        DEBUG(6,("spoolss_stop: spooler stopped (not really)\n"));
 
@@ -45,12 +46,12 @@ static WERROR spoolss_stop( const char *service, struct SERVICE_STATUS *service_
 static WERROR spoolss_start( const char *service )
 {
        /* see if the smb.conf will support this anyways */
-       
+
        if ( _lp_disable_spoolss() )
                return WERR_ACCESS_DENIED;
-       
-       lp_set_spoolss_state( SVCCTL_RUNNING ); 
-       
+
+       lp_set_spoolss_state( SVCCTL_RUNNING );
+
        return WERR_OK;
 }
 
@@ -61,10 +62,11 @@ static WERROR spoolss_status( const char *service, struct SERVICE_STATUS *servic
 {
        ZERO_STRUCTP( service_status );
 
-       service_status->type              = 0x110;
-       service_status->state             = lp_get_spoolss_state();
-       service_status->controls_accepted = SVCCTL_ACCEPT_STOP;
-       
+       service_status->type                    = SERVICE_TYPE_INTERACTIVE_PROCESS |
+                                                 SERVICE_TYPE_WIN32_OWN_PROCESS;
+       service_status->state                   = lp_get_spoolss_state();
+       service_status->controls_accepted       = SVCCTL_ACCEPT_STOP;
+
        return WERR_OK;
 }
 

diff --git a/source3/services/svc_winreg.c b/source3/services/svc_winreg.c
index 4976e6d3b34410f6beaa166e794b995cd2bac92f..a8fdea2e6bb1980f67530a3b75613fb8cdb00420 100644 (file)
--- a/source3/services/svc_winreg.c
+++ b/source3/services/svc_winreg.c
@@ -1,18 +1,18 @@
-/* 
+/*
  *  Unix SMB/CIFS implementation.
  *  Service Control API Implementation
  *  Copyright (C) Gerald Carter                   2005.
- *  
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
@@ -44,10 +44,10 @@ static WERROR winreg_status( const char *service, struct SERVICE_STATUS *service
 {
        ZERO_STRUCTP( service_status );
 
-       service_status->type              = 0x20;
-       service_status->controls_accepted = SVCCTL_ACCEPT_NONE;
-       service_status->state              = SVCCTL_RUNNING;
-       
+       service_status->type                    = SERVICE_TYPE_WIN32_SHARE_PROCESS;
+       service_status->controls_accepted       = SVCCTL_ACCEPT_NONE;
+       service_status->state                   = SVCCTL_RUNNING;
+
        return WERR_OK;
 }
 

diff --git a/source3/services/svc_wins.c b/source3/services/svc_wins.c
index d0b50524924f450439027c14c282be6483460799..a4242f3dbfcd3abc1d26a22e5c308619f30044e5 100644 (file)
--- a/source3/services/svc_wins.c
+++ b/source3/services/svc_wins.c
@@ -1,18 +1,18 @@
-/* 
+/*
  *  Unix SMB/CIFS implementation.
  *  Service Control API Implementation
  *  Copyright (C) Gerald Carter                   2005.
- *  
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
@@ -28,16 +28,16 @@ static WERROR wins_status( const char *service, struct SERVICE_STATUS *service_s
 {
        ZERO_STRUCTP( service_status );
 
-       service_status->type              = 0x10;
-       service_status->controls_accepted = SVCCTL_ACCEPT_NONE;
+       service_status->type                    = SERVICE_TYPE_WIN32_OWN_PROCESS;
+       service_status->controls_accepted       = SVCCTL_ACCEPT_NONE;
 
-       if ( lp_wins_support() ) 
+       if ( lp_wins_support() )
                service_status->state     = SVCCTL_RUNNING;
        else {
-               service_status->state              = SVCCTL_STOPPED;
-               service_status->win32_exit_code    = WERR_SERVICE_NEVER_STARTED;
+               service_status->state           = SVCCTL_STOPPED;
+               service_status->win32_exit_code = WERR_SERVICE_NEVER_STARTED;
        }
-       
+
        return WERR_OK;
 }