moved libx11 to libconnect

onny · Oct 1, 2016 · 6d2eaf5 · 6d2eaf5
1 parent 27bffbf
commit 6d2eaf5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -1,6 +1,6 @@
 all: apps man
 MYLIBS = src/lib
-APPS = src/firejail src/firemon src/firecfg src/libtrace src/libtracelog src/ftee src/faudit src/libx11
+APPS = src/firejail src/firemon src/firecfg src/libtrace src/libtracelog src/ftee src/faudit src/libconnect
 MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5
 
 prefix=@prefix@
@@ -71,7 +71,7 @@ realinstall:
  install -m 0755 -d $(DESTDIR)/$(libdir)/firejail
  install -c -m 0644 src/libtrace/libtrace.so $(DESTDIR)/$(libdir)/firejail/.
  install -c -m 0644 src/libtracelog/libtracelog.so $(DESTDIR)/$(libdir)/firejail/.
- install -c -m 0644 src/libx11/libx11.so $(DESTDIR)/$(libdir)/firejail/.
+ install -c -m 0644 src/libconnect/libconnect.so $(DESTDIR)/$(libdir)/firejail/.
  install -c -m 0755 src/ftee/ftee $(DESTDIR)/$(libdir)/firejail/.
  install -c -m 0755 src/fshaper/fshaper.sh $(DESTDIR)/$(libdir)/firejail/.
  install -c -m 0644 src/firecfg/firecfg.config $(DESTDIR)/$(libdir)/firejail/.
@@ -121,7 +121,7 @@ install-strip: all
  strip src/firecfg/firecfg
  strip src/libtrace/libtrace.so
  strip src/libtracelog/libtracelog.so
- strip src/libx11/libx11.so
+ strip src/libconnect/libconnect.so
  strip src/ftee/ftee
  strip src/faudit/faudit
  $(MAKE) realinstall

diff --git a/configure b/configure
@@ -3759,7 +3759,7 @@ if test "$prefix" = /usr; then
  sysconfdir="/etc"
 fi
 
-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"
+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"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4477,7 +4477,7 @@ do
  "src/firecfg/Makefile") CONFIG_FILES="$CONFIG_FILES src/firecfg/Makefile" ;;
  "src/ftee/Makefile") CONFIG_FILES="$CONFIG_FILES src/ftee/Makefile" ;;
  "src/faudit/Makefile") CONFIG_FILES="$CONFIG_FILES src/faudit/Makefile" ;;
- "src/libx11/Makefile") CONFIG_FILES="$CONFIG_FILES src/libx11/Makefile" ;;
+ "src/libconnect/Makefile") CONFIG_FILES="$CONFIG_FILES src/libconnect/Makefile" ;;
 
  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  esac

diff --git a/configure.ac b/configure.ac
@@ -148,7 +148,7 @@ if test "$prefix" = /usr; then
  sysconfdir="/etc"
 fi
 
-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)
+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)
 
 echo
 echo "Configuration options:"

diff --git 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 → src/libconnect/Makefile.in b/src/libx11/Makefile.in → 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 → src/libconnect/libconnect.c b/src/libx11/libx11.c → 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;