[SCM] Samba Shared Repository - branch v3-6-test updated

[Günther Deschner]

The branch, v3-6-test has been updated
       via  45e9604 s3-net: fix query_service_state() error handling.
      from  ca1c338 s3-net: add missing breaks in switch statement in 
get_share_info().

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 45e96047cf650cedafc610c2bf4352bc5c984757
Author: Günther Deschner <g...@samba.org>
Date:   Wed Jan 12 13:57:08 2011 +0100

    s3-net: fix query_service_state() error handling.
    
    Guenther
    
    Autobuild-User: Günther Deschner <g...@samba.org>
    Autobuild-Date: Wed Jan 12 15:22:56 CET 2011 on sn-devel-104
    (cherry picked from commit dac7ccee9ff01407bfadbfe466425f0266eafd52)

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

Summary of changes:
 source3/utils/net_rpc_service.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_rpc_service.c b/source3/utils/net_rpc_service.c
index 631a5a1..8f04f24 100644
--- a/source3/utils/net_rpc_service.c
+++ b/source3/utils/net_rpc_service.c
@@ -90,7 +90,7 @@ static WERROR query_service_state(struct rpc_pipe_client 
*pipe_hnd,
                                                  &service_status,
                                                  &result);
 
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result) ) {
+       if (NT_STATUS_IS_OK(status) && W_ERROR_IS_OK(result) ) {
                *state = service_status.state;
        }
 


-- 
Samba Shared Repository