merge #1100 from zackw: removed libconnect

4 files changed, 4 insertions, 98 deletions

diff --git a/src/firejail/fs_trace.c b/src/firejail/fs_trace.c
index 9e1dd546e..2a58d1eb2 100644
--- a/src/firejail/fs_trace.c
+++ b/src/firejail/fs_trace.c
@@ -60,9 +60,6 @@ void fs_trace(void) {
                         printf("Blacklist violations are logged to syslog\n");
         }       
 
-        if (mask_x11_abstract_socket)
-                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/firejail/sandbox.c b/src/firejail/sandbox.c
index 3fddc654b..1af9e7286 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -585,7 +585,7 @@ int sandbox(void* sandbox_arg) {
 #endif  
 
         // trace pre-install
-        if (arg_trace || arg_tracelog || mask_x11_abstract_socket)
+        if (arg_trace || arg_tracelog)
                 fs_trace_preload();
 
         // store hosts file
@@ -622,7 +622,7 @@ int sandbox(void* sandbox_arg) {
                 //****************************
                 // trace pre-install, this time inside chroot
                 //****************************
-                if (arg_trace || arg_tracelog || mask_x11_abstract_socket)
+                if (arg_trace || arg_tracelog)
                         fs_trace_preload();
         }
         else 
@@ -685,7 +685,7 @@ int sandbox(void* sandbox_arg) {
                 else {
                         fs_private_dir_list("/etc", RUN_ETC_DIR, cfg.etc_private_keep);
                         // create /etc/ld.so.preload file again
-                        if (arg_trace || arg_tracelog || mask_x11_abstract_socket)
+                        if (arg_trace || arg_tracelog)
                                 fs_trace_preload();
                 }
         }
@@ -781,7 +781,7 @@ int sandbox(void* sandbox_arg) {
         //****************************
         // install trace
         //****************************
-        if (arg_trace || arg_tracelog || mask_x11_abstract_socket)
+        if (arg_trace || arg_tracelog)
                 fs_trace();
                 
         //****************************
diff --git a/src/libconnect/Makefile.in b/src/libconnect/Makefile.in
deleted file mode 100644
index 5b7a8d0f1..000000000
--- a/src/libconnect/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-PREFIX=@prefix@
-VERSION=@PACKAGE_VERSION@
-NAME=@PACKAGE_NAME@
-HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
-
-H_FILE_LIST       = $(sort $(wildcard *.[h]))
-C_FILE_LIST       = $(sort $(wildcard *.c))
-OBJS = $(C_FILE_LIST:.c=.o)
-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: libconnect.so
-
-%.o : %.c $(H_FILE_LIST)
-        $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
-
-libconnect.so: $(OBJS)
-        $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl
-
-
-clean:; rm -f $(OBJS) libconnect.so
-
-distclean: clean
-        rm -fr Makefile
diff --git a/src/libconnect/libconnect.c b/src/libconnect/libconnect.c
deleted file mode 100644
index d79dcc4cb..000000000
--- a/src/libconnect/libconnect.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2014-2017 Firejail Authors
- *
- * This file is part of firejail project
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dlfcn.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/un.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <errno.h>
-
-//#define DEBUG
-
-//static int check_sockaddr(int sockfd, const char *call, const struct sockaddr *addr, int rv) {
-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' && strstr(a->sun_path + 1, "X11-unix")) {
-//                      printf("@%s\n", a->sun_path + 1);
-                        errno = ENOENT;
-                        return -1;
-                }
-        }
-        
-        return 0;
-}
-
-//
-// syscalls
-//
-
-// connect
-typedef int (*orig_connect_t)(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
-static orig_connect_t orig_connect = NULL;
-int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {
-        if (!orig_connect)
-                orig_connect = (orig_connect_t)dlsym(RTLD_NEXT, "connect");
-                        
-        if (check_sockaddr(addr) == -1)
-                return -1;
-                
-        return orig_connect(sockfd, addr, addrlen);
-}