libpam-x2go.git - build-main (branch) updated: 0b41e3977e41d07997f008a8344f9ab70e4d213d - x2go-commits

27 Apr 2013

The branch, build-main has been updated
  discards  733fde7fe2415f983ed8f2045dffda16d30d1c14 (commit)
  discards  8a85c086263fda4baea7128592fefedb61f83aee (commit)
  discards  1708318511cf61c58913e8f14a8fb56ff1510bdd (commit)
  discards  d4ba1e134fcce95f8b7983fa9fba6d9d18f8f68b (commit)
  discards  4262a0309076b1db2eb15adfbc04b62126e39cf1 (commit)
  discards  6b495327f20269cc353ec20d424ecd0d68e58541 (commit)
       via  0b41e3977e41d07997f008a8344f9ab70e4d213d (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (733fde7fe2415f983ed8f2045dffda16d30d1c14)
            \
             N -- N -- N (0b41e3977e41d07997f008a8344f9ab70e4d213d)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 src/freerdp-auth-check.c |    9 ---------
 src/pam-freerdp.c        |   29 ++++++++++-------------------
 2 files changed, 10 insertions(+), 28 deletions(-)

The diff of changes is:

diff --git a/src/freerdp-auth-check.c b/src/freerdp-auth-check.c
index d50833b..83bab2f 100644
--- a/src/freerdp-auth-check.c
+++ b/src/freerdp-auth-check.c
@@ -79,15 +79,6 @@ main (int argc, char * argv[])
 	instance->settings->password = password;
 	instance->settings->ignore_certificate = true;
 
-	char * colonloc = strstr(argv[1], ":");
-	if (colonloc != NULL) {
-		/* We've got a port to deal with */
-		colonloc[0] = '\0';
-		colonloc++;
-
-		instance->settings->port = strtoul(colonloc, NULL, 10);
-	}
-
 	if (freerdp_connect(instance)) {
 		freerdp_disconnect(instance);
 		return 0;
diff --git a/src/pam-freerdp.c b/src/pam-freerdp.c
index d1a6578..89161af 100644
--- a/src/pam-freerdp.c
+++ b/src/pam-freerdp.c
@@ -86,23 +86,6 @@ get_item (pam_handle_t * pamh, int type)
 
 	char * retval = responses->resp;
 	free(responses);
-
-	if (type == PAM_RHOST) {
-		char * subloc = strstr(retval, "://");
-		if (subloc != NULL) {
-			char * original = retval;
-			char * newish = subloc + strlen("://");
-			char * endslash = strstr(newish, "/");
-
-			if (endslash != NULL) {
-				endslash[0] = '\0';
-			}
-
-			retval = strdup(newish);
-			free(original);
-		}
-	}
-
 	return retval;
 }
 
@@ -337,12 +320,20 @@ pam_sm_close_session (pam_handle_t *pamh, int flags, int argc, const char **argv
 	return PAM_IGNORE;
 }
 
+/* LightDM likes to have this function around, but we don't need it as we
+   don't have a token hanging around. */
+PAM_EXTERN int
+pam_sm_setcred (pam_handle_t *pamh, int flags, int argc, const char ** argv)
+{
+	return PAM_SUCCESS;
+}
+
 #ifdef PAM_STATIC
 
 struct pam_module _pam_freerdp_modstruct = {
-     "pam-freerdp",
+     "pam_freerdp",
      pam_sm_authenticate,
-     NULL,
+     pam_sm_setcred,
      NULL,
      pam_sm_open_session,
      pam_sm_close_session,


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)).

    