diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-07 10:52:54 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-07 10:52:54 +0100 |
| commit | 7099005f38ff72fa5de5f245eb15077d8708efd6 (patch) | |
| tree | d36ed5a050e51e3a08214eefde036176a39b9b7e /src | |
| parent | ba427b6fd4b84e9f20c016c949f526dbe2893e94 (diff) | |
| download | libpam-freerdp2-7099005f38ff72fa5de5f245eb15077d8708efd6.tar.gz libpam-freerdp2-7099005f38ff72fa5de5f245eb15077d8708efd6.tar.bz2 libpam-freerdp2-7099005f38ff72fa5de5f245eb15077d8708efd6.zip | |
Continue development of libpam-freerdp under the name libpam-freerdp2 (with support of FreeRDPv2 API).
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 40 | ||||
| -rw-r--r-- | src/pam-freerdp-children.c | 2 | ||||
| -rw-r--r-- | src/pam-freerdp.c | 2 |
3 files changed, 22 insertions, 22 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ed9087c..ab46225 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,47 +1,47 @@ - pamlibdir = $(PAMMODULEDIR) -pamlib_LTLIBRARIES = pam_freerdp.la +pamlib_LTLIBRARIES = pam_freerdp2.la -pam_freerdp_la_SOURCES = \ +pam_freerdp2_la_SOURCES = \ auth-check-path.c auth-check-path.h -pam_freerdp_la_LDFLAGS = \ +pam_freerdp2_la_LDFLAGS = \ -no-undefined \ -module \ -avoid-version \ $(COVERAGE_LDFLAGS) -pam_freerdp_la_CFLAGS = \ +pam_freerdp2_la_CFLAGS = \ -Wall -Werror \ - -DAUTH_CHECK="\"$(pkglibexecdir)/freerdp-auth-check\"" \ + -DAUTH_CHECK="\"$(pkglibexecdir)/freerdp2-auth-check\"" \ $(COVERAGE_CFLAGS) -pam_freerdp_la_LIBADD = \ - $(builddir)/libfreerdpcore.la +pam_freerdp2_la_LIBADD = \ + $(builddir)/libfreerdp2core.la noinst_LTLIBRARIES = \ - libfreerdpcore.la + libfreerdp2core.la -libfreerdpcore_la_SOURCES = \ +libfreerdp2core_la_SOURCES = \ pam-freerdp.c \ pam-freerdp-children.c -libfreerdpcore_la_CFLAGS = \ +libfreerdp2core_la_CFLAGS = \ -Wall -Werror \ $(COVERAGE_CFLAGS) -libfreerdpcore_la_LIBADD = \ +libfreerdp2core_la_LIBADD = \ -lpam -libfreerdpcore_la_LDFLAGS = \ +libfreerdp2core_la_LDFLAGS = \ $(COVERAGE_LDFLAGS) pkglibexec_PROGRAMS = \ - freerdp-auth-check + freerdp2-auth-check -freerdp_auth_check_SOURCES = \ +freerdp2_auth_check_SOURCES = \ freerdp-auth-check.c -freerdp_auth_check_CFLAGS = \ - $(FREERDP_CFLAGS) \ +freerdp2_auth_check_CFLAGS = \ + $(FREERDP2_CFLAGS) \ $(COVERAGE_CFLAGS) -freerdp_auth_check_LDADD = \ - $(FREERDP_LIBS) -freerdp_auth_check_LDFLAGS = \ +freerdp2_auth_check_LDADD = \ + $(FREERDP2_LIBS) +freerdp2_auth_check_LDFLAGS = \ + $(FREERDP2_LDFLAGS) \ $(COVERAGE_LDFLAGS) diff --git a/src/pam-freerdp-children.c b/src/pam-freerdp-children.c index ea29c14..3adc068 100644 --- a/src/pam-freerdp-children.c +++ b/src/pam-freerdp-children.c @@ -172,7 +172,7 @@ session_socket_handler (struct passwd * pwdent, int readypipe, const char * ruse memset(&socket_addr, 0, sizeof(struct sockaddr_un)); socket_addr.sun_family = AF_UNIX; strncpy(socket_addr.sun_path, pwdent->pw_dir, sizeof(socket_addr.sun_path) - 1); - strncpy(socket_addr.sun_path + strlen(pwdent->pw_dir), "/.freerdp-socket", (sizeof(socket_addr.sun_path) - strlen(pwdent->pw_dir)) - 1); + strncpy(socket_addr.sun_path + strlen(pwdent->pw_dir), "/.freerdp2-socket", (sizeof(socket_addr.sun_path) - strlen(pwdent->pw_dir)) - 1); /* We bind the socket before forking so that we ensure that there isn't a race condition to get to it. Things will block diff --git a/src/pam-freerdp.c b/src/pam-freerdp.c index ff09ce4..d411f56 100644 --- a/src/pam-freerdp.c +++ b/src/pam-freerdp.c @@ -432,7 +432,7 @@ pam_sm_setcred (pam_handle_t *pamh, int flags, int argc, const char ** argv) #ifdef PAM_STATIC struct pam_module _pam_freerdp_modstruct = { - "pam_freerdp", + "pam_freerdp2", pam_sm_authenticate, pam_sm_setcred, NULL, |