diff options
author | Nick Mathewson <nickm@torproject.org> | 2014-11-05 14:11:47 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2014-11-05 14:11:47 -0500 |
commit | 4df419a4b19c3b4033b964ec73e82aa988034c81 (patch) | |
tree | c9067b2662db7966201101b7e5afe41d99fdb432 /src/common/util.h | |
parent | 3d8cb107323fa5d9cc375087e69a9940b947d0e3 (diff) | |
parent | 3d0d49be230a8720ebdadf668b993f8ba2c5b2ca (diff) | |
download | tor-4df419a4b19c3b4033b964ec73e82aa988034c81.tar.gz tor-4df419a4b19c3b4033b964ec73e82aa988034c81.zip |
Merge remote-tracking branch 'meejah/ticket-11291-extra-utests'
Conflicts:
src/or/config.c
Diffstat (limited to 'src/common/util.h')
-rw-r--r-- | src/common/util.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/util.h b/src/common/util.h index 9886b2db6a..921dd79da0 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -347,9 +347,11 @@ typedef unsigned int cpd_check_t; #define CPD_CREATE 1 #define CPD_CHECK 2 #define CPD_GROUP_OK 4 -#define CPD_CHECK_MODE_ONLY 8 +#define CPD_GROUP_READ 8 +#define CPD_CHECK_MODE_ONLY 16 int check_private_dir(const char *dirname, cpd_check_t check, const char *effective_user); + #define OPEN_FLAGS_REPLACE (O_WRONLY|O_CREAT|O_TRUNC) #define OPEN_FLAGS_APPEND (O_WRONLY|O_CREAT|O_APPEND) #define OPEN_FLAGS_DONT_REPLACE (O_CREAT|O_EXCL|O_APPEND|O_WRONLY) |