[SCM] Samba Shared Repository - branch master updated

[Alexander Bokovoy]

The branch, master has been updated
       via  2285519 s3,s4 torture/denytest: fix possible infinite loop
       via  a6593cf s4/torture/libnetapi/libnetapi_user.c: fix typo
      from  f5b6a5b ctdb-common: For AF_PACKET socket types, protocol is in network order

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


- Log -----------------------------------------------------------------
commit 22855190437d142c38b2d09539c63b474132a556
Author: Aurelien Aptel <aaptel at suse.com>
Date:   Fri Mar 4 10:05:22 2016 +0100

    s3,s4 torture/denytest: fix possible infinite loop
    
    Signed-off-by: Aurelien Aptel <aaptel at suse.com>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: David Disseldorf <ddis at suse.de>
    
    Autobuild-User(master): Alexander Bokovoy <ab at samba.org>
    Autobuild-Date(master): Fri Mar  4 21:23:45 CET 2016 on sn-devel-144

commit a6593cfb674cdb818c3487e984516d8f2fea1d88
Author: Aurelien Aptel <aaptel at suse.com>
Date:   Fri Mar 4 09:29:48 2016 +0100

    s4/torture/libnetapi/libnetapi_user.c: fix typo
    
    fixed misplaced parenthesis and wrong sizeof().
    
    Signed-off-by: Aurelien Aptel <aaptel at suse.com>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: David Disseldorf <ddis at suse.de>

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

Summary of changes:
 source3/torture/denytest.c                 | 2 +-
 source4/torture/basic/denytest.c           | 2 +-
 source4/torture/libnetapi/libnetapi_user.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c
index 5b0eeec..87f0661 100644
--- a/source3/torture/denytest.c
+++ b/source3/torture/denytest.c
@@ -76,7 +76,7 @@ static const char *resultstr(enum deny_result res)
 		{A_W, "W"},
 		{A_RW,"RW"}};
 	int i;
-	for (i=0;ARRAY_SIZE(results);i++) {
+	for (i=0;i<ARRAY_SIZE(results);i++) {
 		if (results[i].res == res) return results[i].name;
 	}
 	return "*";
diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c
index feeea32e..1c946b8 100644
--- a/source4/torture/basic/denytest.c
+++ b/source4/torture/basic/denytest.c
@@ -80,7 +80,7 @@ static const char *resultstr(enum deny_result res)
 		{A_W, "W"},
 		{A_RW,"RW"}};
 	int i;
-	for (i=0;ARRAY_SIZE(results);i++) {
+	for (i=0;i<ARRAY_SIZE(results);i++) {
 		if (results[i].res == res) return results[i].name;
 	}
 	return "*";
diff --git a/source4/torture/libnetapi/libnetapi_user.c b/source4/torture/libnetapi/libnetapi_user.c
index 2afc1e5..e925725 100644
--- a/source4/torture/libnetapi/libnetapi_user.c
+++ b/source4/torture/libnetapi/libnetapi_user.c
@@ -249,7 +249,7 @@ static NET_API_STATUS test_netusermodals(struct torture_context *tctx,
 		return status;
 	}
 
-	if (memcmp(u0, _u0, sizeof(u0) != 0)) {
+	if (memcmp(u0, _u0, sizeof(*u0)) != 0) {
 		torture_comment(tctx, "USER_MODALS_INFO_0 struct has changed!!!!\n");
 		return -1;
 	}


-- 
Samba Shared Repository