The branch, master has been updated
via 415d61e idmap_ldap: Fix CID 1404836 Dereference before null check
via 7f714a4 ctdb-docs: Fix documentation of -n option to ctdb tool
from e69aa55 winbindd: let WBFLAG_PAM_GET_PWD_POLICY only fake the
password policy
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 415d61eebbfe22a243bc14c089b01054373cdf7e
Author: Volker Lendecke <[email protected]>
Date: Thu Apr 6 11:35:23 2017 +0200
idmap_ldap: Fix CID 1404836 Dereference before null check
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: David Disseldorp <[email protected]>
Autobuild-User(master): David Disseldorp <[email protected]>
Autobuild-Date(master): Thu Apr 6 19:31:25 CEST 2017 on sn-devel-144
commit 7f714a436250dfeaa1970f78090ef066482711f0
Author: Amitay Isaacs <[email protected]>
Date: Thu Apr 6 12:20:21 2017 +1000
ctdb-docs: Fix documentation of -n option to ctdb tool
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12733
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: David Disseldorp <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/doc/ctdb.1.xml | 4 ++--
source3/winbindd/idmap_ldap.c | 11 +----------
2 files changed, 3 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml
index 6a0e6ea..ceab2d3 100644
--- a/ctdb/doc/ctdb.1.xml
+++ b/ctdb/doc/ctdb.1.xml
@@ -123,10 +123,10 @@
<title>OPTIONS</title>
<variablelist>
- <varlistentry><term>-n <parameter>PNN-LIST</parameter></term>
+ <varlistentry><term>-n <parameter>PNN</parameter></term>
<listitem>
<para>
- The nodes specified by PNN-LIST should be queried for the
+ The node specified by PNN should be queried for the
requested information. Default is to query the daemon
running on the local host.
</para>
diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index 041152c..7545061 100644
--- a/source3/winbindd/idmap_ldap.c
+++ b/source3/winbindd/idmap_ldap.c
@@ -78,16 +78,7 @@ static NTSTATUS get_credentials( TALLOC_CTX *mem_ctx,
tmp = idmap_config_const_string(dom->name, "ldap_user_dn", NULL);
if ( tmp ) {
- if (!dom) {
- DEBUG(0, ("get_credentials: Invalid domain 'NULL' "
- "encountered for user DN %s\n",
- tmp));
- ret = NT_STATUS_UNSUCCESSFUL;
- goto done;
- } else {
- secret = idmap_fetch_secret("ldap", dom->name, tmp);
- }
-
+ secret = idmap_fetch_secret("ldap", dom->name, tmp);
if (!secret) {
DEBUG(0, ("get_credentials: Unable to fetch "
"auth credentials for %s in %s\n",
--
Samba Shared Repository
