[network-manager-openvpn] auth-dialog: ensure saved secrets are passed back to NM

[Dan Williams <dcbw src gnome org>]

commit 69d4ff7f5c9fc7859cbca5914b6fafd9402db6b0
Author: Dan Williams <dcbw redhat com>
Date:   Thu Jun 2 13:17:51 2011 -0500

    auth-dialog: ensure saved secrets are passed back to NM
    
    If the secret was saved, it may not have been passed back to NM like
    it should have been.

 auth-dialog/main.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 7596736..14be1f4 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -88,11 +88,10 @@ get_secrets (const char *vpn_name,
 			need_secret = TRUE;
 	}
 
-	/* Have all passwords and we're not supposed to ask the user again */
-	if (!need_secret && !retry)
-		return TRUE;
-
-	if (allow_interaction == FALSE) {
+	/* Either interaction is not allowed so pass back any passwords we have
+	 * without asking the user, or we've got all the passwords we need already.
+	 */
+	if (allow_interaction == FALSE || (!need_secret && !retry)) {
 		if (need_password)
 			*out_password = password;
 		if (need_certpass)