2 files changed, 24 insertions, 2 deletions

diff --git a/README b/README
index ab5577382..58690663b 100644
--- a/README
+++ b/README
@@ -125,6 +125,7 @@ Zack Weinberg (https://github.com/zackw)
         - rework X11 xorg processing
         - rework fcopy, --follow-link support in fcopy
         - follow link support in --private-bin
+        - wait_for_other function rewrite
 Austin S. Hemmelgarn (https://github.com/Ferroin)
         - unbound profile update
 Igor Bukanov (https://github.com/ibukanov)
diff --git a/src/firejail/util.c b/src/firejail/util.c
index fbb0a1e87..9b9308670 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -605,16 +605,37 @@ void wait_for_other(int fd) {
                 *ptr = '\0';
         }
         else {
-                fprintf(stderr, "Error: cannot establish communication with the parent, exiting...\n");
+                fprintf(stderr, "Error: proc %d cannot sync with peer: %s\n",
+                        getpid(), ferror(stream) ? strerror(errno) : "unexpected EOF");
+
+                int status = 0;
+                pid_t pid = wait(&status);
+                if (pid != -1) {
+                        if (WIFEXITED(status))
+                                fprintf(stderr, "Peer %d unexpectedly exited with status %d\n",
+                                        pid, WEXITSTATUS(status));
+                        else if (WIFSIGNALED(status))
+                                fprintf(stderr, "Peer %d unexpectedly killed (%s)\n",
+                                        pid, strsignal(WTERMSIG(status)));
+                        else
+                                fprintf(stderr, "Peer %d unexpectedly exited "
+                                        "(un-decodable wait status %04x)\n", pid, status);
+                }
                 exit(1);
         }
+
         if (strcmp(childstr, "arg_noroot=0") == 0)
                 arg_noroot = 0;
+        else if (strcmp(childstr, "arg_noroot=1") == 0)
+                arg_noroot = 1;
+        else {
+                fprintf(stderr, "Error: unexpected message from peer: %s\n", childstr);
+                exit(1);
+        }
 
         fclose(stream);
 }
 
-
 void notify_other(int fd) {
         FILE* stream;
         int newfd = dup(fd);