MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-14 08:15:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rework password handling in RAOP mDNS browser callback

Browse Source
This commit is contained in:
Julien BLACHE 2010-07-30 18:44:02 +02:00
parent 7a09ee4092
commit f5bcc82afb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/player.c
View File

@ -2760,6 +2760,7 @@ raop_device_cb(const char *name, const char *type, const char *domain, const cha
struct raop_device *prev; struct raop_device *prev;
cfg_t *apex; cfg_t *apex;
char *at_name; char *at_name;
char *password;
char *key; char *key;
char *val; char *val;
uint64_t id; uint64_t id;
@ -2875,8 +2876,8 @@ raop_device_cb(const char *name, const char *type, const char *domain, const cha
} }
avahi_free(val); avahi_free(val);
val = NULL;
password = NULL;
p = avahi_string_list_find(txt, "pw"); p = avahi_string_list_find(txt, "pw");
if (!p) if (!p)
{ {
@ -2897,7 +2898,6 @@ raop_device_cb(const char *name, const char *type, const char *domain, const cha
has_password = (strcmp(val, "false") != 0); has_password = (strcmp(val, "false") != 0);
avahi_free(val); avahi_free(val);
val = NULL;
if (has_password) if (has_password)
{ {
@ -2905,9 +2905,9 @@ raop_device_cb(const char *name, const char *type, const char *domain, const cha
apex = cfg_gettsec(cfg, "apex", at_name); apex = cfg_gettsec(cfg, "apex", at_name);
if (apex) if (apex)
val = cfg_getstr(apex, "password"); password = cfg_getstr(apex, "password");
if (!val) if (!password)
DPRINTF(E_LOG, L_PLAYER, "No password given in config for AirTunes device %s\n", name); DPRINTF(E_LOG, L_PLAYER, "No password given in config for AirTunes device %s\n", name);
} }
@ -2986,7 +2986,7 @@ raop_device_cb(const char *name, const char *type, const char *domain, const cha
rd->encrypt = 1; rd->encrypt = 1;
rd->has_password = has_password; rd->has_password = has_password;
rd->password = val; rd->password = password;
pthread_mutex_unlock(&dev_lck); pthread_mutex_unlock(&dev_lck);
} }