diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-09-07 14:35:15 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2018-12-18 02:02:04 +0100 |
| commit | 108aca0a9e71f2efb699dfeb5e3a1d7e24002de7 (patch) | |
| tree | d8c4af6624b4253eaf298276733bec3778d67749 /ctdb/event | |
| parent | 63a4c634a65afbf04080d3958d1b91d3a8770cc7 (diff) | |
| download | samba-108aca0a9e71f2efb699dfeb5e3a1d7e24002de7.tar.gz | |
ctdb-event: Declare and construct data_script only if needed
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/event')
| -rw-r--r-- | ctdb/event/event_tool.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ctdb/event/event_tool.c b/ctdb/event/event_tool.c index 8350f202cea..b5972793fdb 100644 --- a/ctdb/event/event_tool.c +++ b/ctdb/event/event_tool.c @@ -515,7 +515,7 @@ static int event_command_script_enable(TALLOC_CTX *mem_ctx, struct event_tool_context *ctx = talloc_get_type_abort( private_data, struct event_tool_context); struct stat statbuf; - char *script, *etc_script, *data_script; + char *script, *etc_script; int ret; if (argc != 2) { @@ -533,11 +533,6 @@ static int event_command_script_enable(TALLOC_CTX *mem_ctx, return ENOMEM; } - data_script = path_datadir_append(mem_ctx, script); - if (data_script == NULL) { - return ENOMEM; - } - ret = lstat(etc_script, &statbuf); if (ret == 0) { if (S_ISLNK(statbuf.st_mode)) { @@ -555,6 +550,13 @@ static int event_command_script_enable(TALLOC_CTX *mem_ctx, return EINVAL; } else { if (errno == ENOENT) { + char *data_script; + + data_script = path_datadir_append(mem_ctx, script); + if (data_script == NULL) { + return ENOMEM; + } + ret = stat(data_script, &statbuf); if (ret != 0) { printf("Script %s does not exist in %s\n", |