aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIain Lane <iain@orangesquash.org.uk>2014-11-10 17:22:40 +0000
committerIain Lane <iain@orangesquash.org.uk>2014-11-10 17:22:40 +0000
commit571ddf18297e21271a4290f2d64d8377ced60f3c (patch)
tree483d614b4447c61a750e767453222081bea6b58f
parent6affa2cfed1e26ca4b2570d0a7e3a97a1f872766 (diff)
downloadlibpam-freerdp2-571ddf18297e21271a4290f2d64d8377ced60f3c.tar.gz
libpam-freerdp2-571ddf18297e21271a4290f2d64d8377ced60f3c.tar.bz2
libpam-freerdp2-571ddf18297e21271a4290f2d64d8377ced60f3c.zip
Port to new freerdp API
-rw-r--r--debian/control2
-rw-r--r--src/freerdp-auth-check.c24
2 files changed, 13 insertions, 13 deletions
diff --git a/debian/control b/debian/control
index 46a7f47..67c9908 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Build-Depends: debhelper (>= 9),
dh-autoreconf,
gnome-common,
- libfreerdp-dev,
+ libfreerdp-dev (>= 1.1.0~),
libgtest-dev,
libpam0g-dev,
pkg-config,
diff --git a/src/freerdp-auth-check.c b/src/freerdp-auth-check.c
index e5e9d13..30b4637 100644
--- a/src/freerdp-auth-check.c
+++ b/src/freerdp-auth-check.c
@@ -20,11 +20,11 @@
#include <freerdp/channels/channels.h>
#include <string.h>
-void
+int
auth_context_new (freerdp * instance, rdpContext * context)
{
context->channels = freerdp_channels_new();
- return;
+ return 0;
}
void
@@ -33,18 +33,18 @@ auth_context_free (freerdp * instance, rdpContext * context)
return;
}
-boolean
+BOOL
auth_pre_connect (freerdp * instance)
{
freerdp_channels_pre_connect(instance->context->channels, instance);
- return true;
+ return TRUE;
}
-boolean
+BOOL
auth_post_connect (freerdp * instance)
{
freerdp_channels_post_connect(instance->context->channels, instance);
- return true;
+ return TRUE;
}
int
@@ -71,16 +71,16 @@ main (int argc, char * argv[])
instance->PreConnect = auth_pre_connect;
instance->PostConnect = auth_post_connect;
- instance->context_size = sizeof(rdpContext);
+ instance->ContextSize = sizeof(rdpContext);
instance->ContextNew = auth_context_new;
instance->ContextFree = auth_context_free;
freerdp_context_new(instance);
- instance->settings->hostname = argv[1];
- instance->settings->username = argv[2];
- instance->settings->domain = argv[3];
- instance->settings->password = password;
+ instance->settings->ServerHostname = argv[1];
+ instance->settings->Username = argv[2];
+ instance->settings->Domain = argv[3];
+ instance->settings->Password = password;
char * colonloc = strstr(argv[1], ":");
if (colonloc != NULL) {
@@ -88,7 +88,7 @@ main (int argc, char * argv[])
colonloc[0] = '\0';
colonloc++;
- instance->settings->port = strtoul(colonloc, NULL, 10);
+ instance->settings->ServerPort = strtoul(colonloc, NULL, 10);
}
int retval = -1;