[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  8dc24d4 Minor typo fix in source3/wscript.
       via  2c9683d Fix an empty if statement.
      from  cbd6beb ctdb-daemon: Move a ZERO_STRUCT() to a better place

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


- Log -----------------------------------------------------------------
commit 8dc24d4006a2e936baf73e116129d2b0a5d71ed7
Author: Jose A. Rivera <jarrpa at redhat.com>
Date:   Mon May 5 07:29:57 2014 -0500

    Minor typo fix in source3/wscript.
    
    Signed-off-by: Jose A. Rivera <jarrpa at redhat.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Mon May  5 22:41:19 CEST 2014 on sn-devel-104

commit 2c9683db4ba07436490edd38c535ff53e92f1960
Author: Jose A. Rivera <jarrpa at redhat.com>
Date:   Mon May 5 06:46:58 2014 -0500

    Fix an empty if statement.
    
    Primarily following the	precedent set by other uses of composite_is_ok(), but
    also making sure nothing tries to use c after this point if it is in fact not
    ok.
    
    Signed-off-by: Jose A. Rivera <jarrpa at redhat.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/wscript                |    2 +-
 source4/libnet/libnet_domain.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 4fe49fa..8cbd9bc 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -475,7 +475,7 @@ return acl_get_perm_np(permset_d, perm);
 
     conf.CHECK_CODE('struct statfs fsd; fsid_t fsid = fsd.f_fsid; return statfs(".", &fsd);',
                     'HAVE_STATFS_F_FSID',
-                    msg="vfs_fileid: checking for statfs() and struct statfs.f_fsid",
+                    msg="vfs_fileid checking for statfs() and struct statfs.f_fsid",
                     headers='sys/types.h sys/statfs.h',
                     execute=True)
 
diff --git a/source4/libnet/libnet_domain.c b/source4/libnet/libnet_domain.c
index 70ed31d..27a3e55 100644
--- a/source4/libnet/libnet_domain.c
+++ b/source4/libnet/libnet_domain.c
@@ -207,7 +207,7 @@ static void continue_domain_open_lookup(struct tevent_req *subreq)
 	r = &s->open;
 
 	/* check the rpc layer status */
-	if (!composite_is_ok(c));
+	if (!composite_is_ok(c)) return;
 
 	/* check the rpc call itself status */
 	if (!NT_STATUS_IS_OK(s->lookup.out.result)) {


-- 
Samba Shared Repository