diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | elf/ldconfig.c | 6 |
3 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2012-05-09 Andreas Jaeger <aj@suse.de> + + [BZ #13983] + * elf/ldconfig.c (parse_conf): Change string to make clear that + ldconfig only issued a warning if ld.so.conf does not exist. + 2012-05-08 David S. Miller <davem@davemloft.net> * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_floor-vis3.S: Use @@ -23,8 +23,8 @@ Version 2.16 13854, 13871, 13872, 13873, 13879, 13883, 13884, 13885, 13886, 13892, 13895, 13908, 13910, 13911, 13912, 13913, 13914, 13915, 13916, 13917, 13918, 13919, 13920, 13921, 13922, 13923, 13924, 13926, 13927, 13928, - 13938, 13941, 13942, 13963, 13967, 13970, 13973, 13979, 14027, 14033, - 14034, 14040, 14049, 14055, 14064 + 13938, 13941, 13942, 13963, 13967, 13970, 13973, 13979, 13983, 14027, + 14033, 14034, 14040, 14049, 14055, 14064 * ISO C11 support: diff --git a/elf/ldconfig.c b/elf/ldconfig.c index aa97213cc2..8d6e77f8ec 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999-2011, 2012 Free Software Foundation, Inc. +/* Copyright (C) 1999-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger <aj@suse.de>, 1999. @@ -1061,7 +1061,9 @@ parse_conf (const char *filename, bool do_chroot) if (file == NULL) { - error (0, errno, _("Can't open configuration file %s"), canon); + error (0, errno, _("\ +Warning: ignoring configuration file that cannot be opened: %s"), + canon); if (canon != filename) free ((char *) canon); return; |