aboutsummaryrefslogtreecommitdiffstats
path: root/src/firecfg/main.c
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2018-08-29 07:35:28 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2018-08-29 07:35:28 -0400
commitec9ac7df45acdde1eaaec75b2e85c6ad22f6c1a6 (patch)
tree44309790dc138e59143d147dda63ea7afac4094d /src/firecfg/main.c
parentsilence warning about failed unmounting of /sys (overlay options) (diff)
downloadfirejail-ec9ac7df45acdde1eaaec75b2e85c6ad22f6c1a6.tar.gz
firejail-ec9ac7df45acdde1eaaec75b2e85c6ad22f6c1a6.tar.zst
firejail-ec9ac7df45acdde1eaaec75b2e85c6ad22f6c1a6.zip
cleanup
Diffstat (limited to 'src/firecfg/main.c')
-rw-r--r--src/firecfg/main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index 298314d4f..810af6ff2 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -318,13 +318,14 @@ int main(int argc, char **argv) {
318 318
319 // user setup 319 // user setup
320 char *user = get_user(); 320 char *user = get_user();
321 assert(user);
321 uid_t uid; 322 uid_t uid;
322 gid_t gid; 323 gid_t gid;
323 char *home = get_homedir(user, &uid, &gid); 324 char *home = get_homedir(user, &uid, &gid);
324 325
325 326
326 // check for --bindir 327 // check for --bindir
327 for (i = i; i < argc; i++) { 328 for (i = 1; i < argc; i++) {
328 if (strncmp(argv[i], "--bindir=", 9) == 0) { 329 if (strncmp(argv[i], "--bindir=", 9) == 0) {
329 if (strncmp(argv[i] + 9, "~/", 2) == 0) { 330 if (strncmp(argv[i] + 9, "~/", 2) == 0) {
330 if (asprintf(&arg_bindir, "%s/%s", home, argv[i] + 11) == -1) 331 if (asprintf(&arg_bindir, "%s/%s", home, argv[i] + 11) == -1)
@@ -430,7 +431,7 @@ int main(int argc, char **argv) {
430 set_links_firecfg(); 431 set_links_firecfg();
431 432
432 // add user to firejail access database - only for root 433 // add user to firejail access database - only for root
433 if (user && getuid() == 0) { 434 if (getuid() == 0) {
434 printf("\nAdding user %s to Firejail access database in %s/firejail.users\n", user, SYSCONFDIR); 435 printf("\nAdding user %s to Firejail access database in %s/firejail.users\n", user, SYSCONFDIR);
435 firejail_user_add(user); 436 firejail_user_add(user);
436 } 437 }