[Openvpn-devel,3/5] Implement support for signalling IV_SSO to server

Message ID 20190613144113.6418-4-arne@rfc2549.org
State Superseded
Headers show
Series
  • Implement additional two step authentication methods
Related show

Commit Message

Arne Schwabe June 13, 2019, 2:41 p.m.
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
---
 src/openvpn/ssl.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

David Sommerseth Oct. 22, 2019, 8:37 p.m. | #1
On 13/06/2019 16:41, Arne Schwabe wrote:
> Signed-off-by: Arne Schwabe <arne@rfc2549.org>
> ---
>  src/openvpn/ssl.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
> index 640808f9..45806553 100644
> --- a/src/openvpn/ssl.c
> +++ b/src/openvpn/ssl.c
> @@ -2343,7 +2343,9 @@ push_peer_info(struct buffer *buf, struct tls_session *session)
>                  if ((((strncmp(e->string, "UV_", 3)==0
>                         || strncmp(e->string, "IV_PLAT_VER=", sizeof("IV_PLAT_VER=")-1)==0)
>                        && session->opt->push_peer_info_detail >= 2)
> -                     || (strncmp(e->string,"IV_GUI_VER=",sizeof("IV_GUI_VER=")-1)==0))
> +                     || (strncmp(e->string,"IV_GUI_VER=",sizeof("IV_GUI_VER=")-1)==0)
> +                     || (strncmp(e->string,"IV_SSO=",sizeof("IV_SSO=")-1)==0)
> +                     )
>                      && buf_safe(&out, strlen(e->string)+1))
>                  {
>                      buf_printf(&out, "%s\n", e->string);
> 

These new lines breaks the coding style of spaces around '==' and after comma
in the strncmp() arguments, but so does the existing code.  This needs to be
fixed, but lets handle that outside of this patch set.

Acked-By: David Sommerseth <davids@openvpn.net>

Patch

diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
index 640808f9..45806553 100644
--- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -2343,7 +2343,9 @@  push_peer_info(struct buffer *buf, struct tls_session *session)
                 if ((((strncmp(e->string, "UV_", 3)==0
                        || strncmp(e->string, "IV_PLAT_VER=", sizeof("IV_PLAT_VER=")-1)==0)
                       && session->opt->push_peer_info_detail >= 2)
-                     || (strncmp(e->string,"IV_GUI_VER=",sizeof("IV_GUI_VER=")-1)==0))
+                     || (strncmp(e->string,"IV_GUI_VER=",sizeof("IV_GUI_VER=")-1)==0)
+                     || (strncmp(e->string,"IV_SSO=",sizeof("IV_SSO=")-1)==0)
+                     )
                     && buf_safe(&out, strlen(e->string)+1))
                 {
                     buf_printf(&out, "%s\n", e->string);