summaryrefslogtreecommitdiffstats
path: root/usr/local/www/vpn_openvpn_client.php
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-05-30 20:46:56 +0545
committerPhil Davis <phil.davis@inf.org>2015-05-30 20:46:56 +0545
commit7304c0234042868d91ab484d839a8c69087871be (patch)
treed930dfdd85bb91b5501e00f98492aa9805b9ca72 /usr/local/www/vpn_openvpn_client.php
parent417008f782aeab859f9e6fb98940105e86af4cdc (diff)
downloadpfsense-7304c0234042868d91ab484d839a8c69087871be.zip
pfsense-7304c0234042868d91ab484d839a8c69087871be.tar.gz
Allow option to specify just 1 of user and pass in OpenVPN .up file
As per comment in https://redmine.pfsense.org/issues/3633 sometimes the server end only requires a password, no username. Usually 1 long string that serves as the hard-to-guess authentication. OpenVPN expects something to be on the first line of the ".up" file - traditionally called the username. It also insists on the second line being present, but is happy with it being empty - this is the authentication information traditionally called "password". Let the user put the single piece of authentication information in either the Username or Password field on the web GUI - whichever they feel comfortable calling it. In the ".up" file it has to always be the first line to keep OpenVPN happy.
Diffstat (limited to 'usr/local/www/vpn_openvpn_client.php')
-rw-r--r--usr/local/www/vpn_openvpn_client.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php
index b0b2e4e..969ba29 100644
--- a/usr/local/www/vpn_openvpn_client.php
+++ b/usr/local/www/vpn_openvpn_client.php
@@ -299,7 +299,7 @@ if ($_POST) {
do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
if (($pconfig['mode'] != "p2p_shared_key") && empty($pconfig['certref']) && empty($pconfig['auth_user']) && empty($pconfig['auth_pass'])) {
- $input_errors[] = gettext("If no Client Certificate is selected, a username and password must be entered.");
+ $input_errors[] = gettext("If no Client Certificate is selected, a username and/or password must be entered.");
}
if (!$input_errors) {
@@ -729,7 +729,7 @@ if ($savemsg) {
<tr id='userpass'>
<td width="22%" valign="top" class="vncell"><?=gettext("User name/pass"); ?></td>
<td width="78%" class="vtable">
- <?=gettext("Leave empty when no user name and password are needed."); ?>
+ <?=gettext("Leave empty when no user name and/or password are needed."); ?>
<br/>
<table border="0" cellpadding="2" cellspacing="0" summary="user name password">
<tr>
@@ -846,7 +846,7 @@ if ($savemsg) {
?>
<option value="<?=$cert['refid'];?>" <?=$selected;?>><?=$cert['descr'] . $caname . $inuse . $revoked;?></option>
<?php endforeach; ?>
- <option value="" <?PHP if (empty($pconfig['certref'])) echo "selected=\"selected\""; ?>>None (Username and Password required)</option>
+ <option value="" <?PHP if (empty($pconfig['certref'])) echo "selected=\"selected\""; ?>>None (Username and/or Password required)</option>
</select>
<?php if (!count($a_cert)): ?>
<b>No Certificates defined.</b> <br />Create one under <a href="system_certmanager.php">System &gt; Cert Manager</a> if one is required for this connection.
OpenPOWER on IntegriCloud