[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1270-g16b2f4b

[Günther Deschner]

The branch, master has been updated
       via  16b2f4b55a80314aa733dd7f23543c1c3926223c (commit)
       via  aa26bdd71969610a4b6a5bdfdd735a1dab31a12c (commit)
      from  a263eaca499cf2b8a89c3ab04c6ef5e7e9aea396 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 16b2f4b55a80314aa733dd7f23543c1c3926223c
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 21 16:18:51 2009 +0200

    s3-svcctl: indicate that the spooler is already running if it does.
    
    Guenther

commit aa26bdd71969610a4b6a5bdfdd735a1dab31a12c
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 10 21:39:45 2009 +0200

    s3-svcctl: fix _svcctl_ControlService.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/rpc_server/srv_svcctl_nt.c |    2 +-
 source3/services/svc_spoolss.c     |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index d73f73f..f88801e 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -524,7 +524,7 @@ WERROR _svcctl_ControlService(pipes_struct *p,
 		return info->ops->service_status( info->name,
 						  r->out.service_status );
 	default:
-		return WERR_ACCESS_DENIED;
+		return WERR_INVALID_PARAM;
 	}
 }
 
diff --git a/source3/services/svc_spoolss.c b/source3/services/svc_spoolss.c
index bb2b892..4a2cb78 100644
--- a/source3/services/svc_spoolss.c
+++ b/source3/services/svc_spoolss.c
@@ -50,6 +50,10 @@ static WERROR spoolss_start( const char *service )
 	if ( _lp_disable_spoolss() )
 		return WERR_ACCESS_DENIED;
 
+	if (lp_get_spoolss_state() == SVCCTL_RUNNING) {
+		return WERR_SERVICE_ALREADY_RUNNING;
+	}
+
 	lp_set_spoolss_state( SVCCTL_RUNNING );
 
 	return WERR_OK;


-- 
Samba Shared Repository