lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-18 18:44:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

openvpn: remove obsolete probing for /etc/version

Browse Source
This commit is contained in:
Franco Fichtner 2015-03-24 17:33:28 +01:00
parent 9120b96675
commit 96bd855790
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pkg/openvpn-client-export.inc
View File

@ -1,13 +1,11 @@
<?php
/*
openvpn-client-export.inc
Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com>
Copyright (C) 2008 Shrew Soft Inc
Copyright (C) 2010 Ermal Luci
All rights reserved.
Parts of this code was originally based on vpn_ipsec_sad.php
Copyright (C) 2003-2004 Manuel Kasper
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@ -179,7 +177,6 @@ function openvpn_client_export_validate_config($srvid, $usrid, $crtid) {
function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $nokeys = false, $proxy, $expformat = "baseconf", $outpass = "", $skiptls=false, $doslines=false, $openvpnmanager, $advancedoptions = "") {
global $config, $input_errors, $g;
$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
$nl = ($doslines) ? "\r\n" : "\n";
$conf = "";
@ -327,17 +324,14 @@ function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $verifys
// add optional settings
if (!empty($settings['compression'])) {
if ($pfs_version > 2.1)
$conf .= "comp-lzo {$settings['compression']}{$nl}";
else
$conf .= "comp-lzo{$nl}";
$conf .= "comp-lzo {$settings['compression']}{$nl}";
}
if ($settings['passtos'])
if ($settings['passtos']) {
$conf .= "passtos{$nl}";
}
if ($openvpnmanager)
{
if ($openvpnmanager) {
if (!empty($settings['client_mgmt_port'])) {
$client_mgmt_port = $settings['client_mgmt_port'];
} else {