torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branches/tor-0_1_2-patches/debian (from 9860 on) to trunk. This includes 0.1.2.13-1 and 0.1.2.13-2.

Browse Source 
svn:r10039
This commit is contained in:
Peter Palfrader
2007-04-27 13:28:07 +00:00
parent 397afcc3f6
commit 8dd603616e
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/changelog
Vendored
+13
View File
@@ -1,3 +1,16 @@
tor (0.1.2.13-2) unstable; urgency=low
* In options_init_from_torrc()'s error path only config_free() options
if they already have been initialized (closes: #421235).
-- Peter Palfrader <weasel@debian.org> Fri, 27 Apr 2007 13:06:37 +0200
tor (0.1.2.13-1) unstable; urgency=low
* New upstream version.
-- Peter Palfrader <weasel@debian.org> Tue, 24 Apr 2007 21:21:10 +0200
tor (0.1.2.12-rc-1) experimental; urgency=low
* New upstream version.
debian/patches/06_add_compile_time_defaults.dpatch
Vendored
+20 -10
View File
@@ -23,9 +23,9 @@ esac
exit 0
@DPATCH@
diff -urNad tor~/src/or/config.c tor/src/or/config.c
--- tor~/src/or/config.c 2006-07-23 19:31:29.000000000 +0200
+++ tor/src/or/config.c 2006-07-24 05:13:19.924871985 +0200
diff -urNad tor-debian~/src/or/config.c tor-debian/src/or/config.c
--- tor-debian~/src/or/config.c 2007-03-06 21:52:33.000000000 +0100
+++ tor-debian/src/or/config.c 2007-04-27 13:05:42.420147495 +0200
@@ -12,6 +12,7 @@
**/
@@ -34,8 +34,8 @@ diff -urNad tor~/src/or/config.c tor/src/or/config.c
#ifdef MS_WINDOWS
#include <shlobj.h>
#endif
@@ -396,6 +397,10 @@
static void check_libevent_version(const char *m, const char *v, int server);
@@ -592,6 +593,10 @@
static void check_libevent_version(const char *m, int server);
#endif
+static int debian_running_as_debiantor();
@@ -44,8 +44,8 @@ diff -urNad tor~/src/or/config.c tor/src/or/config.c
+
/*static*/ or_options_t *options_new(void);
#define OR_OPTIONS_MAGIC 9090909
@@ -2663,7 +2668,7 @@
/** Magic value for or_options_t. */
@@ -2982,7 +2987,7 @@
int
options_init_from_torrc(int argc, char **argv)
{
@@ -54,7 +54,7 @@ diff -urNad tor~/src/or/config.c tor/src/or/config.c
config_line_t *cl;
char *cf=NULL, *fname=NULL, *errmsg=NULL;
int i, retval;
@@ -2671,6 +2676,9 @@
@@ -2991,6 +2996,9 @@
static char **backup_argv;
static int backup_argc;
@@ -64,7 +64,17 @@ diff -urNad tor~/src/or/config.c tor/src/or/config.c
if (argv) { /* first time we're called. save commandline args */
backup_argv = argv;
backup_argc = argc;
@@ -3948,3 +3956,52 @@
@@ -3120,7 +3128,8 @@
err:
tor_free(fname);
torrc_fname = NULL;
- config_free(&options_format, newoptions);
+ if (newoptions)
+ config_free(&options_format, newoptions);
if (errmsg) {
log(LOG_WARN,LD_CONFIG,"Failed to parse/validate config: %s", errmsg);
tor_free(errmsg);
@@ -4306,3 +4315,52 @@
puts(routerparse_c_id);
}
@@ -79,7 +89,7 @@ diff -urNad tor~/src/or/config.c tor/src/or/config.c
+ uid = getuid();
+ pw = getpwuid(uid);
+ if (!pw) {
+ log(LOG_WARN, LD_GENERAL, "Could not get passwd information for %d.", uid);
+ log(LOG_WARN, LD_GENERAL, "Could not get passwd information for uid %d.", uid);
+ return -1;
+ }
+ assert(pw->pw_name);