Re: two small openvpn fixes

[Casey Harkins <caseyharkins gmail com>]

Casey Harkins wrote:
> Jon Escombe wrote:
> > 4) Mandatory check for a secret that fails with a x509 certs only.
>
> Can you try out the attached patch?
>
> -casey

Forgot to include a file in that diff, here's an updated patch.

-casey

Index: vpn-daemons/openvpn/auth-dialog/main.c
===================================================================
--- vpn-daemons/openvpn/auth-dialog/main.c	(revision 3154)
+++ vpn-daemons/openvpn/auth-dialog/main.c	(working copy)
@@ -386,8 +386,10 @@
 
 	exit_status = 0;
 
-	if (!info.need_password && !info.need_certpass)
+	if (!info.need_password && !info.need_certpass) {
+		printf ("%s\n%s\n\n\n", NM_OPENVPN_KEY_NOSECRET, "true");
 		goto out;
+	}
 
 	if (get_passwords (&info, retry)) {
 		if (info.need_password)
Index: vpn-daemons/openvpn/src/nm-openvpn-service.h
===================================================================
--- vpn-daemons/openvpn/src/nm-openvpn-service.h	(revision 3154)
+++ vpn-daemons/openvpn/src/nm-openvpn-service.h	(working copy)
@@ -66,6 +66,7 @@
 
 #define NM_OPENVPN_KEY_PASSWORD "password"
 #define NM_OPENVPN_KEY_CERTPASS "cert-pass"
+#define NM_OPENVPN_KEY_NOSECRET "no-secret"
 
 typedef struct {
 	NMVPNPlugin parent;
Index: vpn-daemons/openvpn/src/nm-openvpn-service.c
===================================================================
--- vpn-daemons/openvpn/src/nm-openvpn-service.c	(revision 3154)
+++ vpn-daemons/openvpn/src/nm-openvpn-service.c	(working copy)
@@ -101,6 +101,7 @@
 	{ NM_OPENVPN_KEY_USERNAME,        G_TYPE_STRING },
 	{ NM_OPENVPN_KEY_PASSWORD,        G_TYPE_STRING },
 	{ NM_OPENVPN_KEY_CERTPASS,        G_TYPE_STRING },
+	{ NM_OPENVPN_KEY_NOSECRET,        G_TYPE_STRING },
 	{ NULL,                           G_TYPE_NONE }
 };