From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 3 May 2015 09:51:22 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/audiod_acl'
X-Git-Tag: v0.5.5~37
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=e70beecd3fa6378aadf8773660741873023befcf;p=paraslash.git

Merge branch 'refs/heads/t/audiod_acl'

Cooking for about one month.

	* audiod: Allow to specify usernames in --user-allow.
---

e70beecd3fa6378aadf8773660741873023befcf
diff --cc NEWS
index 2eaad812,b29d4b82..87f678f5
--- a/NEWS
+++ b/NEWS
@@@ -7,15 -7,8 +7,18 @@@ current master branch "magnetic momentu
  	- On Linux systems, local sockets are now created in the
  	  abstract name space by default. This allows to get rid of
  	  the socket specials in /var/paraslash.
++	- The --user-allow option of para_audiod now accepts also
++	  usernames rather than only user IDs.
 +	- New autoconf macros to avoid duplication in configure.ac.
 +	- Status items (as shown by para_gui) are updated correctly
 +	  when the meta information of the current audio changes.
 +	- para_server and para_audiod no longer refuse to start in
 +	  the background if no log file is given. Instead, all log
 +	  messages go to /dev/null in this case.
 +
+ 
  Download: ./releases/paraslash-git.tar.bz2 (tarball)
 +
  ------------------------------------------
  0.5.4 (2015-01-23) "exponential alignment"
  ------------------------------------------
diff --cc audiod.h
index 94288eec,21e34e65..3b4b9bd0
--- a/audiod.h
+++ b/audiod.h
@@@ -40,9 -66,9 +40,9 @@@ __malloc char *audiod_get_decoder_flags
  extern struct audiod_args_info conf;
  extern int audiod_status;
  
- int handle_connect(int accept_fd, fd_set *rfds);
+ int handle_connect(int accept_fd, fd_set *rfds, uid_t *uid_whitelist);
  void audiod_status_dump(bool force);
 -char *get_time_string(int slot_num);
 +char *get_time_string(void);
  struct btr_node *audiod_get_btr_root(void);
  
  void stat_client_write_item(int item_num);