fix for problem when authenticating to LDAP entries without a uid attribute

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@992 ef36b2f9-881f-0410-afb5-c4e39611909c

1 files changed, 11 insertions, 0 deletions

diff --git a/nslcd/pam.c b/nslcd/pam.c
index fc543ed..82a2a0c 100644
--- a/nslcd/pam.c
+++ b/nslcd/pam.c
@@ -73,6 +73,7 @@ static int validate_user(MYLDAP_SESSION *session,char *userdn,size_t userdnsz,
 {
   MYLDAP_ENTRY *entry=NULL;
   const char *value;
+  const char **values;
   /* check username for validity */
   if (!isvalidname(username))
   {
@@ -98,6 +99,16 @@ static int validate_user(MYLDAP_SESSION *session,char *userdn,size_t userdnsz,
     }
     /* get the "real" username */
     value=myldap_get_rdn_value(entry,attmap_passwd_uid);
+    if (value==NULL)
+    {
+      /* get the username from the uid attribute */
+      values=myldap_get_values(entry,attmap_passwd_uid);
+      if ((values==NULL)||(values[0]==NULL))
+        log_log(LOG_WARNING,"\"%s\": DN %s is missing a %s attribute",
+                            username,userdn,attmap_passwd_uid);
+      value=values[0];
+    }
+    /* check the username */
     if ((value==NULL)||!isvalidname(value)||strlen(value)>=usernamesz)
     {
       log_log(LOG_WARNING,"\"%s\": DN %s has invalid username",username,userdn);