>From dd2863f562ae9c7118ecd7ad9c99f4fb0c4735f5 Mon Sep 17 00:00:00 2001 From: Pavel Reichl Date: Tue, 11 Aug 2015 04:54:50 -0400 Subject: [PATCH 1/2] Remove trailing whitespace --- README | 2 +- src/conf_macros.m4 | 4 ++-- src/external/glib.m4 | 4 ++-- src/external/pkg.m4 | 6 +++--- src/man/sssd.conf.5.xml | 8 ++++---- src/sss_client/ssh/sss_ssh_client.c | 6 +++--- src/tests/pyhbac-test.py | 1 - src/util/dlinklist.h | 8 ++++---- src/util/signal.c | 8 ++++---- 9 files changed, 23 insertions(+), 24 deletions(-) diff --git a/README b/README index ed08970cee4652626067b628b3a17f3370a73e56..189f66fe5b20c85728ac2640d734e3b490e23817 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ an NSS and PAM interface toward the system and a pluggable backend system to connect to multiple different account sources. - More information about SSSD can be found on its project page - + More information about SSSD can be found on its project page - Building and installation diff --git a/src/conf_macros.m4 b/src/conf_macros.m4 index c6ce00059094aa0359f6af9efefe7c7438c1e28f..cd731e605b153f69931d3cb0764f10801a596f96 100644 --- a/src/conf_macros.m4 +++ b/src/conf_macros.m4 @@ -596,11 +596,11 @@ AC_DEFUN([WITH_UNICODE_LIB], if test x"$with_unicode_lib" != x; then unicode_lib=$with_unicode_lib fi - + if test x"$unicode_lib" != x"libunistring" -a x"$unicode_lib" != x"glib2"; then AC_MSG_ERROR([Unsupported unicode library]) fi - + AM_CONDITIONAL([WITH_LIBUNISTRING], test x"$unicode_lib" = x"libunistring") AM_CONDITIONAL([WITH_GLIB], test x"$unicode_lib" = x"glib2") ]) diff --git a/src/external/glib.m4 b/src/external/glib.m4 index 8cec763263cd86d4ff1c45a7a3e2afe12954fe1c..3db25136b685bb6be05d1e9b648f032eaeaa1ec5 100644 --- a/src/external/glib.m4 +++ b/src/external/glib.m4 @@ -3,9 +3,9 @@ PKG_CHECK_MODULES([GLIB2],[glib-2.0]) if test x$has_glib2 != xno; then SAFE_LIBS="$LIBS" LIBS="$GLIB2_LIBS" - + AC_CHECK_FUNC([g_utf8_validate], AC_DEFINE([HAVE_G_UTF8_VALIDATE], [1], [Define if g_utf8_validate exists])) LIBS="$SAFE_LIBS" -fi \ No newline at end of file +fi diff --git a/src/external/pkg.m4 b/src/external/pkg.m4 index a8b3d06c8192229aab14cdc643a8be8f789376fd..568127f104de92fc81fa9b9ccf2fbd2d470840a1 100644 --- a/src/external/pkg.m4 +++ b/src/external/pkg.m4 @@ -1,5 +1,5 @@ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# +# # Copyright © 2004 Scott James Remnant . # # This program is free software; you can redistribute it and/or modify @@ -38,7 +38,7 @@ if test -n "$PKG_CONFIG"; then AC_MSG_RESULT([no]) PKG_CONFIG="" fi - + fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -119,7 +119,7 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` fi # Put the nasty error message in config.log where it belongs diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml index 3f57862c61be662f4c06caa2022d3b49460ee7e1..b858347f8f51cfb512a740fa0f31027d7b7ecebd 100644 --- a/src/man/sssd.conf.5.xml +++ b/src/man/sssd.conf.5.xml @@ -1304,7 +1304,7 @@ pam_account_expired_message = Account expired, please call help desk. - + entry_cache_user_timeout (integer) @@ -1317,7 +1317,7 @@ pam_account_expired_message = Account expired, please call help desk. - + entry_cache_group_timeout (integer) @@ -1330,7 +1330,7 @@ pam_account_expired_message = Account expired, please call help desk. - + entry_cache_netgroup_timeout (integer) @@ -1343,7 +1343,7 @@ pam_account_expired_message = Account expired, please call help desk. - + entry_cache_service_timeout (integer) diff --git a/src/sss_client/ssh/sss_ssh_client.c b/src/sss_client/ssh/sss_ssh_client.c index 245a0205685abfa553f6264942e97b3d556262bb..a24c5195da7a60d2fe2349e6826f2f70cfb9068a 100644 --- a/src/sss_client/ssh/sss_ssh_client.c +++ b/src/sss_client/ssh/sss_ssh_client.c @@ -69,7 +69,7 @@ int set_locale(void) } /* SSH public key request: - * + * * header: * 0..3: flags (unsigned int, must be combination of SSS_SSH_REQ_* flags) * 4..7: name length (unsigned int) @@ -80,9 +80,9 @@ int set_locale(void) * domain (ony included if flags & SSS_SSH_REQ_DOMAIN): * 0..3: domain length (unsigned int, 0 means default domain) * 4..X: domain (null-terminated UTF-8 string) - * + * * SSH public key reply: - * + * * header: * 0..3: number of results (unsigned int) * 4..7: reserved (unsigned int, must be 0) diff --git a/src/tests/pyhbac-test.py b/src/tests/pyhbac-test.py index 83958d7bffcccea375c79166ee7dfca6f9956cff..9d8fd1a333bf54ecf21d14d3b6293f7294a0d53e 100755 --- a/src/tests/pyhbac-test.py +++ b/src/tests/pyhbac-test.py @@ -137,7 +137,6 @@ class PyHbacRuleElementTest(unittest.TestCase): el.names = ['foo'] el.groups = ['bar, baz'] self.assertEquals(el.__repr__(), u'') - class PyHbacRuleTest(unittest.TestCase): def testRuleGetSetName(self): diff --git a/src/util/dlinklist.h b/src/util/dlinklist.h index 413084888b8dbdb9faef4b0011d030766b8a2965..ef09661f4be4d6e973173887f7790f214bf0f1dd 100644 --- a/src/util/dlinklist.h +++ b/src/util/dlinklist.h @@ -1,18 +1,18 @@ -/* +/* Unix SMB/CIFS implementation. some simple double linked list macros Copyright (C) Andrew Tridgell 1998 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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 . */ diff --git a/src/util/signal.c b/src/util/signal.c index bb8f8bef7681c0140671a3076a950a773f991b66..8acdccaeb11ee171050db3aec4095459d9574a2c 100644 --- a/src/util/signal.c +++ b/src/util/signal.c @@ -1,19 +1,19 @@ -/* +/* Unix SMB/CIFS implementation. signal handling functions Copyright (C) Andrew Tridgell 1998 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 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 . */ -- 2.5.0