scottk/nDPId
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/nDPId.git synced 2025-10-29 09:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use chmod_chown() API from utils

Browse Source 
* `chmod_chown()` returns EINVAL if path is NULL

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni Uhlig
2024-11-12 13:12:08 +01:00
parent 9105b393e1
commit 7e4c69635a
2 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
examples/c-analysed/c-analysed.c
View File

@@ -1307,7 +1307,9 @@ static enum nDPIsrvd_callback_return process_analyse_events(struct nDPIsrvd_sock
if (BUFFER_REMAINING(csv_risks_used) > 0) if (BUFFER_REMAINING(csv_risks_used) > 0)
{ {
risks[csv_risks_used] = '\0'; risks[csv_risks_used] = '\0';
} else { }
else
{
risks[csv_risks_used - 1] = '\0'; risks[csv_risks_used - 1] = '\0';
} }
csv_buf_add(buf, &csv_buf_used, risks, csv_risks_used); csv_buf_add(buf, &csv_buf_used, risks, csv_risks_used);
@@ -1436,6 +1438,13 @@ static int parse_options(int argc, char ** argv)
{ {
opt = 1; opt = 1;
} }
else
{
if (chmod_chown(csv_outfile, S_IRUSR | S_IWUSR, "root", "root") != 0)
{
// skip "unused result" warning
}
}
csv_fp = fopen(csv_outfile, "a+"); csv_fp = fopen(csv_outfile, "a+");
if (csv_fp == NULL) if (csv_fp == NULL)
@@ -1474,6 +1483,13 @@ static int parse_options(int argc, char ** argv)
{ {
opt = 1; opt = 1;
} }
else
{
if (chmod_chown(stats_csv_outfile, S_IRUSR | S_IWUSR, "root", "root") != 0)
{
// skip "unused result" warning
}
}
stats_csv_fp = fopen(stats_csv_outfile, "a+"); stats_csv_fp = fopen(stats_csv_outfile, "a+");
if (stats_csv_fp == NULL) if (stats_csv_fp == NULL)
@@ -2026,47 +2042,22 @@ int main(int argc, char ** argv)
goto failure; goto failure;
} }
if (user != NULL) if (csv_outfile != NULL)
{ {
struct passwd * pwd; int ret = chmod_chown(csv_outfile, S_IRUSR | S_IWUSR | S_IRGRP, user, group);
struct group * grp; if (ret != 0)
gid_t gid;
errno = 0;
pwd = getpwnam(user);
if (pwd == NULL)
{ {
logger_early(1, "Get user failed: %s", strerror(errno)); logger_early(1, "Could not chmod/chown `%s': %s", csv_outfile, strerror(ret));
goto failure; return 1;
} }
}
if (group != NULL) if (stats_csv_outfile != NULL)
{
int ret = chmod_chown(stats_csv_outfile, S_IRUSR | S_IWUSR | S_IRGRP, user, group);
if (ret != 0)
{ {
errno = 0; logger_early(1, "Could not chmod/chown `%s': %s", stats_csv_outfile, strerror(ret));
grp = getgrnam(group); return 1;
if (grp == NULL)
{
logger_early(1, "Get group failed: %s", strerror(errno));
goto failure;
}
gid = grp->gr_gid;
}
else
{
gid = pwd->pw_gid;
}
if (csv_outfile != NULL &&
(chmod(csv_outfile, S_IRUSR | S_IWUSR) != 0 || chown(csv_outfile, pwd->pw_uid, gid) != 0))
{
logger_early(1, "Change user/group of `%s' failed: %s", csv_outfile, strerror(errno));
goto failure;
}
if (stats_csv_outfile != NULL &&
(chmod(stats_csv_outfile, S_IRUSR | S_IWUSR) != 0 || chown(stats_csv_outfile, pwd->pw_uid, gid) != 0))
{
logger_early(1, "Change user/group of `%s' failed: %s", stats_csv_outfile, strerror(errno));
goto failure;
} }
} }

5
utils.c
View File

@@ -396,6 +396,11 @@ int chmod_chown(char const * const path, mode_t mode, char const * const user, c
uid_t path_uid = (uid_t)-1; uid_t path_uid = (uid_t)-1;
gid_t path_gid = (gid_t)-1; gid_t path_gid = (gid_t)-1;
if (path == NULL)
{
return EINVAL;
}
if (mode != 0) if (mode != 0)
{ {
if (chmod(path, mode) != 0) if (chmod(path, mode) != 0)