[PATCH] some small cleanups

Volker Lendecke vl at samba.org
Thu Mar 9 06:27:17 UTC 2017


Hi!

Review appreciated!

Thanks, Volker
-------------- next part --------------
>From 61bfafb88292df7371b1f9941a016f5305d3ec1c Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Mon, 6 Mar 2017 20:33:28 +0000
Subject: [PATCH 1/4] winbind: Fix a typo

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/winbindd/winbindd_pam.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 5d1da16..782b28a 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1578,7 +1578,7 @@ static NTSTATUS winbindd_dual_pam_auth_samlogon(TALLOC_CTX *mem_ctx,
 
 	/* handle the case where a NT4 DC does not fill in the acct_flags in
 	 * the samlogon reply info3. When accurate info3 is required by the
-	 * caller, we look up the account flags ourselve - gd */
+	 * caller, we look up the account flags ourselves - gd */
 
 	if ((request_flags & WBFLAG_PAM_INFO3_TEXT) &&
 	    NT_STATUS_IS_OK(result) && (my_info3->base.acct_flags == 0)) {
-- 
2.1.4


>From 587e5b2036bde1872567f2c2f4d1e09078f911b2 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Tue, 7 Mar 2017 15:29:18 +0100
Subject: [PATCH 2/4] ldap_server: Fix a typo

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source4/ldap_server/ldap_server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 8b21fbb..96df39c 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -437,7 +437,7 @@ static bool ldapsrv_call_read_next(struct ldapsrv_connection *conn)
 	}
 
 	/*
-	 * The minimun size of a LDAP pdu is 7 bytes
+	 * The minimum size of a LDAP pdu is 7 bytes
 	 *
 	 * dumpasn1 -hh ldap-unbind-min.dat
 	 *
-- 
2.1.4


>From 748c3ee1eb38a8ab961fc66ab6e1d6c40f70b78b Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Wed, 8 Mar 2017 10:17:16 +0100
Subject: [PATCH 3/4] winbind: Use talloc_strdup_upper where appropriate

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/winbindd/winbindd_cache.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 4bb0195..314ce1d 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -1115,14 +1115,10 @@ NTSTATUS resolve_username_to_alias( TALLOC_CTX *mem_ctx,
 	if (!cache->tdb)
 		goto do_query;
 
-	upper_name = talloc_strdup(mem_ctx, name);
+	upper_name = talloc_strdup_upper(mem_ctx, name);
 	if (upper_name == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
-	if (!strupper_m(upper_name)) {
-		talloc_free(upper_name);
-		return NT_STATUS_INVALID_PARAMETER;
-	}
 
 	centry = wcache_fetch(cache, domain, "NSS/NA/%s", upper_name);
 
-- 
2.1.4


>From 0dc9a2a1aab3213bde60454c6213284d1e97b0fa Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Wed, 8 Mar 2017 10:26:38 +0100
Subject: [PATCH 4/4] winbindd: Remove an unused #define

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source3/winbindd/winbindd_cache.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 314ce1d..bafeb9b 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -108,8 +108,6 @@ struct cache_entry {
 
 void (*smb_panic_fn)(const char *const why) = smb_panic;
 
-#define WINBINDD_MAX_CACHE_SIZE (50*1024*1024)
-
 static struct winbind_cache *wcache;
 
 static char *wcache_path(void)
-- 
2.1.4



More information about the samba-technical mailing list