sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

s3:idmap_ldap: remove special handling of alloc secret (not used any more).

Browse Source
This commit is contained in:
Michael Adam 2010-12-08 00:32:53 +01:00
parent 52b37de5d8
commit 2d3a8b196f
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source3/winbindd/idmap_ldap.c
View File

@ -38,17 +38,13 @@
#include "smbldap.h"
static char *idmap_fetch_secret(const char *backend, bool alloc,
static char *idmap_fetch_secret(const char *backend,
const char *domain, const char *identity)
{
char *tmp, *ret;
int r;
if (alloc) {
r = asprintf(&tmp, "IDMAP_ALLOC_%s", backend);
} else {
r = asprintf(&tmp, "IDMAP_%s_%s", backend, domain);
}
r = asprintf(&tmp, "IDMAP_%s_%s", backend, domain);
if (r < 0)
return NULL;
@ -102,12 +98,13 @@ static NTSTATUS get_credentials( TALLOC_CTX *mem_ctx,
if ( tmp ) {
if (!dom) {
/* only the alloc backend can pass in a NULL dom */
secret = idmap_fetch_secret("ldap", True,
NULL, tmp);
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", False,
dom->name, tmp);
secret = idmap_fetch_secret("ldap", dom->name, tmp);
}
if (!secret) {