diff --git a/src/sf_binlog_writer.c b/src/sf_binlog_writer.c index 5ab4aaf..f6c7d13 100644 --- a/src/sf_binlog_writer.c +++ b/src/sf_binlog_writer.c @@ -596,7 +596,7 @@ int sf_binlog_writer_init_normal(SFBinlogWriterInfo *writer, return result; } if (create) { - SF_CHOWN_RETURN_ON_ERROR(filepath, geteuid(), getegid()); + SF_CHOWN_TO_RUNBY_RETURN_ON_ERROR(filepath); } writer->file.fd = -1; diff --git a/src/sf_global.h b/src/sf_global.h index ee7ebbc..9ad539f 100644 --- a/src/sf_global.h +++ b/src/sf_global.h @@ -101,6 +101,9 @@ extern SFContext g_sf_context; } \ } while (0) +#define SF_CHOWN_TO_RUNBY_RETURN_ON_ERROR(path) \ + SF_CHOWN_RETURN_ON_ERROR(path, geteuid(), getegid()) + #define SF_SET_CONTEXT_INI_CONFIG(config, filename, pIniContext, \ section_name, def_inner_port, def_outer_port, def_work_threads) \ do { \ diff --git a/src/sf_proto.h b/src/sf_proto.h index 6fc5e81..ab7a78f 100644 --- a/src/sf_proto.h +++ b/src/sf_proto.h @@ -309,19 +309,19 @@ static inline int sf_server_check_body_length( body_length, max_body_length); } -#define server_expect_body_length(task, expect_body_len) \ +#define server_expect_body_length(expect_body_len) \ sf_server_expect_body_length(&RESPONSE, REQUEST.header.body_len, \ expect_body_len) -#define server_check_min_body_length(task, min_body_length) \ +#define server_check_min_body_length(min_body_length) \ sf_server_check_min_body_length(&RESPONSE, REQUEST.header.body_len, \ min_body_length) -#define server_check_max_body_length(task, max_body_length) \ +#define server_check_max_body_length(max_body_length) \ sf_server_check_max_body_length(&RESPONSE, REQUEST.header.body_len, \ max_body_length) -#define server_check_body_length(task, min_body_length, max_body_length) \ +#define server_check_body_length(min_body_length, max_body_length) \ sf_server_check_body_length(&RESPONSE, REQUEST.header.body_len, \ min_body_length, max_body_length)