[vlc-commits] Revert "keystore: Don't reject credentials from memory/keystore without dialog params"

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Nov  2 09:49:09 2017 +0100| [416712589f485ebd20712aa2f2ec799c2d8ded8a] | committer: Hugo Beauzée-Luyssen

Revert "keystore: Don't reject credentials from memory/keystore without dialog params"

This reverts commit 34860e84807e8bb87c3370a108cbc5afbe5b030b.
Opening the keystore might trigger a user action while this is meant to
be a silent operation, especially if the service we're connecting to
doesn't require credentials

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=416712589f485ebd20712aa2f2ec799c2d8ded8a
---

 src/misc/keystore.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/misc/keystore.c b/src/misc/keystore.c
index b754a8a74d..116849e042 100644
--- a/src/misc/keystore.c
+++ b/src/misc/keystore.c
@@ -435,6 +435,9 @@ vlc_credential_get(vlc_credential *p_credential, vlc_object_t *p_parent,
 
         case GET_FROM_MEMORY_KEYSTORE:
         {
+            if (!psz_dialog_title || !psz_dialog_fmt)
+                return false;
+
             vlc_keystore *p_keystore = get_memory_keystore(p_parent);
             if (p_keystore != NULL)
                 credential_find_keystore(p_credential, p_keystore);
@@ -443,6 +446,9 @@ vlc_credential_get(vlc_credential *p_credential, vlc_object_t *p_parent,
         }
 
         case GET_FROM_KEYSTORE:
+            if (!psz_dialog_title || !psz_dialog_fmt)
+                return false;
+
             if (p_credential->p_keystore == NULL)
                 p_credential->p_keystore = vlc_keystore_create(p_parent);
             if (p_credential->p_keystore != NULL)