diff options
-rw-r--r-- | Makefile.in | 6 | ||||
-rwxr-xr-x | configure | 4 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/firejail/fs_trace.c | 2 | ||||
-rw-r--r-- | src/libconnect/Makefile.in (renamed from src/libx11/Makefile.in) | 6 | ||||
-rw-r--r-- | src/libconnect/libconnect.c (renamed from src/libx11/libx11.c) | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index cdb3535c2..3f08c5952 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,6 +1,6 @@ | |||
1 | all: apps man | 1 | all: apps man |
2 | MYLIBS = src/lib | 2 | MYLIBS = src/lib |
3 | APPS = src/firejail src/firemon src/firecfg src/libtrace src/libtracelog src/ftee src/faudit src/libx11 | 3 | APPS = src/firejail src/firemon src/firecfg src/libtrace src/libtracelog src/ftee src/faudit src/libconnect |
4 | MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 | 4 | MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 |
5 | 5 | ||
6 | prefix=@prefix@ | 6 | prefix=@prefix@ |
@@ -71,7 +71,7 @@ realinstall: | |||
71 | install -m 0755 -d $(DESTDIR)/$(libdir)/firejail | 71 | install -m 0755 -d $(DESTDIR)/$(libdir)/firejail |
72 | install -c -m 0644 src/libtrace/libtrace.so $(DESTDIR)/$(libdir)/firejail/. | 72 | install -c -m 0644 src/libtrace/libtrace.so $(DESTDIR)/$(libdir)/firejail/. |
73 | install -c -m 0644 src/libtracelog/libtracelog.so $(DESTDIR)/$(libdir)/firejail/. | 73 | install -c -m 0644 src/libtracelog/libtracelog.so $(DESTDIR)/$(libdir)/firejail/. |
74 | install -c -m 0644 src/libx11/libx11.so $(DESTDIR)/$(libdir)/firejail/. | 74 | install -c -m 0644 src/libconnect/libconnect.so $(DESTDIR)/$(libdir)/firejail/. |
75 | install -c -m 0755 src/ftee/ftee $(DESTDIR)/$(libdir)/firejail/. | 75 | install -c -m 0755 src/ftee/ftee $(DESTDIR)/$(libdir)/firejail/. |
76 | install -c -m 0755 src/fshaper/fshaper.sh $(DESTDIR)/$(libdir)/firejail/. | 76 | install -c -m 0755 src/fshaper/fshaper.sh $(DESTDIR)/$(libdir)/firejail/. |
77 | install -c -m 0644 src/firecfg/firecfg.config $(DESTDIR)/$(libdir)/firejail/. | 77 | install -c -m 0644 src/firecfg/firecfg.config $(DESTDIR)/$(libdir)/firejail/. |
@@ -121,7 +121,7 @@ install-strip: all | |||
121 | strip src/firecfg/firecfg | 121 | strip src/firecfg/firecfg |
122 | strip src/libtrace/libtrace.so | 122 | strip src/libtrace/libtrace.so |
123 | strip src/libtracelog/libtracelog.so | 123 | strip src/libtracelog/libtracelog.so |
124 | strip src/libx11/libx11.so | 124 | strip src/libconnect/libconnect.so |
125 | strip src/ftee/ftee | 125 | strip src/ftee/ftee |
126 | strip src/faudit/faudit | 126 | strip src/faudit/faudit |
127 | $(MAKE) realinstall | 127 | $(MAKE) realinstall |
@@ -3759,7 +3759,7 @@ if test "$prefix" = /usr; then | |||
3759 | sysconfdir="/etc" | 3759 | sysconfdir="/etc" |
3760 | fi | 3760 | fi |
3761 | 3761 | ||
3762 | ac_config_files="$ac_config_files Makefile src/lib/Makefile src/firejail/Makefile src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/ftee/Makefile src/faudit/Makefile src/libx11/Makefile" | 3762 | ac_config_files="$ac_config_files Makefile src/lib/Makefile src/firejail/Makefile src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/ftee/Makefile src/faudit/Makefile src/libconnect/Makefile" |
3763 | 3763 | ||
3764 | cat >confcache <<\_ACEOF | 3764 | cat >confcache <<\_ACEOF |
3765 | # This file is a shell script that caches the results of configure | 3765 | # This file is a shell script that caches the results of configure |
@@ -4477,7 +4477,7 @@ do | |||
4477 | "src/firecfg/Makefile") CONFIG_FILES="$CONFIG_FILES src/firecfg/Makefile" ;; | 4477 | "src/firecfg/Makefile") CONFIG_FILES="$CONFIG_FILES src/firecfg/Makefile" ;; |
4478 | "src/ftee/Makefile") CONFIG_FILES="$CONFIG_FILES src/ftee/Makefile" ;; | 4478 | "src/ftee/Makefile") CONFIG_FILES="$CONFIG_FILES src/ftee/Makefile" ;; |
4479 | "src/faudit/Makefile") CONFIG_FILES="$CONFIG_FILES src/faudit/Makefile" ;; | 4479 | "src/faudit/Makefile") CONFIG_FILES="$CONFIG_FILES src/faudit/Makefile" ;; |
4480 | "src/libx11/Makefile") CONFIG_FILES="$CONFIG_FILES src/libx11/Makefile" ;; | 4480 | "src/libconnect/Makefile") CONFIG_FILES="$CONFIG_FILES src/libconnect/Makefile" ;; |
4481 | 4481 | ||
4482 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; | 4482 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
4483 | esac | 4483 | esac |
diff --git a/configure.ac b/configure.ac index 523ebd831..a1d65cc63 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -148,7 +148,7 @@ if test "$prefix" = /usr; then | |||
148 | sysconfdir="/etc" | 148 | sysconfdir="/etc" |
149 | fi | 149 | fi |
150 | 150 | ||
151 | AC_OUTPUT(Makefile src/lib/Makefile src/firejail/Makefile src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/ftee/Makefile src/faudit/Makefile src/libx11/Makefile) | 151 | AC_OUTPUT(Makefile src/lib/Makefile src/firejail/Makefile src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/ftee/Makefile src/faudit/Makefile src/libconnect/Makefile) |
152 | 152 | ||
153 | echo | 153 | echo |
154 | echo "Configuration options:" | 154 | echo "Configuration options:" |
diff --git a/src/firejail/fs_trace.c b/src/firejail/fs_trace.c index 861b8a9a7..78fc8a647 100644 --- a/src/firejail/fs_trace.c +++ b/src/firejail/fs_trace.c | |||
@@ -64,7 +64,7 @@ void fs_trace(void) { | |||
64 | } | 64 | } |
65 | 65 | ||
66 | if (mask_x11_abstract_socket) | 66 | if (mask_x11_abstract_socket) |
67 | fprintf(fp, "%s/firejail/libx11.so\n", LIBDIR); | 67 | fprintf(fp, "%s/firejail/libconnect.so\n", LIBDIR); |
68 | 68 | ||
69 | SET_PERMS_STREAM(fp, 0, 0, S_IRUSR | S_IWRITE | S_IRGRP | S_IROTH); | 69 | SET_PERMS_STREAM(fp, 0, 0, S_IRUSR | S_IWRITE | S_IRGRP | S_IROTH); |
70 | fclose(fp); | 70 | fclose(fp); |
diff --git a/src/libx11/Makefile.in b/src/libconnect/Makefile.in index 2dfef8076..5b7a8d0f1 100644 --- a/src/libx11/Makefile.in +++ b/src/libconnect/Makefile.in | |||
@@ -10,16 +10,16 @@ BINOBJS = $(foreach file, $(OBJS), $file) | |||
10 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security | 10 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security |
11 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now | 11 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now |
12 | 12 | ||
13 | all: libx11.so | 13 | all: libconnect.so |
14 | 14 | ||
15 | %.o : %.c $(H_FILE_LIST) | 15 | %.o : %.c $(H_FILE_LIST) |
16 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ | 16 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ |
17 | 17 | ||
18 | libx11.so: $(OBJS) | 18 | libconnect.so: $(OBJS) |
19 | $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl | 19 | $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl |
20 | 20 | ||
21 | 21 | ||
22 | clean:; rm -f $(OBJS) libx11.so | 22 | clean:; rm -f $(OBJS) libconnect.so |
23 | 23 | ||
24 | distclean: clean | 24 | distclean: clean |
25 | rm -fr Makefile | 25 | rm -fr Makefile |
diff --git a/src/libx11/libx11.c b/src/libconnect/libconnect.c index 208fb65ed..18c4d81f5 100644 --- a/src/libx11/libx11.c +++ b/src/libconnect/libconnect.c | |||
@@ -38,7 +38,7 @@ | |||
38 | static int check_sockaddr(const struct sockaddr *addr) { | 38 | static int check_sockaddr(const struct sockaddr *addr) { |
39 | if (addr->sa_family == AF_UNIX) { | 39 | if (addr->sa_family == AF_UNIX) { |
40 | struct sockaddr_un *a = (struct sockaddr_un *) addr; | 40 | struct sockaddr_un *a = (struct sockaddr_un *) addr; |
41 | if (a->sun_path[0] == '\0') { | 41 | if (a->sun_path[0] == '\0' && strstr(a->sun_path + 1, "X11-unix")) { |
42 | // printf("@%s\n", a->sun_path + 1); | 42 | // printf("@%s\n", a->sun_path + 1); |
43 | errno = ENOENT; | 43 | errno = ENOENT; |
44 | return -1; | 44 | return -1; |