| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116 | 
							- #! /bin/sh -e
 
- ## 06_add_compile_time_defaults.dpatch by  <weasel@debian.org>
 
- ##
 
- ## All lines beginning with `## DP:' are a description of the patch.
 
- ## DP: Change a few compile time defaults so that Tor is better integrated on a Debian system
 
- if [ $# -lt 1 ]; then
 
-     echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
 
-     exit 1
 
- fi
 
- [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
 
- patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
 
- case "$1" in
 
-     -patch) patch -p1 ${patch_opts} < $0;;
 
-     -unpatch) patch -R -p1 ${patch_opts} < $0;;
 
-     *)
 
-         echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
 
-         exit 1;;
 
- esac
 
- exit 0
 
- @DPATCH@
 
- diff -urNad git-trunk-conf~/src/or/config.c git-trunk-conf/src/or/config.c
 
- --- git-trunk-conf~/src/or/config.c	2008-03-11 15:23:01.000000000 +0100
 
- +++ git-trunk-conf/src/or/config.c	2008-03-11 15:30:34.139280421 +0100
 
- @@ -15,6 +15,7 @@
 
-  #define CONFIG_PRIVATE
 
-  
 
-  #include "or.h"
 
- +#include <pwd.h>
 
-  #ifdef MS_WINDOWS
 
-  #include <shlobj.h>
 
-  #endif
 
- @@ -658,6 +659,8 @@
 
-  #if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD)
 
-  static void check_libevent_version(const char *m, int server);
 
-  #endif
 
- +static int debian_running_as_debiantor();
 
- +static int debian_config_fix_defaults();
 
-  
 
-  /** Magic value for or_options_t. */
 
-  #define OR_OPTIONS_MAGIC 9090909
 
- @@ -3634,6 +3637,9 @@
 
-    char *command_arg = NULL;
 
-    char *errmsg=NULL;
 
-  
 
- +  if (debian_config_fix_defaults() < 0)
 
- +    goto err;
 
- +
 
-    if (argv) { /* first time we're called. save commandline args */
 
-      backup_argv = argv;
 
-      backup_argc = argc;
 
- @@ -5051,3 +5057,60 @@
 
-    puts(routerparse_c_id);
 
-  }
 
-  
 
- +/* Checks whether we are running as the debian-tor user.
 
- + *   Returns -1 on error, 1 if we are debian-tor, 0 if not */
 
- +static int
 
- +debian_running_as_debiantor()
 
- +{
 
- +  struct passwd *pw = NULL;
 
- +  int uid;
 
- +
 
- +  uid = getuid();
 
- +  /* If we run as root we also apply our debian defaults. */
 
- +  if (uid == 0)
 
- +    return 1;
 
- +
 
- +  pw = getpwuid(uid);
 
- +  if (!pw) {
 
- +    log(LOG_WARN, LD_GENERAL, "Could not get passwd information for uid %d.", uid);
 
- +    return -1;
 
- +  }
 
- +  assert(pw->pw_name);
 
- +  if (strcmp(pw->pw_name, "debian-tor") == 0)
 
- +    return 1;
 
- +  else
 
- +    return 0;
 
- +}
 
- +
 
- +static int
 
- +debian_config_fix_defaults()
 
- +{
 
- +  config_var_t *var;
 
- +  static int fixed = 0;
 
- +  int running_as_debian;
 
- +
 
- +  if (fixed) return 0;
 
- +  fixed = 1;
 
- +
 
- +  running_as_debian = debian_running_as_debiantor();
 
- +  if (running_as_debian < 0) return -1;
 
- +  if (!running_as_debian) return 0;
 
- +
 
- +  var = config_find_option(&options_format, "DataDirectory");
 
- +  tor_assert(var);
 
- +  var->initvalue = tor_strdup("/var/lib/tor");
 
- +
 
- +  var = config_find_option(&options_format, "PidFile");
 
- +  tor_assert(var);
 
- +  var->initvalue = tor_strdup("/var/run/tor/tor.pid");
 
- +
 
- +  var = config_find_option(&options_format, "RunAsDaemon");
 
- +  tor_assert(var);
 
- +  var->initvalue = tor_strdup("1");
 
- +
 
- +  var = config_find_option(&options_format, "User");
 
- +  tor_assert(var);
 
- +  var->initvalue = tor_strdup("debian-tor");
 
- +
 
- +  return 0;
 
- +}
 
 
  |