Update.

	* nscd/Makefile: Add rules to build nscd as a PIE.

2003-09-23  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/sys/alpha/sysmacros.h: Removed.
	* sysdeps/unix/sysv/linux/sys/sparc/sysmacros.h: Removed.
	* sysdeps/unix/sysv/linux/ustat.c (ustat): Adjust for 32-bit
	kernel dev_t.
	* sysdeps/unix/sysv/linux/alpha/ustat.c: Removed.
	* sysdeps/unix/sysv/linux/xmknod.c (__xmknod): Likewise.
	* sysdeps/unix/sysv/linux/alpha/xmknod.c: Removed.
	Code by Alexander Viro <aviro@redhat.com>.

8 files changed, 55 insertions, 159 deletions

diff --git a/ChangeLog b/ChangeLog
index b8e871cf9b..efab24eb34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,25 @@
 2003-09-23  Ulrich Drepper  <drepper@redhat.com>
 
+	* nscd/Makefile: Add rules to build nscd as a PIE.
+
+2003-09-23  Ulrich Drepper  <drepper@redhat.com>
+
 	* sysdeps/unix/sysv/linux/sys/sysmacros.h: Adjust for larger
 	kernel dev_t size.
+	* sysdeps/unix/sysv/linux/sys/alpha/sysmacros.h: Removed.
+	* sysdeps/unix/sysv/linux/sys/sparc/sysmacros.h: Removed.
 	* sysdeps/unix/sysv/linux/makedev.c: New file.
 	* sysdeps/unix/sysv/linux/Dist: Add makedev.c.
 	* sysdeps/unix/sysv/linux/Makefile [subdir=misc]
 	(sysdep_routines): Add makedev.
 	* sysdeps/unix/sysv/linux/Versions [libc] (GLIBC_2.3.3): Add
 	major, minor, makedev.
+	* sysdeps/unix/sysv/linux/ustat.c (ustat): Adjust for 32-bit
+	kernel dev_t.
+	* sysdeps/unix/sysv/linux/alpha/ustat.c: Removed.
+	* sysdeps/unix/sysv/linux/xmknod.c (__xmknod): Likewise.
+	* sysdeps/unix/sysv/linux/alpha/xmknod.c: Removed.
+	Code by Alexander Viro <aviro@redhat.com>.
 
 2003-09-23  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/nscd/Makefile b/nscd/Makefile
index 793109972a..19875fb5e6 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -34,7 +34,7 @@ nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
 
 ifeq ($(have-thread-library),yes)
 
-others := nscd nscd_nischeck
+others := nscd_nischeck
 install-sbin := nscd nscd_nischeck
 
 extra-objs := $(nscd-modules:=.o) nscd_nischeck.o
@@ -57,6 +57,37 @@ CFLAGS-nscd_getpw_r.c = -fexceptions
 CFLAGS-nscd_getgr_r.c = -fexceptions
 CFLAGS-nscd_gethst_r.c = -fexceptions
 
+ifeq (yesyes,$(have-fpie)$(build-shared))
+CFLAGS-nscd.c = -fpie
+CFLAGS-connections.c = -fpie
+CFLAGS-pwdcache.c = -fpie
+CFLAGS-getpwnam_r.c = -fpie
+CFLAGS-getpwuid_r.c = -fpie
+CFLAGS-grpcache.c = -fpie
+CFLAGS-getgrnam_r.c = -fpie
+CFLAGS-getgrgid_r.c = -fpie
+CFLAGS-hstcache.c = -fpie
+CFLAGS-gethstbyad_r.c = -fpie
+CFLAGS-gethstbynm2_r.c = -fpie
+CFLAGS-dbg_log.c = -fpie
+CFLAGS-nscd_conf.c = -fpie
+CFLAGS-nscd_stat.c = -fpie
+CFLAGS-cache.c = -fpie
+CFLAGS-xmalloc.c = -fpie
+CFLAGS-xstrdup.c = -fpie
+
+$(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o))
+	$(LINK.o) -pie -Wl,-O1 \
+	  $(sysdep-LDFLAGS) $(config-LDFLAGS) \
+	  $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \
+	  $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \
+	  $(LDFLAGS) $(LDFLAGS-$(@F)) \
+	  -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) \
+	  -o $@ $^ $(common-objpfx)libc_nonshared.a
+else
+others += nscd
+endif
+
 # This makes sure -DNOT_IN_libc is passed for all these modules.
 cpp-srcs-left := $(nscd-modules:=.c)
 lib := nonlib
