From 85fbeeb70b606ab5261cebdefa6bede0b7e383ea Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 11 Nov 2012 13:57:29 +0100 Subject: Revert "Send EOL+EOF at end of socket transmission." This reverts commit c4dbf5d89df4828137aeb5fc3bc8d9d0bf28a471. --- debian/changelog | 7 ------- src/pam-x2go-children.c | 5 ++--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index ac7fbb6..6ce02af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -libpam-x2go (0.0.0.2-0~x2go1) UNRELEASED; urgency=low - - * New upstream version (0.0.0.2): - - Send EOL+EOF at end of socket transmission. - - -- Mike Gabriel Sun, 11 Nov 2012 13:27:51 +0100 - libpam-x2go (0.0.0.1-0~x2go1) unstable; urgency=low * Initial upstream release. Forked from libpam-freerdp (by Ted Gould diff --git a/src/pam-x2go-children.c b/src/pam-x2go-children.c index 67d3af1..e161ca3 100644 --- a/src/pam-x2go-children.c +++ b/src/pam-x2go-children.c @@ -65,7 +65,7 @@ pam_sm_authenticate_helper (int *stdinpipe, const char* username, const char* rh } if (setgid(pwdent->pw_gid) < 0 || setuid(pwdent->pw_uid) < 0 || - setegid(pwdent->pw_gid) < 0 || seteuid(pwdent->pw_uid) < 0) { + setegid(pwdent->pw_gid) < 0 || seteuid(pwdent->pw_uid) < 0) { _exit(EXIT_FAILURE); } @@ -138,7 +138,6 @@ session_socket_handler (struct passwd * pwdent, int readypipe, const char * ruse buffer_len += strlen(rhost) + 1; /* Add one for the space */ buffer_len += strlen(rsession) + 1; /* Add one for the space */ buffer_len += strlen(password) + 1; /* Add one for the NULL */ - buffer_len += 2 /* one for EOL, another for EOF */ if (buffer_len < 5) { /* Don't need to clean up yet */ @@ -158,7 +157,7 @@ session_socket_handler (struct passwd * pwdent, int readypipe, const char * ruse goto cleanup; } - buffer_fill = snprintf(buffer, buffer_len, "%s %s %s %s%s%s", ruser, rhost, rsession, password, EOL, EOF); + buffer_fill = snprintf(buffer, buffer_len, "%s %s %s %s", ruser, rhost, rsession, password); if (buffer_fill > buffer_len) { /* This really shouldn't happen, but if for some reason we have an difference between they way that the lengths are calculated we want -- cgit v1.2.3