diff options
| author | Ted Gould <ted@gould.cx> | 2012-09-20 08:39:53 +0000 |
|---|---|---|
| committer | Tarmac <> | 2012-09-20 08:39:53 +0000 |
| commit | 6af8fab5b1df788bc57e5d174fc090824c9c0065 (patch) | |
| tree | 877c48d3bef1123accafba2caa953d73bc2002c5 /src | |
| parent | 84fb97ec2326559940bafd6f7a7b1370fb679d86 (diff) | |
| parent | 74540195ac67a579ba0f8a2479cfcadb6bee6cc8 (diff) | |
| download | libpam-x2go-6af8fab5b1df788bc57e5d174fc090824c9c0065.tar.gz libpam-x2go-6af8fab5b1df788bc57e5d174fc090824c9c0065.tar.bz2 libpam-x2go-6af8fab5b1df788bc57e5d174fc090824c9c0065.zip | |
Adding a testing framework. Approved by Albert Astals Cid, jenkins.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 29 | ||||
| -rw-r--r-- | src/auth-check-path.c | 3 | ||||
| -rw-r--r-- | src/auth-check-path.h | 1 | ||||
| -rw-r--r-- | src/pam-freerdp.c | 4 |
4 files changed, 29 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e5b04b2..0fafb8a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,19 +3,31 @@ pamlibdir = $(PAMMODULEDIR) pamlib_LTLIBRARIES = pam_freerdp.la pam_freerdp_la_SOURCES = \ - pam-freerdp.c + auth-check-path.c auth-check-path.h pam_freerdp_la_LDFLAGS = \ -no-undefined \ -module \ - -avoid-version - -pam_freerdp_la_LIBADD = \ - -lpam + -avoid-version \ + $(COVERAGE_LDFLAGS) pam_freerdp_la_CFLAGS = \ -Wall -Werror \ - -DAUTH_CHECK="\"$(pkglibexecdir)/freerdp-auth-check\"" + -DAUTH_CHECK="\"$(pkglibexecdir)/freerdp-auth-check\"" \ + $(COVERAGE_CFLAGS) + +noinst_LTLIBRARIES = \ + libfreerdpcore.la + +libfreerdpcore_la_SOURCES = \ + pam-freerdp.c +libfreerdpcore_la_CFLAGS = \ + -Wall -Werror \ + $(COVERAGE_CFLAGS) +libfreerdpcore_la_LIBADD = \ + -lpam +libfreerdpcore_la_LDFLAGS = \ + $(COVERAGE_LDFLAGS) pkglibexec_PROGRAMS = \ freerdp-auth-check @@ -23,6 +35,9 @@ pkglibexec_PROGRAMS = \ freerdp_auth_check_SOURCES = \ freerdp-auth-check.c freerdp_auth_check_CFLAGS = \ - $(FREERDP_CFLAGS) + $(FREERDP_CFLAGS) \ + $(COVERAGE_CFLAGS) freerdp_auth_check_LDADD = \ $(FREERDP_LIBS) +freerdp_auth_check_LDFLAGS = \ + $(COVERAGE_LDFLAGS) diff --git a/src/auth-check-path.c b/src/auth-check-path.c new file mode 100644 index 0000000..db311ea --- /dev/null +++ b/src/auth-check-path.c @@ -0,0 +1,3 @@ + +const char * auth_check_path = AUTH_CHECK; + diff --git a/src/auth-check-path.h b/src/auth-check-path.h new file mode 100644 index 0000000..82deca2 --- /dev/null +++ b/src/auth-check-path.h @@ -0,0 +1 @@ +extern const char * auth_check_path; diff --git a/src/pam-freerdp.c b/src/pam-freerdp.c index 607e215..fbfe182 100644 --- a/src/pam-freerdp.c +++ b/src/pam-freerdp.c @@ -34,6 +34,8 @@ #include <security/pam_modutil.h> #include <security/pam_appl.h> +#include "auth-check-path.h" + #define PAM_TYPE_DOMAIN 1234 #define ALL_GOOD_SIGNAL "Ar, ready to authenticate cap'n" @@ -238,7 +240,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc, const char **argv) char * args[5]; - args[0] = AUTH_CHECK; + args[0] = (char *)auth_check_path; args[1] = rhost; args[2] = ruser; args[3] = rdomain; |