Skip to content

V
vlc
Commit bed447c7 authored by Thomas Guillem's avatar Thomas Guillem
Browse files
Options

stfp: don't save password in options if it's in the keystore

parent fefa2c56
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
modules/access/sftp.c
View file @ bed447c7
...@@ -212,6 +212,7 @@ static int Open( vlc_object_t* p_this ) ...@@ -212,6 +212,7 @@ static int Open( vlc_object_t* p_this )
//TODO: ask for the available auth methods //TODO: ask for the available auth methods
bool b_stored = false;
while( vlc_credential_get( &credential, p_access, "sftp-user", "sftp-pwd", while( vlc_credential_get( &credential, p_access, "sftp-user", "sftp-pwd",
_("SFTP authentication"), _("SFTP authentication"),
_("Please enter a valid login and password for " _("Please enter a valid login and password for "
...@@ -222,7 +223,7 @@ static int Open( vlc_object_t* p_this ) ...@@ -222,7 +223,7 @@ static int Open( vlc_object_t* p_this )
credential.psz_username, credential.psz_username,
credential.psz_password ) == 0 ) credential.psz_password ) == 0 )
{ {
vlc_credential_store( &credential ); b_stored = vlc_credential_store( &credential );
break; break;
} }
else else
...@@ -290,7 +291,7 @@ static int Open( vlc_object_t* p_this ) ...@@ -290,7 +291,7 @@ static int Open( vlc_object_t* p_this )
{ {
if( -1 == asprintf( &p_sys->psz_username_opt, "sftp-user=%s", credential.psz_username ) ) if( -1 == asprintf( &p_sys->psz_username_opt, "sftp-user=%s", credential.psz_username ) )
p_sys->psz_username_opt = NULL; p_sys->psz_username_opt = NULL;
if( -1 == asprintf( &p_sys->psz_password_opt, "sftp-pwd=%s", credential.psz_password ) ) if( b_stored || -1 == asprintf( &p_sys->psz_password_opt, "sftp-pwd=%s", credential.psz_password ) )
p_sys->psz_password_opt = NULL; p_sys->psz_password_opt = NULL;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment