diff options
| author | Phil Davis <phil.davis@inf.org> | 2015-05-30 20:46:56 +0545 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-05-30 12:08:03 -0300 |
| commit | 3b9dfaf2f92c16998f54ee1b909e3df690831f94 (patch) | |
| tree | 63c7783699a56c125f14caf344ae49a73024b976 /usr | |
| parent | 19a12e06aad2c44d3cc407245ca5a895ad60e637 (diff) | |
| download | pfsense-3b9dfaf2f92c16998f54ee1b909e3df690831f94.zip pfsense-3b9dfaf2f92c16998f54ee1b909e3df690831f94.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')
| -rw-r--r-- | usr/local/www/vpn_openvpn_client.php | 6 |
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 faf89f9..7ec74ce 100644 --- a/usr/local/www/vpn_openvpn_client.php +++ b/usr/local/www/vpn_openvpn_client.php @@ -265,7 +265,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) { @@ -676,7 +676,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> @@ -788,7 +788,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 > Cert Manager</a> if one is required for this connection. |
