[vlc-commits] smb2: always print the encoded url in the dialog
Thomas Guillem
git at videolan.org
Mon Mar 15 10:05:14 UTC 2021
vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Mar 2 15:43:45 2021 +0100| [b91a5da35927f442551c829cfecafe0faa6a0147] | committer: Thomas Guillem
smb2: always print the encoded url in the dialog
(cherry picked from commit ebcfc500f5a6f1bd4c719013fe55e997ef09ac72)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=b91a5da35927f442551c829cfecafe0faa6a0147
---
modules/access/smb2.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/modules/access/smb2.c b/modules/access/smb2.c
index ada493f44f..f8141f515c 100644
--- a/modules/access/smb2.c
+++ b/modules/access/smb2.c
@@ -645,7 +645,6 @@ Open(vlc_object_t *p_obj)
char *resolved_host = vlc_smb2_resolve(access, sys->encoded_url.psz_host,
sys->encoded_url.i_port);
- const char *host;
/* smb2_* functions need a decoded url. Re compose the url from the
* modified sys->encoded_url (with the resolved host). */
@@ -655,12 +654,10 @@ Open(vlc_object_t *p_obj)
vlc_url_t resolved_url = sys->encoded_url;
resolved_url.psz_host = resolved_host;
url = vlc_uri_compose(&resolved_url);
- host = resolved_host;
}
else
{
url = vlc_uri_compose(&sys->encoded_url);
- host = sys->encoded_url.psz_host;
}
if (!vlc_uri_decode(url))
{
@@ -685,7 +682,7 @@ Open(vlc_object_t *p_obj)
&& (!sys->error_status || VLC_SMB2_STATUS_DENIED(sys->error_status))
&& vlc_credential_get(&credential, access, "smb-user", "smb-pwd",
SMB_LOGIN_DIALOG_TITLE, SMB_LOGIN_DIALOG_TEXT,
- host))
+ sys->encoded_url.psz_host))
{
sys->error_status = 0;
ret = vlc_smb2_open_share(access, url, &credential);
More information about the vlc-commits
mailing list