Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (3)
......@@ -231,11 +231,11 @@ vlc_credential_clean(vlc_credential *p_credential);
* keystore or the dialog
* @param psz_dialog_fmt dialog text using format
*
* @return true if vlc_credential.psz_username and vlc_credential.psz_password
* are valid, otherwise this function should not be called again.
* @return 0 if vlc_credential.psz_username and vlc_credential.psz_password
* are valid, or a negative errno code.
*/
VLC_API bool
VLC_API int
vlc_credential_get(vlc_credential *p_credential, vlc_object_t *p_parent,
const char *psz_option_username,
const char *psz_option_password,
......
......@@ -444,8 +444,10 @@ static int login( stream_t *p_access )
psz_var_domain = var_InheritString( p_access, "smb-domain" );
credential.psz_realm = psz_var_domain ? psz_var_domain : NULL;
vlc_credential_get( &credential, p_access, "smb-user", "smb-pwd",
NULL, NULL );
if (vlc_credential_get( &credential, p_access, "smb-user", "smb-pwd",
NULL, NULL ) == -EINTR )
goto error;
if( !credential.psz_username )
{
......@@ -522,7 +524,7 @@ static int login( stream_t *p_access )
while( connect_err == EACCES
&& vlc_credential_get( &credential, p_access, "smb-user", "smb-pwd",
SMB1_LOGIN_DIALOG_TITLE,
SMB_LOGIN_DIALOG_TEXT, p_sys->netbios_name ) )
SMB_LOGIN_DIALOG_TEXT, p_sys->netbios_name ) == 0 )
{
b_guest = false;
psz_login = credential.psz_username;
......
......@@ -455,8 +455,13 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys, const char *path
bool b_logged = false;
/* First: try credentials from url / option */
vlc_credential_get( &credential, p_access, "ftp-user", "ftp-pwd",
NULL, NULL );
if (vlc_credential_get( &credential, p_access, "ftp-user", "ftp-pwd",
NULL, NULL ) == -EINTR )
{
vlc_credential_clean( &credential );
goto error;
}
do
{
const char *psz_username = credential.psz_username;
......@@ -471,7 +476,7 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys, const char *path
}
while( vlc_credential_get( &credential, p_access, "ftp-user", "ftp-pwd",
LOGIN_DIALOG_TITLE, LOGIN_DIALOG_TEXT,
url.psz_host ) );
url.psz_host ) == 0 );
if( b_logged )
{
......
......@@ -259,11 +259,16 @@ static int Open( vlc_object_t *p_this )
p_sys->b_reconnect = var_InheritBool( p_access, "http-reconnect" );
if( vlc_credential_get( &credential, p_access, NULL, NULL, NULL, NULL ) )
ret = vlc_credential_get( &credential, p_access, NULL, NULL, NULL, NULL );
if( ret == 0 )
{
p_sys->url.psz_username = (char *) credential.psz_username;
p_sys->url.psz_password = (char *) credential.psz_password;
}
else if( ret == -EINTR )
goto error;
ret = VLC_EGENERIC;
connect:
/* Connect */
......@@ -297,7 +302,7 @@ connect:
if( vlc_credential_get( &credential, p_access, NULL, NULL,
_("HTTP authentication"),
_("Please enter a valid login name and a "
"password for realm %s."), p_sys->auth.psz_realm ) )
"password for realm %s."), p_sys->auth.psz_realm ) == 0 )
{
p_sys->psz_username = strdup(credential.psz_username);
p_sys->psz_password = strdup(credential.psz_password);
......
......@@ -190,9 +190,12 @@ static int Open(vlc_object_t *obj)
if (sys->resource == NULL)
goto error;
if (vlc_credential_get(&crd, obj, NULL, NULL, NULL, NULL))
ret = vlc_credential_get(&crd, obj, NULL, NULL, NULL, NULL);
if (ret == 0)
vlc_http_res_set_login(sys->resource,
crd.psz_username, crd.psz_password);
else if (ret == -EINTR)
goto error;
ret = VLC_EGENERIC;
......@@ -207,9 +210,9 @@ static int Open(vlc_object_t *obj)
if (psz_realm == NULL)
break;
crd.psz_realm = psz_realm;
if (!vlc_credential_get(&crd, obj, NULL, NULL, _("HTTP authentication"),
_("Please enter a valid login name and "
"a password for realm %s."), crd.psz_realm))
if (vlc_credential_get(&crd, obj, NULL, NULL, _("HTTP authentication"),
_("Please enter a valid login name and "
"a password for realm %s."), crd.psz_realm) != 0)
break;
vlc_http_res_set_login(sys->resource,
......
......@@ -616,18 +616,23 @@ static int Connect( demux_t *p_demux )
const char *psz_user = NULL;
const char *psz_pwd = NULL;
int i_http_port = 0;
int i_ret = VLC_SUCCESS;
int i_ret;
const int i_timeout = var_InheritInteger( p_demux, "ipv4-timeout" );
vlc_credential_init( &credential, &p_sys->url );
i_ret = vlc_credential_get( &credential, p_demux, "rtsp-user", "rtsp-pwd",
NULL, NULL );
/* Credentials can be NULL since they may not be needed */
if( vlc_credential_get( &credential, p_demux, "rtsp-user", "rtsp-pwd",
NULL, NULL) )
if( i_ret == 0 )
{
psz_user = credential.psz_username;
psz_pwd = credential.psz_password;
}
else if( i_ret == -EINTR )
goto bailout;
i_ret = VLC_SUCCESS;
createnew:
/* FIXME: This is naive and incorrect; it does not prevent the thread
......@@ -678,7 +683,7 @@ describe:
if( vlc_credential_get( &credential, p_demux, "rtsp-user", "rtsp-pwd",
_("RTSP authentication"),
_("Please enter a valid login name and a password.") ) )
_("Please enter a valid login name and a password.") ) == 0 )
{
psz_user = credential.psz_username;
psz_pwd = credential.psz_password;
......
......@@ -309,7 +309,9 @@ static int Open(vlc_object_t *obj)
vlc_credential_init(&credential, &url);
psz_var_domain = var_InheritString(access, "smb-domain");
credential.psz_realm = psz_var_domain;
vlc_credential_get(&credential, access, "smb-user", "smb-pwd", NULL, NULL);
if (vlc_credential_get(&credential, access, "smb-user", "smb-pwd", NULL, NULL)
== -EINTR)
goto error;
smbc_stat_fn stat_fn = smbc_getFunctionStat(ctx);
assert(stat_fn);
......@@ -347,9 +349,9 @@ static int Open(vlc_object_t *obj)
break;
errno = 0;
if (!vlc_credential_get(&credential, access, "smb-user",
"smb-pwd", SMB_LOGIN_DIALOG_TITLE,
SMB_LOGIN_DIALOG_TEXT, url.psz_host))
if (vlc_credential_get(&credential, access, "smb-user",
"smb-pwd", SMB_LOGIN_DIALOG_TITLE,
SMB_LOGIN_DIALOG_TEXT, url.psz_host) != 0)
break;
}
......
......@@ -403,8 +403,10 @@ static int Open( vlc_object_t* p_this )
goto error;
}
vlc_credential_get( &credential, p_access, "sftp-user", "sftp-pwd",
NULL, NULL );
if (vlc_credential_get( &credential, p_access, "sftp-user", "sftp-pwd",
NULL, NULL) == -EINTR)
goto error;
char* psz_userauthlist = NULL;
bool b_publickey_tried = false;
do
......@@ -463,7 +465,7 @@ static int Open( vlc_object_t* p_this )
} while( vlc_credential_get( &credential, p_access, "sftp-user", "sftp-pwd",
_("SFTP authentication"),
_("Please enter a valid login and password for "
"the SFTP connection to %s"), url.psz_host ) );
"the SFTP connection to %s"), url.psz_host ) == 0 );
/* Create the sftp session */
p_sys->sftp_session = libssh2_sftp_init( p_sys->ssh_session );
......
......@@ -857,14 +857,21 @@ Open(vlc_object_t *p_obj)
/* First, try Guest login or using "smb-" options (without
* keystore/user interaction) */
vlc_credential_get(&credential, access, "smb-user", "smb-pwd", NULL,
NULL);
if (vlc_credential_get(&credential, access, "smb-user", "smb-pwd", NULL,
NULL) == -EINTR)
{
vlc_credential_clean(&credential);
free(resolved_host);
ret = -EINTR;
goto error;
}
ret = vlc_smb2_connect_open_share(access, url, &credential);
while (VLC_SMB2_STATUS_DENIED(ret)
&& vlc_credential_get(&credential, access, "smb-user", "smb-pwd",
SMB_LOGIN_DIALOG_TITLE, SMB_LOGIN_DIALOG_TEXT,
sys->encoded_url.psz_host))
sys->encoded_url.psz_host) == 0)
ret = vlc_smb2_connect_open_share(access, url, &credential);
free(resolved_host);
free(url);
......
......@@ -294,7 +294,14 @@ static int Open(vlc_object_t *obj)
vlc_credential_init(&credential, &url);
psz_var_domain = var_InheritString(access, "smb-domain");
credential.psz_realm = psz_var_domain;
vlc_credential_get(&credential, access, "smb-user", "smb-pwd", NULL, NULL);
if (vlc_credential_get(&credential, access, "smb-user", "smb-pwd", NULL, NULL) == -EINTR)
{
vlc_credential_clean(&credential);
free(psz_var_domain);
free(psz_decoded_path);
vlc_UrlClean(&url);
return VLC_EGENERIC;
}
for (;;)
{
......@@ -326,9 +333,9 @@ static int Open(vlc_object_t *obj)
break;
errno = 0;
if (!vlc_credential_get(&credential, access, "smb-user",
"smb-pwd", SMB_LOGIN_DIALOG_TITLE,
SMB_LOGIN_DIALOG_TEXT, url.psz_host))
if (vlc_credential_get(&credential, access, "smb-user",
"smb-pwd", SMB_LOGIN_DIALOG_TITLE,
SMB_LOGIN_DIALOG_TEXT, url.psz_host) != 0)
break;
}
......
......@@ -311,11 +311,18 @@ RequestStatus LibVLCHTTPConnection::request(const std::string &path,
vlc_UrlParse(&crd_url, params.getUrl().c_str());
vlc_credential_init(&crd, &crd_url);
if (vlc_credential_get(&crd, p_object, NULL, NULL, NULL, NULL))
int ret = vlc_credential_get(&crd, p_object, NULL, NULL, NULL, NULL);
if (ret == 0)
{
vlc_http_res_set_login(source->http_res,
crd.psz_username, crd.psz_password);
}
else if (ret == -EINTR)
{
vlc_credential_clean(&crd);
vlc_UrlClean(&crd_url);
return RequestStatus::GenericError;
}
int status = vlc_http_res_get_status(source->http_res);
if (status < 0)
......@@ -337,7 +344,7 @@ RequestStatus LibVLCHTTPConnection::request(const std::string &path,
if (vlc_credential_get(&crd, p_object, NULL, NULL,
_("HTTP authentication"),
_("Please enter a valid login name and a "
"password for realm %s."), psz_realm))
"password for realm %s."), psz_realm) == 0)
{
if(source->abortandlogin(crd.psz_username, crd.psz_password))
{
......
......@@ -27,6 +27,7 @@
#include <vlc_keystore.h>
#include <vlc_modules.h>
#include <vlc_url.h>
#include <vlc_interrupt.h>
#include <libvlc.h>
#include <assert.h>
......@@ -372,7 +373,7 @@ vlc_credential_clean(vlc_credential *p_credential)
}
#undef vlc_credential_get
bool
int
vlc_credential_get(vlc_credential *p_credential, vlc_object_t *p_parent,
const char *psz_option_username,
const char *psz_option_password,
......@@ -385,7 +386,7 @@ vlc_credential_get(vlc_credential *p_credential, vlc_object_t *p_parent,
if (!is_url_valid(p_url))
{
msg_Err(p_parent, "vlc_credential_get: invalid url");
return false;
return -EINVAL;
}
p_credential->b_from_keystore = false;
......@@ -451,13 +452,16 @@ vlc_credential_get(vlc_credential *p_credential, vlc_object_t *p_parent,
if (p_credential->p_keystore != NULL)
credential_find_keystore(p_credential, p_credential->p_keystore);
if (vlc_killed())
return -EINTR;
p_credential->i_get_order++;
break;
default:
case GET_FROM_DIALOG:
if (!psz_dialog_title || !psz_dialog_fmt)
return false;
return -ENOENT;
char *psz_dialog_username = NULL;
char *psz_dialog_password = NULL;
va_list ap;
......@@ -483,7 +487,7 @@ vlc_credential_get(vlc_credential *p_credential, vlc_object_t *p_parent,
if (i_ret != 1)
{
p_credential->psz_username = p_credential->psz_password = NULL;
return false;
return vlc_killed() ? -EINTR : -ENOENT;
}
p_credential->psz_username = p_credential->psz_dialog_username;
......@@ -495,7 +499,7 @@ vlc_credential_get(vlc_credential *p_credential, vlc_object_t *p_parent,
break;
}
}
return is_credential_valid(p_credential);
return is_credential_valid(p_credential) ? 0 : -ENOENT;
}
#undef vlc_credential_store
......
......@@ -298,7 +298,7 @@ test(vlc_object_t *p_obj, unsigned int i_id, const struct testcase *p_test)
bool b_found = false;
while (vlc_credential_get(&credential, p_obj, psz_opt_user, psz_opt_pwd,
"test authentication", "this a test"))
"test authentication", "this a test") == 0)
{
bool realm_match = !p_test->result.psz_realm
|| (credential.psz_realm
......