PAM FreeRDP Module

Merge lp:~laney/libpam-freerdp/port into lp:libpam-freerdp

  1. port
  2. Merge into trunk
Proposed by Iain Lane
Status: Merged
Merged at revision: 44
Proposed branch: lp:~laney/libpam-freerdp/port
Merge into: lp:libpam-freerdp
Diff against target: 84 lines (+13/-13)
2 files modified
debian/control (+1/-1)
src/freerdp-auth-check.c (+12/-12)
To merge this branch: bzr merge lp:~laney/libpam-freerdp/port
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Ted Gould (community) Approve
FreeRDP Remote Team Pending
Review via email: mp+241309@code.launchpad.net

Commit message

Port to new freerdp API

Description of the change

To upload new remmina, we need to get a newer freerdp. This is a reverse dependency, so I did a little port. You can get new freerdp from ppa:laney/vte2.91, if you want to test.

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

Quick review appreciated, if you don't mind

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/libpam-freerdp-ci/18/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libpam-freerdp-vivid-amd64-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp-ci/18/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:44
http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp2-ci/7/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp2-ci/./build=pbuilder,distribution=precise,flavor=amd64/7/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp2-ci/./build=pbuilder,distribution=precise,flavor=i386/7/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp2-ci/./build=pbuilder,distribution=raring,flavor=amd64/7/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp2-ci/./build=pbuilder,distribution=raring,flavor=i386/7/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp2-ci/./build=pbuilder,distribution=saucy,flavor=amd64/7/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp2-ci/./build=pbuilder,distribution=saucy,flavor=i386/7/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp2-ci/7/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp2-autolanding/9/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp2-autolanding/./build=pbuilder,distribution=precise,flavor=amd64/9/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp2-autolanding/./build=pbuilder,distribution=precise,flavor=i386/9/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp2-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/9/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp2-autolanding/./build=pbuilder,distribution=raring,flavor=i386/9/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp2-autolanding/./build=pbuilder,distribution=saucy,flavor=amd64/9/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/libpam-freerdp2-autolanding/./build=pbuilder,distribution=saucy,flavor=i386/9/console

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-06-26 18:18:21 +0000
3+++ debian/control 2014-11-10 17:29:21 +0000
4@@ -5,7 +5,7 @@
5 Build-Depends: debhelper (>= 9),
6 dh-autoreconf,
7 gnome-common,
8- libfreerdp-dev,
9+ libfreerdp-dev (>= 1.1.0~),
10 libgtest-dev,
11 libpam0g-dev,
12 pkg-config,
13
14=== modified file 'src/freerdp-auth-check.c'
15--- src/freerdp-auth-check.c 2012-08-30 17:02:34 +0000
16+++ src/freerdp-auth-check.c 2014-11-10 17:29:21 +0000
17@@ -20,11 +20,11 @@
18 #include <freerdp/channels/channels.h>
19 #include <string.h>
20
21-void
22+int
23 auth_context_new (freerdp * instance, rdpContext * context)
24 {
25 context->channels = freerdp_channels_new();
26- return;
27+ return 0;
28 }
29
30 void
31@@ -33,18 +33,18 @@
32 return;
33 }
34
35-boolean
36+BOOL
37 auth_pre_connect (freerdp * instance)
38 {
39 freerdp_channels_pre_connect(instance->context->channels, instance);
40- return true;
41+ return TRUE;
42 }
43
44-boolean
45+BOOL
46 auth_post_connect (freerdp * instance)
47 {
48 freerdp_channels_post_connect(instance->context->channels, instance);
49- return true;
50+ return TRUE;
51 }
52
53 int
54@@ -71,16 +71,16 @@
55 instance->PreConnect = auth_pre_connect;
56 instance->PostConnect = auth_post_connect;
57
58- instance->context_size = sizeof(rdpContext);
59+ instance->ContextSize = sizeof(rdpContext);
60 instance->ContextNew = auth_context_new;
61 instance->ContextFree = auth_context_free;
62
63 freerdp_context_new(instance);
64
65- instance->settings->hostname = argv[1];
66- instance->settings->username = argv[2];
67- instance->settings->domain = argv[3];
68- instance->settings->password = password;
69+ instance->settings->ServerHostname = argv[1];
70+ instance->settings->Username = argv[2];
71+ instance->settings->Domain = argv[3];
72+ instance->settings->Password = password;
73
74 char * colonloc = strstr(argv[1], ":");
75 if (colonloc != NULL) {
76@@ -88,7 +88,7 @@
77 colonloc[0] = '\0';
78 colonloc++;
79
80- instance->settings->port = strtoul(colonloc, NULL, 10);
81+ instance->settings->ServerPort = strtoul(colonloc, NULL, 10);
82 }
83
84 int retval = -1;

Subscribers

People subscribed via source and target branches

to all changes: