X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=privoxy-generic.init;h=936fc3b4a45bc2894780e0f8aadfdd954237bb83;hp=a6d07ae814378713b026af60b3971ffe4dd6a484;hb=42d87f67e095be5f0269a67893059a3452e3d4f0;hpb=d02bbf657292ae806414d0b3dfe1b0d63d1ac520

diff --git a/privoxy-generic.init b/privoxy-generic.init
index a6d07ae8..936fc3b4 100755
--- a/privoxy-generic.init
+++ b/privoxy-generic.init
@@ -39,6 +39,36 @@
 # 
 #  Revisions   :
 #     $Log: privoxy-generic.init,v $
+#     Revision 1.7  2006/10/14 14:12:22  fabiankeil
+#     Print warnings if the user tries to run Privoxy as root
+#     or if the script is run without root privileges;
+#     only use "--user" if run with root privileges and
+#     don't depend on $USER being set to root. Fixes BR 779781.
+#
+#     Apparently $USER isn't set on all systems,
+#     but it also didn't work if the user only
+#     increased her privileges with su or sudo,
+#     but still had her real uid in $USER.
+#
+#     Thanks to Florian Effenberger for reporting.
+#
+#     Revision 1.6  2006/07/18 14:48:47  david__schmidt
+#     Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+#     with what was really the latest development (the v_3_0_branch branch)
+#
+#     Revision 1.5.2.1  2002/10/17 17:04:22  hal9
+#     Add from main trunk. Will be needed for make install.
+#
+#     Revision 1.5  2002/10/17 17:01:29  hal9
+#     Set paths to match the defaults for a root install. Force remove PIDFILE on
+#     stop.
+#
+#     Revision 1.4  2002/09/11 01:15:02  hal9
+#     Fix typo in variable. Now tested on Solaris and Linux, with defaults.
+#
+#     Revision 1.3  2002/09/11 01:09:14  hal9
+#     Better handling of pidfile, and process owner.
+#
 #     Revision 1.2  2002/09/08 20:27:58  hal9
 #     -Rewrote script config section.
 #     -Added comments to script.
@@ -62,15 +92,15 @@
 # logfile is writable by $P_USER (logfile is defined in config), and that 
 # there is suitable write access for $P_PIDFILE.
 
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin/:/usr/bin:/sbin:/bin
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/xpg4/bin:/usr/bin:/sbin:/bin
 P_NAME=Privoxy
 # Path to executable.
 P_DAEMON=privoxy
 # Full path to location of Privoxy config file. 
-P_CONF_FILE=./config
+P_CONF_FILE=/usr/local/etc/privoxy/config
 # Full path to PID file location. Location must be writable by 
-# whoever runs this script.
-P_PIDFILE=`pwd`/privoxy.pid
+# whoever runs this script and by Privoxy itself.
+P_PIDFILE=/var/run/privoxy.pid
 # If uncommented, this script will try to run as USER=privoxy, which
 # may require special handling of config, *.action, trust, logfile, 
 # jarfile, and pidfile.
@@ -78,10 +108,25 @@ P_USER=privoxy
 
 # If a privoxy user is specified, lets try that. /bin/sh does not seem to 
 # know about $UID.
-if [ "$USER" = "root" ] && [ -n "$P_USER" ] && id $P_USER >/dev/null; then
-  P_OWNER=$P_USER
-else 
-  P_OWNER=$USER
+if [ 0 = `id -u` ]; then
+  if [ -n "$P_USER" ]; then
+    id $P_USER 2>/dev/null >/dev/null
+    if [ $? -eq 0 ]; then
+      P_USER_SETTINGS="--user $P_USER"
+    else
+      echo "User $P_USER doesn't exist, exiting."
+      exit 1
+    fi 
+  else
+    # The user has sufficient rights, but $P_USER isn't set
+    echo "Running Privoxy as root is not recommended!" 
+    P_USER_SETTINGS=""
+  fi
+else
+  # The user has insufficient rights to run Privoxy as $P_USER
+  # and may not be able to write or delete the PID file.
+  echo "You aren't root, expect trouble!"
+  P_USER_SETTINGS=""
 fi
 
 if [ ! -f $P_CONF_FILE ]; then
@@ -94,14 +139,14 @@ case "$1" in
  start)
      if [ -f $P_PIDFILE ]; then
        if kill -0 `cat $P_PIDFILE`; then
-         echo "Error: $NAME is already running, exiting."
+         echo "Error: $P_NAME is already running, exiting."
          exit 1
        else
          rm -f $P_PIDFILE
        fi
      fi
 
-	$P_DAEMON --pidfile $P_PIDFILE --user $P_OWNER $P_CONF_FILE 2>/dev/null
+	$P_DAEMON --pidfile $P_PIDFILE $P_USER_SETTINGS $P_CONF_FILE 2>/dev/null
      
      if [ $? -eq 0 ]; then
        echo "Starting $P_NAME, OK." 
@@ -118,7 +163,7 @@ case "$1" in
  
  stop)
      test ! -f $P_PIDFILE && echo "No $P_PIDFILE file found, exiting." && exit 1
-     kill `cat $P_PIDFILE` &&\
+     kill `cat $P_PIDFILE` && rm -f $P_PIDFILE && \
      echo "Stopping $P_NAME, OK." || echo "Stopping $P_NAME, failed."
      ;;