diff options
author | Glenn Washburn <development@efficientek.com> | 2018-10-09 04:39:22 -0500 |
---|---|---|
committer | Glenn Washburn <development@efficientek.com> | 2018-10-15 23:39:34 -0500 |
commit | fd79cb3be6aa2e62d5a7ec45eee39dcd07a9d4f3 (patch) | |
tree | 0d22e973c1c2e51cccc0be9481873a056127a9fe /src/firejail/fs_mkdir.c | |
parent | tentative fix: automatically mount libdir in chroot - #2176 (diff) | |
download | firejail-fd79cb3be6aa2e62d5a7ec45eee39dcd07a9d4f3.tar.gz firejail-fd79cb3be6aa2e62d5a7ec45eee39dcd07a9d4f3.tar.zst firejail-fd79cb3be6aa2e62d5a7ec45eee39dcd07a9d4f3.zip |
rename expand_home -> expand_macros to better reflect usage and remove unneeded homedir argument.
Diffstat (limited to 'src/firejail/fs_mkdir.c')
-rw-r--r-- | src/firejail/fs_mkdir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/firejail/fs_mkdir.c b/src/firejail/fs_mkdir.c index b66068a95..913f7502d 100644 --- a/src/firejail/fs_mkdir.c +++ b/src/firejail/fs_mkdir.c | |||
@@ -60,7 +60,7 @@ void fs_mkdir(const char *name) { | |||
60 | 60 | ||
61 | // check directory name | 61 | // check directory name |
62 | invalid_filename(name, 0); // no globbing | 62 | invalid_filename(name, 0); // no globbing |
63 | char *expanded = expand_home(name, cfg.homedir); | 63 | char *expanded = expand_macros(name); |
64 | if (strncmp(expanded, cfg.homedir, strlen(cfg.homedir)) != 0 && | 64 | if (strncmp(expanded, cfg.homedir, strlen(cfg.homedir)) != 0 && |
65 | strncmp(expanded, "/tmp", 4) != 0) { | 65 | strncmp(expanded, "/tmp", 4) != 0) { |
66 | fprintf(stderr, "Error: only directories in user home or /tmp are supported by mkdir\n"); | 66 | fprintf(stderr, "Error: only directories in user home or /tmp are supported by mkdir\n"); |
@@ -100,7 +100,7 @@ void fs_mkfile(const char *name) { | |||
100 | 100 | ||
101 | // check file name | 101 | // check file name |
102 | invalid_filename(name, 0); // no globbing | 102 | invalid_filename(name, 0); // no globbing |
103 | char *expanded = expand_home(name, cfg.homedir); | 103 | char *expanded = expand_macros(name); |
104 | if (strncmp(expanded, cfg.homedir, strlen(cfg.homedir)) != 0 && | 104 | if (strncmp(expanded, cfg.homedir, strlen(cfg.homedir)) != 0 && |
105 | strncmp(expanded, "/tmp", 4) != 0) { | 105 | strncmp(expanded, "/tmp", 4) != 0) { |
106 | fprintf(stderr, "Error: only files in user home or /tmp are supported by mkfile\n"); | 106 | fprintf(stderr, "Error: only files in user home or /tmp are supported by mkfile\n"); |