summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2006-12-17 11:19:43 +0000
committerArthur de Jong <arthur@arthurdejong.org>2006-12-17 11:19:43 +0000
commita04514305168230af9890c14a70320e25eb38bc7 (patch)
tree6f3d70a2de02b28c7fe49b5ed720d3ee0e1861e0
parent63f6084595b1c42f3c36af70c35738c7c329228f (diff)
remove trailing spaces
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/libnss_ldapd@172 ef36b2f9-881f-0410-afb5-c4e39611909c
-rw-r--r--configure.ac4
-rw-r--r--debian/changelog16
-rw-r--r--debian/libnss-ldapd.config4
-rw-r--r--debian/libnss-ldapd.nslcd.init6
-rw-r--r--debian/libnss-ldapd.postinst4
-rw-r--r--nss/common.h2
-rw-r--r--server/nslcd.c6
-rw-r--r--tests/test_networks.c2
8 files changed, 22 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac
index e488e9b..14a4564 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,7 +103,7 @@ if test -z "$with_ldap_lib"; then
with_ldap_lib=auto
fi
-AC_ARG_WITH(ldap-conf-file,
+AC_ARG_WITH(ldap-conf-file,
AS_HELP_STRING([--with-ldap-conf-file=PATH],
[path to LDAP configuration file @<:@/etc/ldap.conf@:>@]),
[ NSS_LDAP_PATH_CONF="$with_ldap_conf_file" ],
@@ -135,7 +135,7 @@ AC_ARG_WITH(nslcd-socket,
AC_DEFINE_UNQUOTED(NSLCD_SOCKET,"$NSLCD_SOCKET",[The location of the socket used for communicating.])
AC_SUBST(NSLCD_SOCKET)
-AC_ARG_WITH(gssapi-dir,
+AC_ARG_WITH(gssapi-dir,
AS_HELP_STRING([--with-gssapi-dir=PATH],
[base directory of gssapi SDK]))
diff --git a/debian/changelog b/debian/changelog
index 0daf76e..fdfd3ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,7 +77,7 @@ libnss-ldap (251-1) unstable; urgency=low
* Changed debconf 'host' question to 'uri', Closes: #312284, #359341
* Added additional commentary to the ldap.conf, Closes: #368191, #369192
* Enabled configurable krb5 CCNAME, Closes: #352032
- * Included Swedish, Vietnamese and Czech translations,
+ * Included Swedish, Vietnamese and Czech translations,
Closes: #317672, #312435, #340633
* Modified syslog() calls to use LOG_AUTHPRIV facility, Closes: #310421
* Removed build-depend on libdb4.2-dev, Closes: #302541
@@ -165,7 +165,7 @@ libnss-ldap (207-1) unstable; urgency=low
* Updated standards-version to 3.5.9, no changes.
* Make the build scripts use -fPIC for the whole process. (Closes: #185937)
* Removed LdapNS-howto, it's outdated (Closes: #179359)
- * Updated nsswitch.ldap to reflect the current state of libnss-ldap
+ * Updated nsswitch.ldap to reflect the current state of libnss-ldap
(Closes: #192208)
-- Sami Haahtinen <ressu@debian.org> Fri, 9 May 2003 13:35:31 +0300
@@ -180,7 +180,7 @@ libnss-ldap (204-3) unstable; urgency=low
libnss-ldap (204-2) unstable; urgency=low
- * Fixed the build problems, by adding automake1.6 to dependancies
+ * Fixed the build problems, by adding automake1.6 to dependancies
(Closes: #184692)
* Added debconf translations from ddtp
@@ -245,7 +245,7 @@ libnss-ldap (186-1) unstable; urgency=low
(Closes: #139959)
* enabled schema mapping (Closes: #131280)
* Made postinst change the permission back from 0600 if it wasn't wanted,
- interestin and ugly hack, but hey.. atleast it works.. =)
+ interestin and ugly hack, but hey.. atleast it works.. =)
(Closes: #130871)
-- Sami Haahtinen <ressu@debian.org> Thu, 4 Apr 2002 21:20:40 +0300
@@ -378,7 +378,7 @@ libnss-ldap (150-3) unstable; urgency=low
libnss-ldap (150-2) unstable; urgency=low
- * missed one db_input when i was checking for '|| true's fixed now.
+ * missed one db_input when i was checking for '|| true's fixed now.
(Closes: #94710)
-- Sami Haahtinen <ressu@debian.org> Sat, 21 Apr 2001 19:37:57 +0300
@@ -447,7 +447,7 @@ libnss-ldap (122-2) unstable; urgency=low
* Added "Suggests: debconf" and removed some debug stuff from postinst;
closes: #76363.
- * debian/postinst: now we must restart nscd if it's running.
+ * debian/postinst: now we must restart nscd if it's running.
-- Davide Puricelli (evo) <evo@debian.org> Sat, 11 Nov 2000 19:15:41 +0100
@@ -472,7 +472,7 @@ libnss-ldap (118-1) unstable; urgency=low
* This situation isn't reproducible by me or other people, probably
it's a local problem, so I'm closing it; if it occurs also with new
upstream version feel free to reopen the bug. closes: #72118.
- * Now ssh doesn't segfault, here we go! :)
+ * Now ssh doesn't segfault, here we go! :)
-- Davide Puricelli (evo) <evo@debian.org> Thu, 12 Oct 2000 17:33:27 +0200
@@ -492,7 +492,7 @@ libnss-ldap (116-1) unstable; urgency=low
libnss-ldap (115-1) unstable; urgency=low
- * New upstream version.
+ * New upstream version.
-- Davide Puricelli (evo) <evo@debian.org> Thu, 31 Aug 2000 17:06:59 +0200
diff --git a/debian/libnss-ldapd.config b/debian/libnss-ldapd.config
index 5118560..7073b3c 100644
--- a/debian/libnss-ldapd.config
+++ b/debian/libnss-ldapd.config
@@ -18,7 +18,7 @@ db_title "Configuring libnss-ldapd"
#
# check the system (non-LDAP configuration files) for some
-# reasonable defaults
+# reasonable defaults
parsesys()
{
# guess domain based on system information
@@ -34,7 +34,7 @@ parsesys()
fi
# guess ldap server
server=`getent hosts ldap`
- [ -z "$server" ] && server=`getent hosts dirhost`
+ [ -z "$server" ] && server=`getent hosts dirhost`
if [ -n "$domain" ] && [ -z "$server" ]
then
server=`getent hosts ldap."$domain"`
diff --git a/debian/libnss-ldapd.nslcd.init b/debian/libnss-ldapd.nslcd.init
index a84e55d..45a9ad3 100644
--- a/debian/libnss-ldapd.nslcd.init
+++ b/debian/libnss-ldapd.nslcd.init
@@ -23,7 +23,7 @@
# Provides: nslcd
# Required-Start: $local_fs $syslog
# Required-Stop: $local_fs $syslog
-# Should-Start: $remote_fs $network
+# Should-Start: $remote_fs $network
# Should-Stop: $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: S 0 1 6
@@ -47,7 +47,7 @@ NSLCD_PIDFILE=$NSLCD_STATEDIR/nslcd.pid
case "$1" in
start)
- [ -d "$NSLCD_STATEDIR" ] || mkdir "$NSLCD_STATEDIR"
+ [ -d "$NSLCD_STATEDIR" ] || mkdir "$NSLCD_STATEDIR"
log_daemon_msg "Starting $NSLCD_DESC" "nslcd"
start-stop-daemon --start \
--pidfile $NSLCD_PIDFILE \
@@ -63,7 +63,7 @@ stop)
[ -n "$PIDFILE" ] && rm -f $NSLCD_PIDFILE
;;
restart|force-reload)
- [ -d "$NSLCD_STATEDIR" ] || mkdir "$NSLCD_STATEDIR"
+ [ -d "$NSLCD_STATEDIR" ] || mkdir "$NSLCD_STATEDIR"
log_daemon_msg "Restarting $NSLCD_DESC" "nslcd"
start-stop-daemon --stop --quiet --retry 10 \
--pidfile $NSLCD_PIDFILE \
diff --git a/debian/libnss-ldapd.postinst b/debian/libnss-ldapd.postinst
index d4cfdf5..013aa4f 100644
--- a/debian/libnss-ldapd.postinst
+++ b/debian/libnss-ldapd.postinst
@@ -221,7 +221,7 @@ then
nss_enable $n
else
nss_disable $n
- fi
+ fi
done
# we're done
db_stop
@@ -236,7 +236,7 @@ fi
if [ -s /usr/sbin/nscd ]
then
if [ `pidof -s nscd` ]
- then
+ then
if which invoke-rc.d >/dev/null 2>&1
then
invoke-rc.d nscd restart
diff --git a/nss/common.h b/nss/common.h
index cf0c7e1..4643ef0 100644
--- a/nss/common.h
+++ b/nss/common.h
@@ -62,7 +62,7 @@ FILE *nslcd_client_open(void);
{ ERROR_OUT_READERROR(fp) }
/* Read the response code (the result code of the query) from
- the stream. */
+ the stream. */
#define READ_RESPONSE_CODE(fp) \
READ_TYPE(fp,tmpint32,int32_t); \
if (tmpint32!=NSLCD_RESULT_SUCCESS) \
diff --git a/server/nslcd.c b/server/nslcd.c
index 1dccf37..b5f3ac2 100644
--- a/server/nslcd.c
+++ b/server/nslcd.c
@@ -210,7 +210,7 @@ static RETSIGTYPE sigexit_handler(int signum)
/* cancel all running threads */
for (i=0;i<NUM_THREADS;i++)
pthread_cancel(nslcd_threads[i]);
-
+
}
@@ -624,7 +624,7 @@ int main(int argc,char *argv[])
/* TODO: install signal handlers for reloading configuration */
log_log(LOG_INFO,"accepting connections");
-
+
/* start worker threads */
for (i=0;i<NUM_THREADS;i++)
{
@@ -634,7 +634,7 @@ int main(int argc,char *argv[])
exit(1);
}
}
-
+
/* wait for all threads to die */
for (i=0;i<NUM_THREADS;i++)
{
diff --git a/tests/test_networks.c b/tests/test_networks.c
index 6cc41b2..0e1e9e5 100644
--- a/tests/test_networks.c
+++ b/tests/test_networks.c
@@ -81,7 +81,7 @@ int main(int argc,char *argv[])
printf("errno=%d:%s\n",(int)errnocp,strerror(errnocp));
printf("h_errno=%d:%s\n",(int)h_errnocp,hstrerror(h_errnocp));
}
-
+
/* test getnetbyaddr() */
printf("\nTEST getnetbyaddr()\n");
res=_nss_ldap_getnetbyaddr_r(inet_network("192.43.210.0"),AF_INET,&netresult,buffer,1024,&errnocp,&h_errnocp);