diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-04-06 11:15:58 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-04-06 11:15:58 +0200 |
| commit | 32e5e786daa69be1f153f01cd428ac18634bb7bc (patch) | |
| tree | ea6947f2380e156ea6ba91f5fa17a67a46304947 /nscd | |
| parent | b44389edf1a88c6607a6c365bd8d884aee2edead (diff) | |
| parent | 2e7c805d5ec1f0d2f46354bca65b1feffa7af63b (diff) | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'nscd')
| -rw-r--r-- | nscd/nscd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nscd/nscd.c b/nscd/nscd.c index b9035f2131..7e70f2b116 100644 --- a/nscd/nscd.c +++ b/nscd/nscd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 1998-2008, 2009 Free Software Foundation, Inc. +/* Copyright (c) 1998-2008, 2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998. @@ -246,7 +246,7 @@ main (int argc, char **argv) openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON); if (write_pid (_PATH_NSCDPID) < 0) - dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno)); + dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno)); if (!init_logfile ()) dbg_log (_("Could not create log file")); @@ -430,7 +430,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2009"); +"), "2010"); fprintf (stream, gettext ("Written by %s.\n"), "Thorsten Kukuk and Ulrich Drepper"); } @@ -511,7 +511,7 @@ check_pid (const char *file) the PID is the same as the current process' since tha latter can mean we re-exec. */ if ((n != 1 || kill (pid, 0) == 0) && pid != getpid ()) - return 1; + return 1; } return 0; |