diff --git a/sysdeps/unix/sysv/linux/alpha/sys/sysmacros.h b/sysdeps/unix/sysv/linux/alpha/sys/sysmacros.h
deleted file mode 100644
index 43ec376c04..0000000000
--- a/sysdeps/unix/sysv/linux/alpha/sys/sysmacros.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Definitions of macros to access `dev_t' values.
-   Copyright (C) 1996, 1997, 1999 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 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _SYS_SYSMACROS_H
-#define _SYS_SYSMACROS_H	1
-
-/* For compatibility we provide alternative names.  */
-#define major(dev) ((int)(((dev) >> 8) & 0xff))
-#define minor(dev) ((int)((dev) & 0xff))
-#define makedev(major, minor) ((((unsigned int) (major)) << 8) \
-			       | ((unsigned int) (minor)))
-
-#endif /* sys/sysmacros.h */
diff --git a/sysdeps/unix/sysv/linux/alpha/ustat.c b/sysdeps/unix/sysv/linux/alpha/ustat.c
deleted file mode 100644
index 4e3bf635a3..0000000000
--- a/sysdeps/unix/sysv/linux/alpha/ustat.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (C) 1997, 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <sys/ustat.h>
-#include <sys/sysmacros.h>
-#include <sysdep.h>
-
-int
-ustat (dev_t dev, struct ustat *ubuf)
-{
-  unsigned int k_dev;
-
-  /* We must convert the value to dev_t type used by the kernel.  */
-  k_dev = ((major (dev) & 0xff) << 8) | (minor (dev) & 0xff);
-
-  return INLINE_SYSCALL (ustat, 2, k_dev, ubuf);
-}
diff --git a/sysdeps/unix/sysv/linux/alpha/xmknod.c b/sysdeps/unix/sysv/linux/alpha/xmknod.c
deleted file mode 100644
index e74f4c0b8b..0000000000
--- a/sysdeps/unix/sysv/linux/alpha/xmknod.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* xmknod call using old-style Unix mknod system call.
-   Copyright (C) 1991,1993,1995,1996,1997,2002,2003
-   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 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/sysmacros.h>
-#include <sysdep.h>
-
-/* Create a device file named PATH, with permission and special bits MODE
-   and device number DEV (which can be constructed from major and minor
-   device numbers with the `makedev' macro above).  */
-int
-__xmknod (int vers, const char *path, mode_t mode, dev_t *dev)
-{
-  unsigned int k_dev;
-
-  if (vers != _MKNOD_VER)
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  /* We must convert the value to dev_t type used by the kernel.  */
-  k_dev = ((major (*dev) & 0xff) << 8) | (minor (*dev) & 0xff);
-
-  return INLINE_SYSCALL (mknod, 3, path, mode, k_dev);
-}
-
-weak_alias (__xmknod, _xmknod)
-libc_hidden_def (__xmknod)
diff --git a/sysdeps/unix/sysv/linux/sparc/sys/sysmacros.h b/sysdeps/unix/sysv/linux/sparc/sys/sysmacros.h
deleted file mode 100644
index 3a2c44d987..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/sys/sysmacros.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Definitions of macros to access `dev_t' values.
-   Copyright (C) 1996, 1997, 1999 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 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _SYS_SYSMACROS_H
-#define _SYS_SYSMACROS_H	1
-
-#include <bits/wordsize.h>
-
-/* For compatibility we provide alternative names.
-
-   The problem here is that compilers other than GCC probably don't
-   have the `long long' type and so `dev_t' is actually an array.  */
-#if __WORDSIZE == 64 || (defined __GNUC__ && __GNUC__ >= 2)
-# define major(dev) ((int)(((dev) >> 8) & 0xff))
-# define minor(dev) ((int)((dev) & 0xff))
-# define makedev(major, minor) ((((unsigned int) (major)) << 8) \
-				| ((unsigned int) (minor)))
-#else
-# define major(dev) (((dev).__val[1] >> 8) & 0xff)
-# define minor(dev) ((dev).__val[1] & 0xff)
-# define makedev(major, minor) { 0, ((((unsigned int) (major)) << 8) \
-				     | ((unsigned int) (minor))) }
-#endif
-
-#endif /* sys/sysmacros.h */
diff --git a/sysdeps/unix/sysv/linux/ustat.c b/sysdeps/unix/sysv/linux/ustat.c
index 5ffd76511f..e1acbed5b5 100644
--- a/sysdeps/unix/sysv/linux/ustat.c
+++ b/sysdeps/unix/sysv/linux/ustat.c
@@ -28,10 +28,12 @@
 int
 ustat (dev_t dev, struct ustat *ubuf)
 {
-  unsigned short int k_dev;
+  unsigned long long int k_dev;
 
   /* We must convert the value to dev_t type used by the kernel.  */
-  k_dev = ((major (dev) & 0xff) << 8) | (minor (dev) & 0xff);
+  k_dev =  dev & ((1ULL << 32) - 1);
+  if (k_dev != dev)
+    return EOVERFLOW;
 
-  return INLINE_SYSCALL (ustat, 2, k_dev, CHECK_1 (ubuf));
+  return INLINE_SYSCALL (ustat, 2, (unsigned int) k_dev, CHECK_1 (ubuf));
 }
diff --git a/sysdeps/unix/sysv/linux/xmknod.c b/sysdeps/unix/sysv/linux/xmknod.c
index 210c55e943..4c5b1f42a4 100644
--- a/sysdeps/unix/sysv/linux/xmknod.c
+++ b/sysdeps/unix/sysv/linux/xmknod.c
@@ -33,7 +33,7 @@
 int
 __xmknod (int vers, const char *path, mode_t mode, dev_t *dev)
 {
-  unsigned short int k_dev;
+  unsigned long long int k_dev;
 
   if (vers != _MKNOD_VER)
     {
@@ -42,9 +42,12 @@ __xmknod (int vers, const char *path, mode_t mode, dev_t *dev)
     }
 
   /* We must convert the value to dev_t type used by the kernel.  */
-  k_dev = ((major (*dev) & 0xff) << 8) | (minor (*dev) & 0xff);
+  k_dev =  (*dev) & ((1ULL << 32) - 1);
+  if (k_dev != *dev)
+    return EOVERFLOW;
 
-  return INLINE_SYSCALL (mknod, 3, CHECK_STRING (path), mode, k_dev);
+  return INLINE_SYSCALL (mknod, 3, CHECK_STRING (path), mode,
+			 (unsigned int) k_dev);
 }
 
 weak_alias (__xmknod, _xmknod)