Merge branch 'refs/heads/t/audiod_acl'

Cooking for about one month.

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

diff --cc NEWS
index 2eaad812d3b617cd1fb048c129139e354a4d59e5,b29d4b828ed1245b59795927667d3c6470d10332..87f678f578b27d8d3708b38fb2a14e6af7f4bd42
--- 1/NEWS
--- 2/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.c
Simple merge

diff --cc audiod.h
index 94288eec702dd016dbebcaa2f5bf68a882aab1e7,21e34e65fc2346d441957f8fbb48bbdc198a0800..3b4b9bd0416720e5e7d9455df23221cb049a2fc8
--- 1/audiod.h
--- 2/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);

diff --cc audiod_command.c
Simple merge