aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.am.coverage10
-rw-r--r--debian/copyright2
-rw-r--r--m4/gcov.m44
-rw-r--r--src/pam-x2go.c6
-rw-r--r--tests/mock_guest.c2
-rw-r--r--tests/mock_pam.c2
-rw-r--r--tests/test-x2go-wrapper.cc12
8 files changed, 20 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c73248..fd8bb63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -528,7 +528,7 @@
* Neat little trick that I found in PAM Kerberos where it uses the
PAM handle's version of the value so that there doesn't
- have to be memory free'd in the returning function.
+ have to be memory free'd in the returning function.
Cleans some things up and removes a bunch of extra
allocation
diff --git a/Makefile.am.coverage b/Makefile.am.coverage
index fb97747..e134a61 100644
--- a/Makefile.am.coverage
+++ b/Makefile.am.coverage
@@ -16,16 +16,16 @@ clean-gcno:
clean-gcda:
@echo Removing old coverage results
-find -name '*.gcda' -print | xargs -r rm
-
+
coverage-html: clean-gcda
-$(MAKE) $(AM_MAKEFLAGS) -k check
$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
-
+
generate-coverage-html:
@echo Collecting coverage data
$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
-
+
clean-coverage-html: clean-gcda
-$(LCOV) --directory $(top_builddir) -z
-rm -rf coverage.info coveragereport
@@ -35,11 +35,11 @@ if HAVE_GCOVR
coverage-gcovr: clean-gcda
-$(MAKE) $(AM_MAKEFLAGS) -k check
$(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
-
+
generate-coverage-gcovr:
@echo Generating coverage GCOVR report
$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
-
+
clean-coverage-gcovr: clean-gcda
-rm -rf $(top_builddir)/coverage.xml
diff --git a/debian/copyright b/debian/copyright
index 25bbd63..da27ef9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,7 @@ Copyright:
License: GPL-3
Files: debian/*
-Copyright:
+Copyright:
2012-2013, Mike Gabriel (X2Go Project) <mike.gabriel@das-netzwerkteam.de>
License: GPL-3
diff --git a/m4/gcov.m4 b/m4/gcov.m4
index 3163584..d243eeb 100644
--- a/m4/gcov.m4
+++ b/m4/gcov.m4
@@ -3,7 +3,7 @@
# * lcov
# * genhtml
# * gcovr
-#
+#
# Sets ac_cv_check_gcov to yes if tooling is present
# and reports the executables to the variables LCOV, GCOVR and GENHTML.
AC_DEFUN([AC_TDD_GCOV],
@@ -71,7 +71,7 @@ AC_DEFUN([AC_TDD_GCOV],
# Add the special gcc flags
COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage"
- COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"
+ COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"
COVERAGE_LDFLAGS="-lgcov"
# Check availability of gcovr
diff --git a/src/pam-x2go.c b/src/pam-x2go.c
index 0d168f1..74ca68d 100644
--- a/src/pam-x2go.c
+++ b/src/pam-x2go.c
@@ -324,7 +324,7 @@ pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, const char ** argv
pid_t pid = fork();
if (pid == 0) {
-
+
int ret = session_socket_handler(pwdent, sessionready[1], ruser, rhost, rcommand, password);
close(sessionready[1]);
@@ -379,7 +379,7 @@ done:
return retval;
}
-/* Drop privs and try to kill the process with the PID of session_pid.
+/* Drop privs and try to kill the process with the PID of session_pid.
This ensures that we don't kill something important if there is PID wrap
around. */
static int
@@ -415,7 +415,7 @@ unpriveleged_kill (struct passwd * pwdent)
track that but there are a lot of reason that we could fail there and
it's not a bad thing. Really we're attempting a best effort to clean up
we won't be able to guarantee it. */
- _exit(EXIT_SUCCESS);
+ _exit(EXIT_SUCCESS);
} else if (pid < 0) {
retval = PAM_SYSTEM_ERR;
} else {
diff --git a/tests/mock_guest.c b/tests/mock_guest.c
index 6073f0f..316e851 100644
--- a/tests/mock_guest.c
+++ b/tests/mock_guest.c
@@ -85,7 +85,7 @@ socket_sucker ()
}
serv_addr.sun_family = AF_UNIX;
-
+
int printsize = snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".x2go-socket");
if (printsize > sizeof(serv_addr.sun_path) - 1 || printsize < 0) {
return -1;
diff --git a/tests/mock_pam.c b/tests/mock_pam.c
index 8b8e2f5..9111092 100644
--- a/tests/mock_pam.c
+++ b/tests/mock_pam.c
@@ -73,7 +73,7 @@ int PAM_NONNULL((1)) pam_get_item (const pam_handle_t *pamh, int type, const voi
*value = pamh->conv;
else if (pamh->item[type] != NULL)
*value = pamh->item[type];
- else
+ else
*value = NULL; /* will result in a prompt conversation */
return PAM_SUCCESS;
diff --git a/tests/test-x2go-wrapper.cc b/tests/test-x2go-wrapper.cc
index f514f0f..21b5e78 100644
--- a/tests/test-x2go-wrapper.cc
+++ b/tests/test-x2go-wrapper.cc
@@ -66,15 +66,15 @@ namespace {
pam_handle_t *pamh = pam_handle_new ();
- EXPECT_EQ (PAM_SUCCESS,
+ EXPECT_EQ (PAM_SUCCESS,
pam_sm_authenticate (pamh, 0, 0, argv));
- EXPECT_EQ (PAM_SUCCESS,
+ EXPECT_EQ (PAM_SUCCESS,
pam_sm_setcred (pamh, 0, 0, argv));
-
- EXPECT_EQ (PAM_SUCCESS,
+
+ EXPECT_EQ (PAM_SUCCESS,
pam_sm_open_session (pamh, 0, 0, argv));
- EXPECT_EQ(0, socket_sucker());
- EXPECT_EQ (PAM_SUCCESS,
+ EXPECT_EQ(0, socket_sucker());
+ EXPECT_EQ (PAM_SUCCESS,
pam_sm_close_session (pamh, 0, 0, argv));
}