[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[samba.git] / source / services / svc_netlogon.c

diff --git a/source/services/svc_netlogon.c b/source/services/svc_netlogon.c
index 2aa5a31cde3573e9774256959dcda4cd9ec4141a..c5a5385cdd0aff1982f6c6b1bc906b48d9a98d2f 100644 (file)
--- a/source/services/svc_netlogon.c
+++ b/source/services/svc_netlogon.c
@@ -5,7 +5,7 @@
  *  
  *  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 2 of the License, or
+ *  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,
@@ -14,8 +14,7 @@
  *  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, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "includes.h"
@@ -25,33 +24,42 @@
 /*********************************************************************
 *********************************************************************/
 
-static WERROR netlogon_stop( const char *service, SERVICE_STATUS *service_status )
+static WERROR netlogon_status( const char *service, SERVICE_STATUS *service_status )
 {
-       return WERR_ACCESS_DENIED;
+       ZERO_STRUCTP( service_status );
+
+        service_status->type              = 0x20;
+        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;
+       }
+       else
+               service_status->state              = SVCCTL_STOPPED;
+       
+       return WERR_OK;
 }
 
 /*********************************************************************
 *********************************************************************/
 
-static WERROR netlogon_start( const char *service )
+static WERROR netlogon_stop( const char *service, SERVICE_STATUS *service_status )
 {
+       netlogon_status( service, service_status );
+
        return WERR_ACCESS_DENIED;
 }
 
 /*********************************************************************
 *********************************************************************/
 
-static WERROR netlogon_status( const char *service, SERVICE_STATUS *service_status )
+static WERROR netlogon_start( const char *service )
 {
-       ZERO_STRUCTP( service_status );
+       if ( lp_servicenumber("NETLOGON") == -1 )
+               return WERR_SERVICE_DISABLED;
 
-       service_status->type              = 0x20;
-       if ( lp_servicenumber("NETLOGON") != -1 ) 
-               service_status->state              = SVCCTL_RUNNING;
-       else
-               service_status->state              = SVCCTL_STOPPED;
-       
-       return WERR_OK;
+       return WERR_ACCESS_DENIED;
 }
 
 /*********************************************************************