diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2011-04-03 21:10:09 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2011-04-03 21:10:09 +0000 |
| commit | 31bbfebc95577f5df9be8ec70640180ec105fb02 (patch) | |
| tree | d8719c952dbd44ff96c56ce7a9776ce4907630c8 /nslcd | |
| parent | 7bebccdad805f8ad4a1bfa2dd234c2c1a94219ce (diff) | |
make user and group name validation errors a little more informative
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1423 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd')
| -rw-r--r-- | nslcd/group.c | 6 | ||||
| -rw-r--r-- | nslcd/pam.c | 5 | ||||
| -rw-r--r-- | nslcd/passwd.c | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/nslcd/group.c b/nslcd/group.c index fa50d6f..8813755 100644 --- a/nslcd/group.c +++ b/nslcd/group.c @@ -161,7 +161,7 @@ static int do_write_group( { if (!isvalidname(names[i])) { - log_log(LOG_WARNING,"group entry %s contains invalid group name: \"%s\"", + log_log(LOG_WARNING,"group entry %s name denied by validnames option: \"%s\"", myldap_get_dn(entry),names[i]); } else if ((reqname==NULL)||(strcmp(reqname,names[i])==0)) @@ -287,7 +287,7 @@ NSLCD_HANDLE( READ_STRING(fp,name); log_setrequest("group=\"%s\"",name); if (!isvalidname(name)) { - log_log(LOG_WARNING,"\"%s\": invalid group name",name); + log_log(LOG_WARNING,"\"%s\": name denied by validnames option",name); return -1; }, NSLCD_ACTION_GROUP_BYNAME, @@ -314,7 +314,7 @@ NSLCD_HANDLE( log_setrequest("group/member=\"%s\"",name); if (!isvalidname(name)) { - log_log(LOG_WARNING,"\"%s\": invalid user name",name); + log_log(LOG_WARNING,"\"%s\": name denied by validnames option",name); return -1; } if ((nslcd_cfg->ldc_nss_initgroups_ignoreusers!=NULL)&& diff --git a/nslcd/pam.c b/nslcd/pam.c index c0cefb9..06536d1 100644 --- a/nslcd/pam.c +++ b/nslcd/pam.c @@ -91,7 +91,7 @@ static int validate_user(MYLDAP_SESSION *session,char *userdn,size_t userdnsz, /* check username for validity */ if (!isvalidname(username)) { - log_log(LOG_WARNING,"\"%s\": invalid user name",username); + log_log(LOG_WARNING,"\"%s\": name denied by validnames option",username); return LDAP_NO_SUCH_OBJECT; } /* look up user DN if not known */ @@ -127,7 +127,8 @@ static int validate_user(MYLDAP_SESSION *session,char *userdn,size_t userdnsz, /* check the username */ if ((value==NULL)||!isvalidname(value)||strlen(value)>=usernamesz) { - log_log(LOG_WARNING,"\"%s\": DN %s has invalid username",username,userdn); + log_log(LOG_WARNING,"passwd entry %s name denied by validnames option: \"%s\"", + userdn,username); return LDAP_INVALID_SYNTAX; } /* check if the username is different and update it if needed */ diff --git a/nslcd/passwd.c b/nslcd/passwd.c index 074b805..1aa91a0 100644 --- a/nslcd/passwd.c +++ b/nslcd/passwd.c @@ -436,7 +436,7 @@ static int write_passwd(TFILE *fp,MYLDAP_ENTRY *entry,const char *requser, { if (!isvalidname(usernames[i])) { - log_log(LOG_WARNING,"passwd entry %s contains invalid user name: \"%s\"", + log_log(LOG_WARNING,"passwd entry %s denied by validnames option: \"%s\"", myldap_get_dn(entry),usernames[i]); } else @@ -467,7 +467,7 @@ NSLCD_HANDLE_UID( READ_STRING(fp,name); log_setrequest("passwd=\"%s\"",name); if (!isvalidname(name)) { - log_log(LOG_WARNING,"\"%s\": invalid user name",name); + log_log(LOG_WARNING,"\"%s\": name denied by validnames option",name); return -1; }, NSLCD_ACTION_PASSWD_BYNAME, |