Merge branch 'privsep'
authorMark Wooding <mdw@distorted.org.uk>
Tue, 30 Dec 2008 14:51:07 +0000 (14:51 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 30 Dec 2008 14:51:07 +0000 (14:51 +0000)
commitb7e1e18b57c30555f65a2548e0f1f186200c0ea8
treedee192f5a031abdba69dc54d500bff7750fd4909
parent3cbd2d89482ab48adea16aef781b191b793d9a26
parent388e0319a0faf48193658c82228133bd1ea24eb6
Merge branch 'privsep'

* privsep:
  server: Introduce privilege separation.
  server: Zap spurious space output by a_vformat.
  server: Make a_vformat public.
  server: Set admin socket permissions to match user.
  client: Capture server stderr and send it to the logfile.
  client: Better logging infrastructure.
  client: Clean up variable declarations.
  client: New options for setting user and group identities.
  client: Function for inserting arguments.
  peer, tunnels: New file-descriptor opening interface.

Conflicts:

server/Makefile.am
Makefile.am
client/tripectl.c
configure.ac
server/Makefile.am
server/admin.c