beenull/EHCP-Force-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes for Ubuntu 20.04

Browse source
This commit is contained in:
earnolmartin 2020-02-20 17:31:26 -07:00
parent 54cba1acbc
commit cf35cd96e6
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ehcp/etc/pam/pam_dbauth_smtp.py
View file

@ -57,6 +57,8 @@ Example:
import os
import sys
sys.path.insert(0, '/usr/local/lib/python2.7/dist-packages')
sys.path.insert(0, '/usr/lib/python2.7/dist-packages')
import syslog
import hashlib
import base64

1
ehcp/etc/pam/pam_dbauth_vsftpd.py
View file

@ -57,6 +57,7 @@ Example:
import os
import sys
sys.path.insert(0, '/usr/local/lib/python2.7/dist-packages')
sys.path.insert(0, '/usr/lib/python2.7/dist-packages')
import syslog
import hashlib

6
ehcp/localutils.php
View file

@ -844,9 +844,9 @@ function getUbuntuReleaseMonth(){
}
function getIsUbuntu(){
exec("cat /etc/issue | awk '{ print $1 }'", $distro);
exec("cat /etc/issue | awk '{ print $1 }' | head -n 1", $distro);
if(is_array($distro) && !empty($distro)){
if(strtolower($distro[0]) == "ubuntu"){
if(strtolower(trim($distro[0])) == "ubuntu"){
return true;
}
}
@ -854,7 +854,7 @@ function getIsUbuntu(){
}
function getIsDebian(){
exec("cat /etc/issue | awk '{ print $1 }'", $distro);
exec("cat /etc/issue | awk '{ print $1 }' | head -n 1", $distro);
if(is_array($distro) && !empty($distro)){
if(strtolower($distro[0]) == "debian"){
return true;