[X2go-Commits] libpam-x2go.git - master (branch) updated: 0.0.0.1-4-g85fbeeb

[X2Go dev team]

The branch, master has been updated
       via  85fbeeb70b606ab5261cebdefa6bede0b7e383ea (commit)
       via  0680e4196606a0e697613433d79f00af95c328f3 (commit)
      from  9edb1437e2a19dd966696c36518503a9e1c21e2f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 85fbeeb70b606ab5261cebdefa6bede0b7e383ea
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Nov 11 13:57:29 2012 +0100

    Revert "Send EOL+EOF at end of socket transmission."
    
    This reverts commit c4dbf5d89df4828137aeb5fc3bc8d9d0bf28a471.

commit 0680e4196606a0e697613433d79f00af95c328f3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Nov 11 13:56:48 2012 +0100

    Revert "replace EOL by \n"
    
    This reverts commit 9edb1437e2a19dd966696c36518503a9e1c21e2f.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog        |    7 -------
 src/pam-x2go-children.c |    5 ++---
 2 files changed, 2 insertions(+), 10 deletions(-)

The diff of changes is:
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 <mike.gabriel at das-netzwerkteam.de>  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 77be8a2..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\n%s", ruser, rhost, rsession, password, 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


hooks/post-receive
-- 
libpam-x2go.git (Remote login session via X2Go (PAM module))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libpam-x2go.git" (Remote login session via X2Go (PAM module)).