From bfd365f0fd94dfb70fbc3f73628b4b7cbd2f4994 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Sat, 14 Jan 2017 09:30:04 +0800
Subject: [PATCH] Revert "Fix #1064"

This reverts commit dc94267fa17e40a68564970352fb6b3e0c9691ed.
---
 debian/shadowsocks-libev.init    | 2 +-
 debian/shadowsocks-libev.service | 2 +-
 src/manager.h                    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/shadowsocks-libev.init b/debian/shadowsocks-libev.init
index bab7bfb8..df334dd8 100644
--- a/debian/shadowsocks-libev.init
+++ b/debian/shadowsocks-libev.init
@@ -58,7 +58,7 @@ do_start()
     start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid $USER:$GROUP --exec $DAEMON --test > /dev/null \
         || return 1
     start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid $USER:$GROUP --exec $DAEMON -- \
-        -c "$CONFFILE" -u -f $PIDFILE $DAEMON_ARGS \
+        -c "$CONFFILE" -a "$USER" -u -f $PIDFILE $DAEMON_ARGS \
         || return 2
 }
 
diff --git a/debian/shadowsocks-libev.service b/debian/shadowsocks-libev.service
index 7a1459c2..ce288151 100644
--- a/debian/shadowsocks-libev.service
+++ b/debian/shadowsocks-libev.service
@@ -18,7 +18,7 @@ Type=simple
 EnvironmentFile=/etc/default/shadowsocks-libev
 User=nobody
 LimitNOFILE=32768
-ExecStart=/usr/bin/ss-server -c $CONFFILE $DAEMON_ARGS
+ExecStart=/usr/bin/ss-server -a $USER -c $CONFFILE $DAEMON_ARGS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/src/manager.h b/src/manager.h
index 65d04137..b7d2e2cc 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -45,6 +45,7 @@ struct manager_ctx {
     char *acl;
     char *user;
     char *plugin;
+    char *plugin_args;
     char *manager_address;
     char **hosts;
     int host_num;