aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-10-20 08:50:12 -0400
committerLibravatar GitHub <noreply@github.com>2016-10-20 08:50:12 -0400
commit363030f64e5fbd3999a45fe5284904ebdeca4ced (patch)
tree7f9ac5550bbcb42fbb151e9f5e4c5399623737ac
parentreplaced exit with _exit in forked child (diff)
parentadd missing include (diff)
downloadfirejail-363030f64e5fbd3999a45fe5284904ebdeca4ced.tar.gz
firejail-363030f64e5fbd3999a45fe5284904ebdeca4ced.tar.zst
firejail-363030f64e5fbd3999a45fe5284904ebdeca4ced.zip
Merge pull request #867 from manevich/misc
Misc fixes
-rw-r--r--etc/disable-programs.inc1
-rw-r--r--etc/mutt.profile1
-rwxr-xr-xmkuid.sh2
-rw-r--r--src/firemon/procevent.c2
4 files changed, 5 insertions, 1 deletions
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 0094c6d11..edd4ee374 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -77,6 +77,7 @@ blacklist ${HOME}/.8pecxstudios
77blacklist ${HOME}/.config/brave 77blacklist ${HOME}/.config/brave
78blacklist ${HOME}/.config/inox 78blacklist ${HOME}/.config/inox
79blacklist ${HOME}/.muttrc 79blacklist ${HOME}/.muttrc
80blacklist ${HOME}/.mutt
80blacklist ${HOME}/.mutt/muttrc 81blacklist ${HOME}/.mutt/muttrc
81blacklist ${HOME}/.msmtprc 82blacklist ${HOME}/.msmtprc
82blacklist ${HOME}/.config/evolution 83blacklist ${HOME}/.config/evolution
diff --git a/etc/mutt.profile b/etc/mutt.profile
index cda7fc4bf..b532ded67 100644
--- a/etc/mutt.profile
+++ b/etc/mutt.profile
@@ -2,6 +2,7 @@
2 2
3noblacklist ~/.muttrc 3noblacklist ~/.muttrc
4noblacklist ~/.mutt 4noblacklist ~/.mutt
5noblacklist ~/.mutt/muttrc
5noblacklist ~/.mailcap 6noblacklist ~/.mailcap
6noblacklist ~/.gnupg 7noblacklist ~/.gnupg
7noblacklist ~/.mail 8noblacklist ~/.mail
diff --git a/mkuid.sh b/mkuid.sh
index c95741043..a59f58143 100755
--- a/mkuid.sh
+++ b/mkuid.sh
@@ -1,4 +1,4 @@
1#!/bin/bash 1#!/bin/sh
2 2
3echo "extracting UID_MIN and GID_MIN" 3echo "extracting UID_MIN and GID_MIN"
4echo "#ifndef FIREJAIL_UIDS_H" > uids.h 4echo "#ifndef FIREJAIL_UIDS_H" > uids.h
diff --git a/src/firemon/procevent.c b/src/firemon/procevent.c
index 188c10183..78a3a4fb2 100644
--- a/src/firemon/procevent.c
+++ b/src/firemon/procevent.c
@@ -28,6 +28,8 @@
28#include <arpa/inet.h> 28#include <arpa/inet.h>
29#include <time.h> 29#include <time.h>
30#include <fcntl.h> 30#include <fcntl.h>
31#include <sys/uio.h>
32
31#define PIDS_BUFLEN 4096 33#define PIDS_BUFLEN 4096
32#define SERVER_PORT 889 // 889-899 is left unassigned by IANA 34#define SERVER_PORT 889 // 889-899 is left unassigned by IANA
33 35