3 files changed, 5 insertions, 5 deletions

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) {
         }       
 
         if (mask_x11_abstract_socket)
-                fprintf(fp, "%s/firejail/libx11.so\n", LIBDIR);
+                fprintf(fp, "%s/firejail/libconnect.so\n", LIBDIR);
 
         SET_PERMS_STREAM(fp, 0, 0, S_IRUSR | S_IWRITE | S_IRGRP | S_IROTH);
         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)
 CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security
 LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now 
 
-all: libx11.so
+all: libconnect.so
 
 %.o : %.c $(H_FILE_LIST)
         $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
-libx11.so: $(OBJS)
+libconnect.so: $(OBJS)
         $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl
 
 
-clean:; rm -f $(OBJS) libx11.so
+clean:; rm -f $(OBJS) libconnect.so
 
 distclean: clean
         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 @@
 static int check_sockaddr(const struct sockaddr *addr) {
         if (addr->sa_family == AF_UNIX) {
                 struct sockaddr_un *a = (struct sockaddr_un *) addr;
-                if (a->sun_path[0] == '\0') {
+                if (a->sun_path[0] == '\0' && strstr(a->sun_path + 1, "X11-unix")) {
 //                      printf("@%s\n", a->sun_path + 1);
                         errno = ENOENT;
                         return -1;