The branch, master has been updated
via 373e0bd winbindd: Remove an unused #define
via 42899d5 winbind: Use talloc_strdup_upper where appropriate
via ae12111 ldap_server: Fix a typo
via eecdc3b winbind: Fix a typo
from 35f92b8 ldb: add LDB_FLG_DONT_CREATE_DB
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 373e0bdf12bcc502c3bbfd206d0ba71b32a01570
Author: Volker Lendecke <[email protected]>
Date: Wed Mar 8 10:26:38 2017 +0100
winbindd: Remove an unused #define
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Uri Simchoni <[email protected]>
Autobuild-User(master): Uri Simchoni <[email protected]>
Autobuild-Date(master): Fri Mar 10 00:00:15 CET 2017 on sn-devel-144
commit 42899d542665c0adcfd5285d23164a8615e51ef5
Author: Volker Lendecke <[email protected]>
Date: Wed Mar 8 10:17:16 2017 +0100
winbind: Use talloc_strdup_upper where appropriate
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Uri Simchoni <[email protected]>
commit ae12111685c65dc70662a41aaedadf4e6c415b87
Author: Volker Lendecke <[email protected]>
Date: Tue Mar 7 15:29:18 2017 +0100
ldap_server: Fix a typo
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Uri Simchoni <[email protected]>
commit eecdc3b1ee2ce7790207853cc6e1c66fe25de887
Author: Volker Lendecke <[email protected]>
Date: Mon Mar 6 20:33:28 2017 +0000
winbind: Fix a typo
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Uri Simchoni <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/winbindd_cache.c | 8 +-------
source3/winbindd/winbindd_pam.c | 2 +-
source4/ldap_server/ldap_server.c | 2 +-
3 files changed, 3 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_cache.c
b/source3/winbindd/winbindd_cache.c
index 4bb0195..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)
@@ -1115,14 +1113,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);
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)) {
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
*
--
Samba Shared Repository
