From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 23 Nov 2004 21:18:36 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-glibc-20041124T0741~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=405521b51d89c9794d66f1d6cb7b2d3f02e9ae07;p=platform%2Fupstream%2Fglibc.git

Update.

2004-11-23  Jakub Jelinek  <jakub@redhat.com>

	* nss/nss_files/files-XXX.c (internal_getent): If parse_line returned
	-1, also do H_ERRNO_SET (NETDB_INTERNAL).
---

diff --git a/ChangeLog b/ChangeLog
index 9bbfb4f..6d55477 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* nss/nss_files/files-XXX.c (internal_getent): If parse_line returned
+	-1, also do H_ERRNO_SET (NETDB_INTERNAL).
+
 2004-11-22  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/i386/fpu_control.h: Add volatile to the asms.
diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c
index fd000bf..fb13fbe 100644
--- a/nss/nss_files/files-XXX.c
+++ b/nss/nss_files/files-XXX.c
@@ -1,5 +1,5 @@
 /* Common code for file-based databases in nss_files module.
-   Copyright (C) 1996,1997,1998,1999,2001,2002 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999,2001,2002,2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -213,8 +213,14 @@ internal_getent (struct STRUCTURE *result,
 	 || ! (parse_result = parse_line (p, result, data, buflen, errnop
 					  EXTRA_ARGS)));
 
+  if (__builtin_expect (parse_result == -1, 0))
+    {
+      H_ERRNO_SET (NETDB_INTERNAL);
+      return NSS_STATUS_TRYAGAIN;
+    }
+
   /* Filled in RESULT with the next entry from the database file.  */
-  return parse_result == -1 ? NSS_STATUS_TRYAGAIN : NSS_STATUS_SUCCESS;
+  return NSS_STATUS_SUCCESS;
 }