sort libnss-result by length of name to always return the 'base'user instead of a ftp-user (because select does not have a default order), fixes #1556
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
@@ -2309,16 +2309,19 @@ getpwnam SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
|
||||
FROM ftp_users \
|
||||
WHERE username='%1$s' \
|
||||
AND login_enabled = 'Y' \
|
||||
ORDER BY LENGTH(username) \
|
||||
LIMIT 1
|
||||
getpwuid SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
|
||||
FROM ftp_users \
|
||||
WHERE uid='%1$u' \
|
||||
AND login_enabled = 'Y' \
|
||||
ORDER BY LENGTH(username) \
|
||||
LIMIT 1
|
||||
getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \
|
||||
FROM ftp_users \
|
||||
WHERE username='%1$s' \
|
||||
AND login_enabled = 'Y' \
|
||||
ORDER BY LENGTH(username) \
|
||||
LIMIT 1
|
||||
getpwent SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
|
||||
FROM ftp_users
|
||||
|
||||
Reference in New Issue
Block a user