Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / hurd / fchroot.c

diff --git a/hurd/fchroot.c b/hurd/fchroot.c
index d745fb08668ad8d221abe5eba4f5294c07341f66..9027919e3fe682e6e29bdbfcf39dfd4bb201be6c 100644 (file)
--- a/hurd/fchroot.c
+++ b/hurd/fchroot.c
@@ -1,25 +1,25 @@
-/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2016 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
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <unistd.h>
+
 #include <hurd.h>
 #include <hurd/fd.h>
-#include <fcntl.h>
+#include <hurd/port.h>
 
 /* Change the current root directory to FD.  */
 int
@@ -30,12 +30,20 @@ fchroot (int fd)
 
   err = HURD_DPORT_USE (fd,
                        ({
-                         dir = __file_name_lookup_under (port, "", O_EXEC, 0);
+                         dir = __file_name_lookup_under (port, ".", 0, 0);
                          dir == MACH_PORT_NULL ? errno : 0;
                        }));
 
   if (! err)
-    _hurd_port_set (&_hurd_ports[INIT_PORT_CRDIR], dir);
+    {
+      file_t root;
+
+      /* Prevent going through DIR's ..  */
+      err = __file_reparent (dir, MACH_PORT_NULL, &root);
+      __mach_port_deallocate (__mach_task_self (), dir);
+      if (! err)
+       _hurd_port_set (&_hurd_ports[INIT_PORT_CRDIR], root);
+    }
 
   return err ? __hurd_fail (err) : 0;
 }