Created
January 12, 2016 17:59
-
-
Save KLuka/bcf34a28a53c7c00157a to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/shellinabox/launcher.c b/shellinabox/launcher.c | |
index 2bac171..7a7f5b0 100644 | |
--- a/shellinabox/launcher.c | |
+++ b/shellinabox/launcher.c | |
@@ -557,6 +557,7 @@ int launchChild(int service, struct Session *session, const char *url) { | |
return -1; | |
} | |
check(bytes == sizeof(pid)); | |
+ debug("line: %04d, pid: %d ", __LINE__, pid); | |
check(session->pid = pid); | |
struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg); | |
check(cmsg); | |
@@ -1823,6 +1824,7 @@ static void launcherDaemon(int fd) { | |
addToHashMap(childProcesses, utmp->pid, (char *)utmp); | |
debug("[server] Child %d launched", pid); | |
} else { | |
+ error("[server] Call to forkPty() failed! | pid: %d", pid); | |
int fds[2]; | |
if (!pipe(fds)) { | |
NOINTR(write(fds[1], "forkpty() failed\r\n", 18)); | |
@@ -1832,6 +1834,7 @@ static void launcherDaemon(int fd) { | |
} | |
} | |
+ debug("line: %04d, pid: %d", __LINE__, pid); | |
// Send file handle and process id back to parent | |
char cmsg_buf[CMSG_SPACE(sizeof(int))]; // = { 0 }; // Valid initializer makes OSX mad. | |
memset (cmsg_buf, 0, sizeof (cmsg_buf)); // Quiet complaint from valgrind |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment