diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_server/server.c | 4 | ||||
| -rw-r--r-- | src/zabbix_server/utils/nodechange.c | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index f30881b9..e8b9ae53 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -354,7 +354,7 @@ int main(int argc, char **argv) { int ch; - zbx_uint64_t nodeid; + int nodeid; #ifdef HAVE_ZZZ DB_RESULT result; @@ -409,7 +409,7 @@ int main(int argc, char **argv) break; case 'n': nodeid=0; - if(optarg) ZBX_STR2UINT64(nodeid,optarg); + if(optarg) nodeid = atoi(optarg); change_nodeid(0,nodeid); exit(-1); break; diff --git a/src/zabbix_server/utils/nodechange.c b/src/zabbix_server/utils/nodechange.c index 7e4debd1..f04104fa 100644 --- a/src/zabbix_server/utils/nodechange.c +++ b/src/zabbix_server/utils/nodechange.c @@ -54,7 +54,7 @@ * Comments: * * * ******************************************************************************/ -static int convert_trigger_expression(zbx_uint64_t old_id, zbx_uint64_t new_id, char *old_exp, char *new_exp) +static int convert_trigger_expression(int old_id, int new_id, char *old_exp, char *new_exp) { int i; char id[MAX_STRING_LEN]; @@ -117,7 +117,7 @@ static int convert_trigger_expression(zbx_uint64_t old_id, zbx_uint64_t new_id, * Comments: * * * ******************************************************************************/ -int change_nodeid(zbx_uint64_t old_id, zbx_uint64_t new_id) +int change_nodeid(int old_id, int new_id) { int i,j; DB_RESULT result; @@ -131,6 +131,12 @@ int change_nodeid(zbx_uint64_t old_id, zbx_uint64_t new_id) return FAIL; } + if(new_id>999 || new_id<0) + { + printf("Node ID must be in range of 0-999.\n"); + return FAIL; + } + zabbix_set_log_level(LOG_LEVEL_WARNING); DBconnect(); |