Merge branch 'master' of /cu

2 files changed, 20 insertions, 1 deletions

diff --git a/.vg-suppressions b/.vg-suppressions
index a6cb2fec0..88be9c9db 100644
--- a/.vg-suppressions
+++ b/.vg-suppressions
@@ -1,6 +1,6 @@
 # Suppress valgrind diagnostics we don't care about.
 
-# Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2006-2007 Free Software Foundation, Inc.
 
 # 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
@@ -77,3 +77,18 @@
    fun:strlen
    fun:fillin_rpath
 }
+{
+   libc-getpwuid-leak
+   Memcheck:Leak
+   fun:malloc
+   fun:nss_parse_service_list
+   fun:__nss_database_lookup
+   obj:*
+   obj:*
+   fun:getpwuid_r@@GLIBC_2.2.5
+   fun:getpwuid
+   fun:getuser
+   fun:format_user_width
+   fun:gobble_file
+   fun:main
+}
diff --git a/ChangeLog b/ChangeLog
index 25ed1e7d8..1396ed803 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-29  Jim Meyering  <jim@meyering.net>
+
+	* .vg-suppressions: Add libc-getpwuid-leak.
+
 2007-03-28  Jim Meyering  <jim@meyering.net>
 
 	Help translators include translation team's web or email address.