cron2 has uploaded a new patch set (#2) to the change originally created by
plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/912?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by ordex
Change subject: Fix incorrect condition for checking password related check
......................................................................
Fix incorrect condition for checking password related check
Commit db48cea chagned logic to move logic from a variable and repeated
checks to an if clause.
The old code had
const bool ccnr = (options->auth_user_pass_verify_script
|| PLUGIN_OPTION_LIST(options)
|| MAN_CLIENT_AUTH_ENABLED(options));
followed by several condition that checked !ccnr
This commit fixes the if clause by correctly applying De Morgan's law.
Github: closes OpenVPN/openvpn#706
Change-Id: I28a8abd0ee3fa9168a716171b0a405476089c4a1
Signed-off-by: Arne Schwabe <[email protected]>
Acked-by: Antonio Quartulli <[email protected]>
Message-Id: <[email protected]>
URL: https://sourceforge.net/p/openvpn/mailman/message/59164222/
URL: http://gerrit.openvpn.net/c/openvpn/+/912
Signed-off-by: Gert Doering <[email protected]>
---
M src/openvpn/options.c
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/12/912/2
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 67ef55b..ab56609 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -2752,8 +2752,8 @@
}
if (!options->auth_user_pass_verify_script
- || PLUGIN_OPTION_LIST(options)
- || MAN_CLIENT_AUTH_ENABLED(options))
+ && !PLUGIN_OPTION_LIST(options)
+ && !MAN_CLIENT_AUTH_ENABLED(options))
{
const char *use_err = "--%s must be used with
--management-client-auth, an --auth-user-pass-verify script, or plugin";
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/912?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I28a8abd0ee3fa9168a716171b0a405476089c4a1
Gerrit-Change-Number: 912
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: ordex <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
