Commit d8ff7d02 authored by Nick Mathewson's avatar Nick Mathewson 🐚
Browse files

Merge branch 'reversible_3'

parents f23d4df0 b33f3c96

changes/ticket27992

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (configuration):

    - When creating a KeyDirectory with the same location as the

      DataDirectory (not recommended), respect the DataDirectory's

      group-readable setting if one has not been set for the KeyDirectory.

      Fixes bug 27992; bugfix on 0.3.3.1-alpha.

doc/tor.1.txt

+5 −3
Original line number Diff line number Diff line
@@ -2595,10 +2595,12 @@ is non-zero): 
    running.

    (Default: the "keys" subdirectory of DataDirectory.)



[[KeyDirectoryGroupReadable]] **KeyDirectoryGroupReadable** **0**|**1**::

[[KeyDirectoryGroupReadable]] **KeyDirectoryGroupReadable** **0**|**1**|**auto**::

    If this option is set to 0, don't allow the filesystem group to read the

    KeywDirectory. If the option is set to 1, make the KeyDirectory readable

    by the default GID. (Default: 0)

    KeyDirectory. If the option is set to 1, make the KeyDirectory readable

    by the default GID. If the option is "auto", then we use the

    setting for DataDirectoryGroupReadable when the KeyDirectory is the

    same as the DataDirectory, and 0 otherwise. (Default: auto)



[[RephistTrackTime]] **RephistTrackTime** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**::

    Tells an authority, or other node tracking node reliability and history,

scripts/maint/practracker/exceptions.txt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#

# Remember: It is better to fix the problem than to add a new exception!



problem file-size /src/app/config/config.c 7212

problem file-size /src/app/config/config.c 7400

problem include-count /src/app/config/config.c 80

problem function-size /src/app/config/config.c:options_act_reversible() 298

problem function-size /src/app/config/config.c:options_act() 381

src/app/config/config.c

+462 −194

File changed.

Preview size limit exceeded, changes collapsed.

src/app/config/config.h

+9 −1
Original line number Diff line number Diff line
@@ -301,7 +301,15 @@ STATIC int open_and_add_file_log(const log_severity_list_t *severity, 
                                 const char *fname,

                                 int truncate_log);

STATIC int options_init_logs(const or_options_t *old_options,

                             or_options_t *options, int validate_only);

                             const or_options_t *options, int validate_only);



STATIC int options_create_directories(char **msg_out);

struct log_transaction_t;

STATIC struct log_transaction_t *options_start_log_transaction(

                              const or_options_t *old_options,

                              char **msg_out);

STATIC void options_commit_log_transaction(struct log_transaction_t *xn);

STATIC void options_rollback_log_transaction(struct log_transaction_t *xn);



#ifdef TOR_UNIT_TESTS

int options_validate(const or_options_t *old_options,