From: Emilio Pozuelo Monfort <pochu27@gmail.com>
Date: Mon, 26 Apr 2010 16:59:30 +0000 (-0700)
Subject: Hurd: Fix file_name_lookup_at error case return value.
X-Git-Tag: fedora/glibc-2.11.1-7~1^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49c6fd1ff2a550ad407054a2821d654c41e22679;p=thirdparty%2Fglibc.git

Hurd: Fix file_name_lookup_at error case return value.

(cherry picked from commit 67481400c51229de3efa2eb3dddc8429b6f9e9f4)
---

diff --git a/ChangeLog b/ChangeLog
index c26934ae3b1..33f2cb00a96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-24  Emilio Pozuelo Monfort  <pochu27@gmail.com>
+
+	* hurd/lookup-at.c (__file_name_lookup_at): Fix error return value.
+
 2010-04-14  Andreas Schwab  <schwab@redhat.com>
 
 	* elf/dl-version.c (_dl_check_map_versions): Avoid index overflow
diff --git a/hurd/lookup-at.c b/hurd/lookup-at.c
index a2d50cb192e..7f55527d8be 100644
--- a/hurd/lookup-at.c
+++ b/hurd/lookup-at.c
@@ -1,5 +1,5 @@
 /* Lookup helper function for Hurd implementation of *at functions.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006,2010 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
@@ -33,7 +33,7 @@ __file_name_lookup_at (int fd, int at_flags,
   flags |= (at_flags & AT_SYMLINK_NOFOLLOW) ? O_NOLINK : 0;
   at_flags &= ~AT_SYMLINK_NOFOLLOW;
   if (at_flags != 0)
-    return __hurd_fail (EINVAL);
+    return (__hurd_fail (EINVAL), MACH_PORT_NULL);
 
   if (fd == AT_FDCWD || file_name[0] == '/')
     return __file_name_lookup (file_name, flags, mode);