nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-21 17:06:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PAM - get user name from a comma-less passwd comment field.

Browse Source 
PAM authentication uses a regular expression to extract the user's real
name from the 'user name or comment field' passwd file when creating a
new account.

The current regular expression assumes the comment field contains the
user name followed by a comma and some other comma-delimited information
(the Linux 'adduser' command adds room number, work phone, home phone
and 'other' info given half a chance).

If the field just contains the user name, there is no trailing comma
and the RE match fails. Make the trailing comma optional.

Signed-off-by: Andrew McMillan <andrew@morphoss.com>
This commit is contained in:
Jim Hague 2010-09-16 11:37:22 +01:00 committed by Andrew McMillan
parent 685fec39e8
commit 9469eb6d58
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/drivers_squid_pam.php
View File

@ -68,7 +68,7 @@ function SQUID_PAM_check($username, $password ){
else {
dbg_error_log( "PAM", "user %s doesn't exist in local DB, we need to create it",$username );
$fullname = exec('getent passwd "'.$username.'"' );
$fullname = preg_replace( '{^[^:]+:[^:]+:\d+:\d+:([^:,]+)(,[^:]*):.*$}', '$1', $fullname );
$fullname = preg_replace( '{^[^:]+:[^:]+:\d+:\d+:([^:,]+)(,?[^:]*):.*$}', '$1', $fullname );
$usr = (object) array(
'user_no' => 0,
'username' => $username,