diff options
| author | dormando <dormando@rydia.net> | 2018-07-05 22:37:09 -0700 |
|---|---|---|
| committer | dormando <dormando@rydia.net> | 2018-07-06 11:47:09 -0700 |
| commit | ff68e8bc762b108ab0df59fdd6480699f0b75aff (patch) | |
| tree | 55e253e99232699ab637cbd860458107ac2595a4 /memcached.c | |
| parent | 94ca8d4c4cb076c82e46d005437dd5295f38e7c6 (diff) | |
| download | memcached-ff68e8bc762b108ab0df59fdd6480699f0b75aff.tar.gz | |
drop_privileges is no longer default if available.
adds `-o drop_privileges` along with existing no_drop_privileges.
Feature is experimental, and causing some user pain: I'd forgotten about the
disable flag entirely, somehow.
Changing defaults (especially for a security feature) is not a typical thing
to do, but we should have done this from the start like all other features:
initially gated, then added to `modern`, then switched to default once mature.
Diffstat (limited to 'memcached.c')
| -rw-r--r-- | memcached.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/memcached.c b/memcached.c index 2f8f89c..e42dd77 100644 --- a/memcached.c +++ b/memcached.c @@ -271,7 +271,7 @@ static void settings_init(void) { settings.crawls_persleep = 1000; settings.logger_watcher_buf_size = LOGGER_WATCHER_BUF_SIZE; settings.logger_buf_size = LOGGER_BUF_SIZE; - settings.drop_privileges = true; + settings.drop_privileges = false; #ifdef MEMCACHED_DEBUG settings.relaxed_privileges = false; #endif @@ -3239,6 +3239,9 @@ static void process_stat_settings(ADD_STAT add_stats, void *c) { APPEND_STAT("worker_logbuf_size", "%u", settings.logger_buf_size); APPEND_STAT("track_sizes", "%s", item_stats_sizes_status() ? "yes" : "no"); APPEND_STAT("inline_ascii_response", "%s", settings.inline_ascii_response ? "yes" : "no"); +#ifdef HAVE_DROP_PRIVILEGES + APPEND_STAT("drop_privileges", "%s", settings.drop_privileges ? "yes" : "no"); +#endif #ifdef EXTSTORE APPEND_STAT("ext_item_size", "%u", settings.ext_item_size); APPEND_STAT("ext_item_age", "%u", settings.ext_item_age); @@ -6230,7 +6233,8 @@ static void usage(void) { " currently: nothing\n" " - no_modern: uses defaults of previous major version (1.4.x)\n" #ifdef HAVE_DROP_PRIVILEGES - " - no_drop_privileges: Disable drop_privileges in case it causes issues with\n" + " - drop_privileges: enable dropping extra syscall privileges\n" + " - no_drop_privileges: disable drop_privileges in case it causes issues with\n" " some customisation.\n" #ifdef MEMCACHED_DEBUG " - relaxed_privileges: Running tests requires extra privileges.\n" @@ -6581,6 +6585,7 @@ int main (int argc, char **argv) { NO_LRU_CRAWLER, NO_LRU_MAINTAINER, NO_DROP_PRIVILEGES, + DROP_PRIVILEGES, #ifdef MEMCACHED_DEBUG RELAXED_PRIVILEGES, #endif @@ -6638,6 +6643,7 @@ int main (int argc, char **argv) { [NO_LRU_CRAWLER] = "no_lru_crawler", [NO_LRU_MAINTAINER] = "no_lru_maintainer", [NO_DROP_PRIVILEGES] = "no_drop_privileges", + [DROP_PRIVILEGES] = "drop_privileges", #ifdef MEMCACHED_DEBUG [RELAXED_PRIVILEGES] = "relaxed_privileges", #endif @@ -7357,6 +7363,9 @@ int main (int argc, char **argv) { case NO_DROP_PRIVILEGES: settings.drop_privileges = false; break; + case DROP_PRIVILEGES: + settings.drop_privileges = true; + break; #ifdef MEMCACHED_DEBUG case RELAXED_PRIVILEGES: settings.relaxed_privileges = true; |