From bef4f6dde77e7c472e0e96e92f53c7d6bc677536 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 9 Nov 2012 14:53:12 +0100 Subject: drop pam-x2go.h again, fix linking against libssh --- src/Makefile.am | 21 ++------------------- src/pam-x2go.h | 42 ------------------------------------------ 2 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 src/pam-x2go.h diff --git a/src/Makefile.am b/src/Makefile.am index 960f349..f5f3379 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,32 +15,15 @@ pam_x2go_la_CFLAGS = \ -DAUTH_CHECK="\"$(pkglibexecdir)/x2go-auth-check\"" \ $(COVERAGE_CFLAGS) -pam_x2go_la_LIBADD = \ - $(builddir)/libssh.a - -noinst_LTLIBRARIES = \ - libssh.a - -libx2gocore_la_SOURCES = \ - pam-x2go.c \ - pam-x2go-children.c -libx2gocore_la_CFLAGS = \ - -Wall -Werror \ - $(COVERAGE_CFLAGS) -libx2gocore_la_LIBADD = \ - -lpam -libx2gocore_la_LDFLAGS = \ - $(COVERAGE_LDFLAGS) - pkglibexec_PROGRAMS = \ x2go-auth-check x2go_auth_check_SOURCES = \ x2go-auth-check.c x2go_auth_check_CFLAGS = \ - $(x2go_CFLAGS) \ + $(LIBSSH_CFLAGS) \ $(COVERAGE_CFLAGS) x2go_auth_check_LDADD = \ - $(x2go_LIBS) + $(LIBSSH_LIBS) x2go_auth_check_LDFLAGS = \ $(COVERAGE_LDFLAGS) diff --git a/src/pam-x2go.h b/src/pam-x2go.h deleted file mode 100644 index e471bf7..0000000 --- a/src/pam-x2go.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright © 2012 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Author: Ted Gould - */ - -#ifndef _PAM_X2GO_H_ -#define _PAM_X2GO_H_ - -static int unpriveleged_kill (struct passwd * pwdent); -static char * global_domain = NULL; -static char * global_password = NULL; -static char * -get_item (pam_handle_t * pamh, int type); - -PAM_EXTERN int -pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc, const char **argv); - -pid_t session_pid = 0; - -PAM_EXTERN int -pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, const char ** argv); - -PAM_EXTERN int -pam_sm_close_session (pam_handle_t *pamh, int flags, int argc, const char **argv); - -PAM_EXTERN int -pam_sm_setcred (pam_handle_t *pamh, int flags, int argc, const char ** argv); - -#endif -- cgit v1.2.3