X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=c367919f4cee9ef500863ca618259b3ec4161581;hp=46d202d4683b8379f5f0dd5707c496673eb13898;hb=8a6eab01cd9bf31ff83a017d96c001d38ab877af;hpb=60aa73dd9e9e8465439a4c4bcfcf1afca5fd6fba

diff --git a/jcc.c b/jcc.c
index 46d202d4..c367919f 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.68 2002/03/04 20:17:32 oes Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.75 2002/03/06 10:02:19 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,32 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.68 2002/03/04 20:17:32 oes Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.75  2002/03/06 10:02:19  oes
+ *    Fixed stupid bug when --user was not given
+ *
+ *    Revision 1.74  2002/03/06 00:49:31  jongfoster
+ *    Fixing warning on Windows
+ *    Making #ifdefs that refer to the same variable consistently
+ *    use #ifdef unix rather than mixing #ifdef unix & #ifndef OS2
+ *
+ *    Revision 1.73  2002/03/05 23:57:30  hal9
+ *    Stray character 's' on line 1618 was breaking build.
+ *
+ *    Revision 1.72  2002/03/05 21:33:45  david__schmidt
+ *    - Re-enable OS/2 building after new parms were added
+ *    - Fix false out of memory report when resolving CGI templates when no IP
+ *      address is available of failed attempt (a la no such domain)
+ *
+ *    Revision 1.71  2002/03/05 18:13:56  oes
+ *    Added --user option
+ *
+ *    Revision 1.70  2002/03/05 04:52:42  oes
+ *    Deleted non-errlog debugging code
+ *
+ *    Revision 1.69  2002/03/04 23:50:00  jongfoster
+ *    Splitting off bind_port() call into bind_port_helper(), with
+ *    improved logging.
+ *
  *    Revision 1.68  2002/03/04 20:17:32  oes
  *    Fixed usage info
  *
@@ -459,6 +485,10 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.68 2002/03/04 20:17:32 oes Exp $";
 #include <sys/termios.h>
 #endif /* sun */
 
+#ifdef unix
+#include <pwd.h>
+#endif
+
 # include <signal.h>
 
 # ifdef __BEOS__
@@ -558,7 +588,7 @@ static const char VANILLA_WAFER[] =
  *                to be reopened by the main thread on HUP.
  *
  * Parameters  :
- *          1  :  the_signal - the signal cause this function to call 
+ *          1  :  the_signal = the signal cause this function to call
  *
  * Returns     :  - 
  *
@@ -1511,7 +1541,7 @@ static int32 server_thread(void *data)
 void usage(const char *myname)
 {
    printf("JunkBuster proxy version " VERSION " (" HOME_PAGE_URL ")\n"
-           "Usage: %s [--help] [--version] [--no-daemon] [--pidfile pidfile] [configfile]\n"
+           "Usage: %s [--help] [--version] [--no-daemon] [--pidfile pidfile] [--user user] [configfile]\n"
            "Aborting.\n", myname);
  
    exit(2);
@@ -1549,6 +1579,9 @@ int main(int argc, const char *argv[])
 #endif
 {
    int argc_pos = 0;
+#ifdef unix
+   struct passwd *pw = NULL;
+#endif
 
    Argc = argc;
    Argv = argv;
@@ -1583,12 +1616,24 @@ int main(int argc, const char *argv[])
       {
          no_daemon = 1;
       }
-
+#if defined(unix)
       else if (strcmp(argv[argc_pos], "--pidfile" ) == 0)
       {
          if (++argc_pos == argc) usage(argv[0]);
          pidfile = strdup(argv[argc_pos]);
       }
+
+      else if (strcmp(argv[argc_pos], "--user" ) == 0)
+      {
+         if (++argc_pos == argc) usage(argv[0]);
+         pw = getpwnam(argv[argc_pos]);
+                   
+         if (pw == NULL)
+         {
+            log_error(LOG_LEVEL_FATAL, "User %s not found.", argv[argc_pos]);
+         }
+      }
+#endif /* defined(unix) */
       else
 #endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
       {
@@ -1602,15 +1647,13 @@ int main(int argc, const char *argv[])
    {
       char *abs_file;
 
-      DBG(1, ("configfile before '%s'\n",configfile) );
-
       /* make config-filename absolute here */
       if ( !(basedir = getcwd( NULL, 1024 )))
       {
          perror("get working dir failed");
          exit( 1 );
       }
-      DBG(1, ("working dir '%s'\n",basedir) );
+
       if ( !(abs_file = malloc( strlen( basedir ) + strlen( configfile ) + 5 )))
       {
          perror("malloc failed");
@@ -1620,7 +1663,6 @@ int main(int argc, const char *argv[])
       strcat( abs_file, "/" );
       strcat( abs_file, configfile );
       configfile = abs_file;
-      DBG(1, ("configfile after '%s'\n",configfile) );
    }
 #endif /* defined unix */
 
@@ -1743,13 +1785,22 @@ int main(int argc, const char *argv[])
       close( 1 );
       chdir("/");
 
-      write_pid_file();
-
    } /* -END- if (!no_daemon) */
+
+   /*
+    * As soon as we have written the PID file, we can switch
+    * to the user ID indicated by the --user option
+    */
+   write_pid_file();
+   
+   if ((NULL != pw) && setuid(pw->pw_uid))
+   {
+      log_error(LOG_LEVEL_FATAL, "Cannot setuid(): Insufficient permissions.");
+   }
+
 }
 #endif /* defined unix */
 
-   DBG(1, ("call listen_loop() \n") );
    listen_loop();
 
    /* NOTREACHED */