[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  e078991 winbind: Fix a typo
       via  b819900 lib: Align integer types
       via  ea50825 idmap_hash: Align integer types
       via  95dcdd3 testparm: Remove warning from the last century
      from  877266f librpc/crypto: Fix a misleading comment

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


- Log -----------------------------------------------------------------
commit e078991ae7660a05687fc803c8a791d7c4287c3e
Author: Volker Lendecke <vl at samba.org>
Date:   Thu May 3 11:47:44 2018 +0200

    winbind: Fix a typo
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Tue Jun 19 11:43:16 CEST 2018 on sn-devel-144

commit b81990095f44318a4e932778d53c3f7829f420ec
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Apr 25 12:05:37 2018 +0200

    lib: Align integer types
    
    Loop-variable and bound should be the same type
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit ea50825acf10cd528238b09eecf945d61a4a99aa
Author: Volker Lendecke <vl at samba.org>
Date:   Fri May 4 21:02:41 2018 +0200

    idmap_hash: Align integer types
    
    Loop-variable and bound should be the same type
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 95dcdd3d4f0f4fbec22d2e61f63af79d443a9309
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jun 18 15:22:18 2018 +0200

    testparm: Remove warning from the last century
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 source3/lib/srprs.c                      |  2 +-
 source3/utils/testparm.c                 | 10 ----------
 source3/winbindd/idmap_hash/idmap_hash.c |  2 +-
 source3/winbindd/winbindd.c              |  2 +-
 4 files changed, 3 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/srprs.c b/source3/lib/srprs.c
index a3fd0c3..db0448c 100644
--- a/source3/lib/srprs.c
+++ b/source3/lib/srprs.c
@@ -128,7 +128,7 @@ bool srprs_hex(const char** ptr, size_t len, unsigned* u)
 	const char *str = *ptr;
 	const char *pos = *ptr;
 	int ret;
-	int i;
+	size_t i;
 	char buf[8+1] = {};
 
 	assert((len >= 1) && (len <= 8));
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index a53eea5..8113eea 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -713,16 +713,6 @@ static void do_per_share_checks(int s)
 	}
 
 	for (s=0;s<1000;s++) {
-		if (VALID_SNUM(s))
-			if (strlen(lp_servicename(talloc_tos(), s)) > 12) {
-				fprintf(stderr, "WARNING: You have some share names that are longer than 12 characters.\n" );
-				fprintf(stderr, "These may not be accessible to some older clients.\n" );
-				fprintf(stderr, "(Eg. Windows9x, WindowsMe, and smbclient prior to Samba 3.0.)\n" );
-				break;
-			}
-	}
-
-	for (s=0;s<1000;s++) {
 		if (VALID_SNUM(s) && (skip_logic_checks == 0)) {
 			do_per_share_checks(s);
 		}
diff --git a/source3/winbindd/idmap_hash/idmap_hash.c b/source3/winbindd/idmap_hash/idmap_hash.c
index 5890271..0f4b0b8 100644
--- a/source3/winbindd/idmap_hash/idmap_hash.c
+++ b/source3/winbindd/idmap_hash/idmap_hash.c
@@ -110,7 +110,7 @@ static NTSTATUS idmap_hash_initialize(struct idmap_domain *dom)
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 	struct winbindd_tdc_domain *dom_list = NULL;
 	size_t num_domains = 0;
-	int i;
+	size_t i;
 
 	DBG_ERR("The idmap_hash module is deprecated and should not be used. "
 		"Please migrate to a different plugin. This module will be "
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 34607ca..f0f0eef 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1027,7 +1027,7 @@ static void remove_client(struct winbindd_cli_state *state)
 	 * before closing the fd.
 	 *
 	 * Otherwise we might hit a race with close_conns_after_fork() (via
-	 * winbindd_reinit_after_fork()) where a file description
+	 * winbindd_reinit_after_fork()) where a file descriptor
 	 * is still open in a child, which means it's still active in
 	 * the parents epoll queue, but the related tevent_fd is already
 	 * already gone in the parent.


-- 
Samba Shared Repository