RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Changed the -pass option to -passwd to avoid clash with mencoder option. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6571 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
bertrand 2002-06-25 23:56:33 +00:00
parent 86d8896c42
commit c424df896c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libmpdemux/network.c
View File

@ -32,7 +32,7 @@
extern int verbose;
extern m_config_t *mconfig;
/* Variables for the command line option -user & -pass */
/* Variables for the command line option -user & -passwd */
char *network_username;
char *network_password;
@ -344,7 +344,7 @@ http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry) {
int ret;
if( *auth_retry==1 ) {
mp_msg(MSGT_NETWORK,MSGL_ERR,"Authentication failed\n");
mp_msg(MSGT_NETWORK,MSGL_ERR,"Please use the option -user and -pass to provide your username/password for a list of URLs,\n");
mp_msg(MSGT_NETWORK,MSGL_ERR,"Please use the option -user and -passwd to provide your username/password for a list of URLs,\n");
mp_msg(MSGT_NETWORK,MSGL_ERR,"or form an URL like: http://username:password@hostname/file\n");
return -1;
}
@ -381,14 +381,14 @@ http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry) {
strcpy(url->username, username);
} else {
mp_msg(MSGT_NETWORK,MSGL_ERR,"Unable to read the username\n");
mp_msg(MSGT_NETWORK,MSGL_ERR,"Please use the option -user and -pass to provide your username/password for a list of URLs,\n");
mp_msg(MSGT_NETWORK,MSGL_ERR,"Please use the option -user and -passwd to provide your username/password for a list of URLs,\n");
mp_msg(MSGT_NETWORK,MSGL_ERR,"or form an URL like: http://username:password@hostname/file\n");
return -1;
}
ret = m_config_is_option_set(mconfig,"pass");
ret = m_config_is_option_set(mconfig,"passwd");
if( ret==1 ) {
char *password;
password = *((char**)m_config_get_option_ptr(mconfig, "pass"));
password = *((char**)m_config_get_option_ptr(mconfig, "passwd"));
if( password==NULL ) return -1;
url->password = (char*)malloc(strlen(password)+1);
if( url->password==NULL ) {