diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-01-26 13:30:11 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-01-26 13:30:11 +0000 |
| commit | 988561fece8022aad10b9f9a5c692c19b9b898a1 (patch) | |
| tree | 46c33b96cc9cdf8cfc75c8bdc2ebdbfaac01f80a /src | |
| parent | 800ef4ec1472f443cbc7a69e0267071d33aae489 (diff) | |
| download | zabbix-988561fece8022aad10b9f9a5c692c19b9b898a1.tar.gz zabbix-988561fece8022aad10b9f9a5c692c19b9b898a1.tar.xz zabbix-988561fece8022aad10b9f9a5c692c19b9b898a1.zip | |
- agent can be started as root, new parameter AllowRoot (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@3757 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/zbxconf/cfg.c | 2 | ||||
| -rw-r--r-- | src/zabbix_agent/zabbix_agentd.c | 2 | ||||
| -rw-r--r-- | src/zabbix_agent/zbxconf.c | 2 | ||||
| -rw-r--r-- | src/zabbix_server/server.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/zbxconf/cfg.c b/src/libs/zbxconf/cfg.c index e9d932b8..1259fec2 100644 --- a/src/libs/zbxconf/cfg.c +++ b/src/libs/zbxconf/cfg.c @@ -27,7 +27,7 @@ int CONFIG_ZABBIX_FORKS = 5; char *CONFIG_LOG_FILE = NULL; -char CONFIG_ALLOW_ROOT_PERMISSION = 0; +char CONFIG_ALLOW_ROOT = 0; int CONFIG_TIMEOUT = AGENT_TIMEOUT; /****************************************************************************** diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c index 4d4a747e..3abf07b0 100644 --- a/src/zabbix_agent/zabbix_agentd.c +++ b/src/zabbix_agent/zabbix_agentd.c @@ -425,7 +425,7 @@ int main(int argc, char **argv) break; } - START_MAIN_ZABBIX_ENTRY(CONFIG_ALLOW_ROOT_PERMISSION); + START_MAIN_ZABBIX_ENTRY(CONFIG_ALLOW_ROOT); exit(SUCCEED); } diff --git a/src/zabbix_agent/zbxconf.c b/src/zabbix_agent/zbxconf.c index d8b9b8d3..4640dcab 100644 --- a/src/zabbix_agent/zbxconf.c +++ b/src/zabbix_agent/zbxconf.c @@ -84,7 +84,7 @@ void load_config(int exit_on_error) {"StartAgents", &CONFIG_ZABBIX_FORKS, 0,TYPE_INT, PARM_OPT, 1,16}, {"RefreshActiveChecks", &CONFIG_REFRESH_ACTIVE_CHECKS, 0,TYPE_INT, PARM_OPT,60,3600}, {"EnableRemoteCommands",&CONFIG_ENABLE_REMOTE_COMMANDS, 0,TYPE_INT, PARM_OPT,0,1}, - {"AllowRootPermission", &CONFIG_ALLOW_ROOT_PERMISSION, 0,TYPE_INT, PARM_OPT,0,1}, + {"AllowRoot", &CONFIG_ALLOW_ROOT, 0,TYPE_INT, PARM_OPT,0,1}, // {"PerfCounter", &CONFIG_PERF_COUNTER, 0, TYPE_STRING,PARM_OPT,0,0}, diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index 103a354c..a47ebbac 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -456,7 +456,7 @@ int main(int argc, char **argv) return 0; #endif /* TEST */ - return daemon_start(CONFIG_ALLOW_ROOT_PERMISSION); + return daemon_start(CONFIG_ALLOW_ROOT); } int MAIN_ZABBIX_ENTRY(void) |