The Samba-Bugzilla – Attachment 5174 Details for
Bug 6157
LDAP: MultiValue uid: "attribute uid has 2 values, expected only one" "init_sam_from_ldap: No uid attribute found for this user!"
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for v3-5
tmp.diff (text/plain), 3.37 KB, created by
Stefan Metzmacher
on 2010-01-13 19:33:17 UTC
(
hide
)
Description:
Patch for v3-5
Filename:
MIME Type:
Creator:
Stefan Metzmacher
Created:
2010-01-13 19:33:17 UTC
Size:
3.37 KB
patch
obsolete
>From 562f9dcdbdf4cacb8d6ed00a0f2b47c1191434cd Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 5 Jan 2010 13:30:19 +0100 >Subject: [PATCH 1/2] s3:smbldap: add smbldap_talloc_first_attribute() > >metze > >Signed-off-by: Stefan Metzmacher <metze@samba.org> >(cherry picked from commit c992127f8a96c37940a6d298c7c6859c47f83d9b) >(cherry picked from commit 915b7552b71904baf6a452bdc1649e76d8286a14) >--- > source3/include/smbldap.h | 3 +++ > source3/lib/smbldap.c | 34 ++++++++++++++++++++++++++++++++++ > 2 files changed, 37 insertions(+), 0 deletions(-) > >diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h >index 8710e77..e3b03d4 100644 >--- a/source3/include/smbldap.h >+++ b/source3/include/smbldap.h >@@ -211,6 +211,9 @@ const char** get_userattr_list( TALLOC_CTX *mem_ctx, int schema_ver ); > char * smbldap_talloc_single_attribute(LDAP *ldap_struct, LDAPMessage *entry, > const char *attribute, > TALLOC_CTX *mem_ctx); >+char * smbldap_talloc_first_attribute(LDAP *ldap_struct, LDAPMessage *entry, >+ const char *attribute, >+ TALLOC_CTX *mem_ctx); > char * smbldap_talloc_smallest_attribute(LDAP *ldap_struct, LDAPMessage *entry, > const char *attribute, > TALLOC_CTX *mem_ctx); >diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c >index 4727c15..7aa36ba 100644 >--- a/source3/lib/smbldap.c >+++ b/source3/lib/smbldap.c >@@ -333,6 +333,40 @@ ATTRIB_MAP_ENTRY sidmap_attr_list[] = { > return result; > } > >+ char * smbldap_talloc_first_attribute(LDAP *ldap_struct, LDAPMessage *entry, >+ const char *attribute, >+ TALLOC_CTX *mem_ctx) >+{ >+ char **values; >+ char *result; >+ size_t converted_size; >+ >+ if (attribute == NULL) { >+ return NULL; >+ } >+ >+ values = ldap_get_values(ldap_struct, entry, attribute); >+ >+ if (values == NULL) { >+ DEBUG(10, ("attribute %s does not exist\n", attribute)); >+ return NULL; >+ } >+ >+ if (!pull_utf8_talloc(mem_ctx, &result, values[0], &converted_size)) { >+ DEBUG(10, ("pull_utf8_talloc failed\n")); >+ ldap_value_free(values); >+ return NULL; >+ } >+ >+ ldap_value_free(values); >+ >+#ifdef DEBUG_PASSWORDS >+ DEBUG (100, ("smbldap_get_first_attribute: [%s] = [%s]\n", >+ attribute, result)); >+#endif >+ return result; >+} >+ > char * smbldap_talloc_smallest_attribute(LDAP *ldap_struct, LDAPMessage *entry, > const char *attribute, > TALLOC_CTX *mem_ctx) >-- >1.6.3.3 > > >From 2cde2e679cbf3d99e4b5e579b4bacaca148b4bfa Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 5 Jan 2010 13:30:42 +0100 >Subject: [PATCH 2/2] s3:pdb_ldap: restore Samba 3.0.x behavior and use the first "uid" value. > >See bug #6157 for more details. > >metze > >Signed-off-by: Stefan Metzmacher <metze@samba.org> >(cherry picked from commit 25806f43ddee7e2653e907eea2c6fcc075960fa1) >(cherry picked from commit ac224452b94865db346ed68dc517f84d40e6303c) >--- > source3/passdb/pdb_ldap.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > >diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c >index 90ac8e5..32d63e2 100644 >--- a/source3/passdb/pdb_ldap.c >+++ b/source3/passdb/pdb_ldap.c >@@ -560,7 +560,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state, > goto fn_exit; > } > >- if (!(username = smbldap_talloc_smallest_attribute(priv2ld(ldap_state), >+ if (!(username = smbldap_talloc_first_attribute(priv2ld(ldap_state), > entry, > "uid", > ctx))) { >-- >1.6.3.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
idra
:
review+
Actions:
View
Attachments on
bug 6157
:
3990
|
4042
|
4145
|
5160
| 5174 |
5175