about summary refs log tree commit diff
path: root/sysdeps/unix/sysv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-07-04 10:39:13 +0000
committerUlrich Drepper <drepper@redhat.com>1998-07-04 10:39:13 +0000
commitba9234d947af45f15b1e4dece1a9cd447cecc038 (patch)
treefb6ec34cfaf4d1cef1a689164024fc99f2649206 /sysdeps/unix/sysv
parent6ef9f70bdbe3fdb7b16d7c9726e624700d774136 (diff)
downloadglibc-ba9234d947af45f15b1e4dece1a9cd447cecc038.tar.gz
glibc-ba9234d947af45f15b1e4dece1a9cd447cecc038.tar.xz
glibc-ba9234d947af45f15b1e4dece1a9cd447cecc038.zip
Update.
1998-07-04 10:14  Ulrich Drepper  <drepper@cygnus.com>

	* libio/Makefile (routines): Add iofread_u and iofwrite_u.
	* libio/Versions: Add fread_unlocked and fwrite_unlocked.

	* Makerules (lib%.so): Adjust ignore pattern for last makefile change.

	* time/tzfile.c (decode): Optimize by using bswap_32.
	(__tzfile_read): Use _unlocked stream functions.  Correct setting of
	__tzname array values.
	(__tzfile_compute): Correct setting of __tzname array values.
	* time/tzset.c (__tzstring): Clean up a bit.

1998-06-29 19:01  Jim Wilson  <wilson@cygnus.com>

	* posix/regex.c (re_comp): Add cast to char * before gettext calls.

1998-06-30  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/unix/bsd/poll.c (__poll): Allocate fd_set dynamically so
	that fd can be bigger than FD_SETSIZE.

1998-07-01  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* nscd/grpcache.c: Include <unistd.h>.
	* nscd/pwdcache.c: Likewise.

	* nis/nis_modify.c: Include <string.h>.
	* nis/nis_add.c: Likewise.
	* nis/nis_checkpoint.c: Likewise.
	* posix/runptests.c: Likewise.
	* sysdeps/generic/statvfs64.c: Likewise.
	* sysdeps/generic/fstatvfs64.c: Likewise.

1998-07-03 13:16  Ulrich Drepper  <drepper@cygnus.com>

	* localedata/charmaps/ISO-8859-9: Change mapping for 0xea, 0xec, 0xef
	to match data from Unicode.
	Reported by Michael Deutschmann <michael@talamasca.wkpowerlink.com>.

1998-07-03 11:45  Ulrich Drepper  <drepper@cygnus.com>

	* stdio-common/printf.h: Define printf_function and
	printf_arginfo_function types using __PMT not __P.
	Reported by Marc Lehmann.

1998-07-02 14:07 -0400  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* assert/test-assert.c: New test.
	* assert/test-assert-perr.c: New test.
	* assert/Makefile (tests): Add test-assert and test-assert-perr.

1998-07-02 13:45  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	BSD-style SCM_CREDS support.

	* sysdeps/unix/sysv/linux/socket.h: Define struct cmsgcred and
	SCM_CREDS.
	* sysdeps/unix/sysv/linux/sendmsg.c: New file.  Convert user
	visible SCM_CREDS packet to what the kernel wants.
	* sysdeps/unix/sysv/linux/recvmsg.c: New file.  Convert
	SCM_CREDS packet output by kernel to what users want.

	* sysdeps/unix/sysv/linux/sendmsg.S: Moved to...
	* sysdeps/unix/sysv/linux/__sendmsg.S: here.
	* sysdeps/unix/sysv/linux/recvmsg.S: Moved to...
	* sysdeps/unix/sysv/linux/__recvmsg.S: here.

	* sysdeps/unix/sysv/linux/Makefile [subdir=socket]: Add
	__sendmsg and __recvmsg to sysdep_routines.
	* sysdeps/unix/sysv/linux/Dist: Add __sendmsg.S and __recvmsg.S.

1998-07-02  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>

	* nscd/grpcache.c: Fix gid pointer handling and debug messages.
	* nscd/pwdcache.c: Fix uid pointer handling and debug messages.
	* nscd/nscd.c: Check, if pthread_create fails.

1998-07-02  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* stdio-common/test_rdwr.c (main): Use %Zu for size_t in printf
	format strings.
	* stdio-common/bug1.c (main): Likewise.
	* stdio-common/bug5.c (main): Likewise.
	* stdio-common/tstgetln.c (main): Likewise.
	* elf/sprof.c (generate_call_graph): Likewise.
	(load_shobj): Likewise.
	* posix/runptests.c (main): Likewise.
	* string/tst-strlen.c (main): Likewise.

	* sysdeps/libm-ieee754/e_acos.c (__ieee754_acos): Remove unused
	variable q3.
	* sysdeps/libm-ieee754/e_asin.c (__ieee754_asin): Likewise

1998-07-03  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* wctype/Versions: Add __towctrans.
	Noticed by Alex Buell <alex.buell@tahallah.demon.co.uk>.

1998-07-02  Mark Kettenis  <kettenis@phys.uva.nl>

	* grp/initgroups.c (compat_call): Only call dynamically loaded
	functions if they are really present.

1998-07-02  Mark Kettenis  <kettenis@phys.uva.nl>

	* sysdeps/unix/sysv/linux/bits/sched.h: Move __END_DECLS within
	#ifdef that contains __BEGIN_DECLS.

1998-07-02  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* libio/iofwrite.c: Fix return value when size == 0.

1998-07-01  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* posix/Makefile (distribute): Add annexc.c.
	(generated): Add $(objpfx)annexc and $(objpfx)annexc.out.

1998-07-01  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
	bits/pthreadtypes.h here, and do not clobber headers.

	* sysdeps/unix/sysv/linux/Dist: Add bits/pthreadtypes.h.

1998-07-03  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* timezone/tst-timezone.c: Add tests for tzname variable.

1998-07-03 12:17  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* Makefile [versioning=yes]: Build the mapfiles with a pattern
	rule that lists all of them as targets.
	(sysd-versions): Depend only on Versions.def.  Write a Makefile
	fragment that defines $(vers-libs) based on contents of that file;
	then include it.
	(lib-noranlib): Depend on lib-mapfiles not sysd-versions.
	(lib-mapfiles): New target, depends on sysd-versions and $(vers-libs).
	Predicate all this on avoid-generated unset as well as versioning.

1998-07-03 14:35  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
Diffstat (limited to 'sysdeps/unix/sysv')
-rw-r--r--sysdeps/unix/sysv/linux/Dist3
-rw-r--r--sysdeps/unix/sysv/linux/Makefile4
-rw-r--r--sysdeps/unix/sysv/linux/__recvmsg.S (renamed from sysdeps/unix/sysv/linux/recvmsg.S)4
-rw-r--r--sysdeps/unix/sysv/linux/__sendmsg.S (renamed from sysdeps/unix/sysv/linux/sendmsg.S)4
-rw-r--r--sysdeps/unix/sysv/linux/aio_sigqueue.c5
-rw-r--r--sysdeps/unix/sysv/linux/bits/sched.h4
-rw-r--r--sysdeps/unix/sysv/linux/bits/socket.h26
-rw-r--r--sysdeps/unix/sysv/linux/recvmsg.c93
-rw-r--r--sysdeps/unix/sysv/linux/sendmsg.c91
9 files changed, 218 insertions, 16 deletions
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 27b3077a65..89758cd3a8 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -1,3 +1,4 @@
+bits/pthreadtypes.h
 stdio_lim.h.in
 cmsg_nxthdr.c
 errlist.h
@@ -74,3 +75,5 @@ sys/user.h
 sys/vt.h
 xstatconv.c
 getdents64.c
+__sendmsg.S
+__recvmsg.S
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index ec42e776c0..7de1008716 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -58,7 +58,7 @@ ifeq ($(subdir),socket)
 sysdep_headers += net/if.h net/if_ppp.h net/ppp-comp.h \
 		  net/ppp_defs.h net/if_arp.h net/route.h net/ethernet.h \
 		  net/if_slip.h net/if_packet.h
-sysdep_routines += cmsg_nxthdr sa_len
+sysdep_routines += cmsg_nxthdr sa_len __sendmsg __recvmsg
 endif
 
 ifeq ($(subdir),sunrpc)
@@ -75,7 +75,7 @@ inhibit-siglist := yes
 endif
 
 ifeq ($(subdir),posix)
-headers := bits/pthreadtypes.h
+sysdep_headers += bits/pthreadtypes.h
 endif
 
 ifeq ($(subdir),inet)
diff --git a/sysdeps/unix/sysv/linux/recvmsg.S b/sysdeps/unix/sysv/linux/__recvmsg.S
index 98be36be5b..515ff552aa 100644
--- a/sysdeps/unix/sysv/linux/recvmsg.S
+++ b/sysdeps/unix/sysv/linux/__recvmsg.S
@@ -1,5 +1,5 @@
-#define	socket	recvmsg
+#define	socket	__recvmsg
 #define	__socket __libc_recvmsg
+#define SOCKOP___recvmsg SOCKOP_recvmsg
 #define	NARGS	3
 #include <socket.S>
-weak_alias (__libc_recvmsg, __recvmsg)
diff --git a/sysdeps/unix/sysv/linux/sendmsg.S b/sysdeps/unix/sysv/linux/__sendmsg.S
index c01d9b68e7..165ee14698 100644
--- a/sysdeps/unix/sysv/linux/sendmsg.S
+++ b/sysdeps/unix/sysv/linux/__sendmsg.S
@@ -1,5 +1,5 @@
-#define	socket	sendmsg
+#define	socket	__sendmsg
 #define	__socket __libc_sendmsg
+#define SOCKOP___sendmsg SOCKOP_sendmsg
 #define	NARGS	3
 #include <socket.S>
-weak_alias (__libc_sendmsg, __sendmsg)
diff --git a/sysdeps/unix/sysv/linux/aio_sigqueue.c b/sysdeps/unix/sysv/linux/aio_sigqueue.c
index fc1187b443..5dea29fcf6 100644
--- a/sysdeps/unix/sysv/linux/aio_sigqueue.c
+++ b/sysdeps/unix/sysv/linux/aio_sigqueue.c
@@ -24,9 +24,6 @@
 
 extern int __syscall_rt_sigqueueinfo (int, int, siginfo_t *);
 
-/* This variable is used quite often in the libc code.  */
-extern pid_t __libc_pid;
-
 
 /* Return any pending signal or wait for one for the given time.  */
 int
@@ -40,10 +37,8 @@ __aio_sigqueue (sig, val)
   info.si_signo = sig;
   info.si_errno = 0;
   info.si_code = SI_ASYNCIO;
-
   info.si_pid = getpid ();
   info.si_uid = getuid ();
-
   info.si_value = val;
 
   return __syscall_rt_sigqueueinfo (info.si_pid, sig, &info);
diff --git a/sysdeps/unix/sysv/linux/bits/sched.h b/sysdeps/unix/sysv/linux/bits/sched.h
index c7f6d8d902..9d5d5e65df 100644
--- a/sysdeps/unix/sysv/linux/bits/sched.h
+++ b/sysdeps/unix/sysv/linux/bits/sched.h
@@ -57,6 +57,8 @@ extern int clone __P ((int (*__fn) (void *__arg), void *__child_stack,
 		       int __flags, void *__arg));
 #endif
 
+__END_DECLS
+
 #endif	/* need schedparam */
 
 #if !defined __defined_schedparam \
@@ -69,5 +71,3 @@ struct __sched_param
   };
 # undef __need_schedparam
 #endif
-
-__END_DECLS
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 5517ba8803..c1f752ec29 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -222,12 +222,32 @@ __cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg)
    <linux/socket.h>.  */
 enum
   {
-    SCM_RIGHTS = 0x01,		/* Data array contains access rights.  */
+    SCM_RIGHTS = 0x01,		/* Transfer file descriptors.  */
 #define SCM_RIGHTS SCM_RIGHTS
-    __SCM_CREDENTIALS = 0x02,	/* Data array is `struct ucred'.  */
-    __SCM_CONNECT = 0x03	/* Data array is `struct scm_connect'.  */
+#ifdef __USE_BSD
+    SCM_CREDS = 0x02,		/* BSD-compatible credentials passing.  */
+# define SCM_CREDS SCM_CREDS
+#endif
+    __SCM_CONNECT = 0x03,	/* Data array is `struct scm_connect'.  */
   };
 
+#ifdef __USE_BSD
+
+/* User visible structure for SCM_CREDS message
+   (chosen for BSD source compatibility) */
+
+# define CMGROUP_MAX 16  /* Linux does not provide this info, so it doesn't
+			    matter... use what bsd does. */
+struct cmsgcred
+{
+  pid_t cmcred_pid;			/* PID of sending process.  */
+  uid_t cmcred_uid;			/* Real UID of sending process.  */
+  uid_t cmcred_euid;			/* Effective UID of sending process. */
+  gid_t cmcred_gid;			/* Real GID of sending process.  */
+  short int cmcred_ngroups;		/* Number or groups.  */
+  gid_t cmcred_groups[CMGROUP_MAX];	/* Groups.  */
+};
+#endif
 
 /* Get socket manipulation related informations from kernel headers.  */
 #include <asm/socket.h>
diff --git a/sysdeps/unix/sysv/linux/recvmsg.c b/sysdeps/unix/sysv/linux/recvmsg.c
new file mode 100644
index 0000000000..04cf230828
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/recvmsg.c
@@ -0,0 +1,93 @@
+/* Copyright (C) 1998 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.
+
+   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.
+
+   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.  */
+
+#include <sys/socket.h>
+#include <errno.h>
+#include <string.h>
+
+#include <asm/posix_types.h>
+
+/* The kernel expects this structure in SCM_CREDS messages.
+ * Note: sizeof(struct __kernel_ucred) <= sizeof(struct cmsgcred) must hold.
+ */
+struct __kernel_ucred
+{
+  __kernel_pid_t pid;
+  __kernel_uid_t uid;
+  __kernel_gid_t gid;
+};
+
+extern int __recvmsg (int, struct msghdr *, int);
+
+int
+recvmsg (fd, message, flags)
+     int fd;
+     struct msghdr *message;
+     int flags;
+{
+  struct cmsghdr *cm;
+  int ret;
+  int found_creds = 0;
+
+  /* Must check for space first. */
+  cm = CMSG_FIRSTHDR (message);
+  while (cm)
+    {
+      if (cm->cmsg_type == SCM_CREDS)
+	{
+	  if (cm->cmsg_len < CMSG_SPACE (sizeof (struct cmsgcred)))
+	    {
+	      __set_errno (EINVAL);
+	      return -1;
+	    }
+	  found_creds = 1;
+	}
+      cm = CMSG_NXTHDR (message, cm);
+    }
+
+
+  ret = __recvmsg (fd, message, flags);
+
+  if (ret == -1)
+    return ret;
+
+  /* Postprocess the message control block for SCM_CREDS. */
+  cm = CMSG_FIRSTHDR (message);
+  if (found_creds)
+    while (cm)
+      {
+	if (cm->cmsg_type == SCM_CREDS)
+	  {
+	    struct cmsgcred *c = (struct cmsgcred *) CMSG_DATA (cm);
+	    struct __kernel_ucred u;
+	    int i;
+	    memcpy (&u, CMSG_DATA (cm), sizeof (struct __kernel_ucred));
+
+	    c->cmcred_pid = u.pid;
+	    c->cmcred_uid = u.uid;
+	    c->cmcred_gid = u.gid;
+
+	    c->cmcred_euid = -1;
+	    c->cmcred_ngroups = 0;
+	    for (i = 0; i < CMGROUP_MAX; i++)
+	      c->cmcred_groups[i] = -1;
+	  }
+	cm = CMSG_NXTHDR (message, cm);
+      }
+  return ret;
+}
diff --git a/sysdeps/unix/sysv/linux/sendmsg.c b/sysdeps/unix/sysv/linux/sendmsg.c
new file mode 100644
index 0000000000..8902530c2b
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sendmsg.c
@@ -0,0 +1,91 @@
+/* Copyright (C) 1998 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.
+
+   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.
+
+   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.  */
+
+#include <sys/socket.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <asm/posix_types.h>
+
+/* The kernel expects this structure in SCM_CREDS messages.
+ * Note: sizeof(struct __kernel_ucred) <= sizeof(struct cmsgcred) must hold.
+ */
+struct __kernel_ucred
+{
+  __kernel_pid_t pid;
+  __kernel_uid_t uid;
+  __kernel_gid_t gid;
+};
+
+extern int __sendmsg (int, const struct msghdr *, int);
+
+/* Send a message described by MESSAGE on socket FD.
+   Returns the number of bytes sent, or -1 for errors.  */
+int
+sendmsg (fd, message, flags)
+     int fd;
+     const struct msghdr *message;
+     int flags;
+{
+  struct cmsghdr *cm;
+  struct cmsgcred *cc;
+  struct __kernel_ucred *u;
+  pid_t pid;
+
+  /* Preprocess the message control block for SCM_CREDS. */
+  cm = CMSG_FIRSTHDR (message);
+  while (cm)
+    {
+      if (cm->cmsg_type == SCM_CREDS)
+	{
+	  if (cm->cmsg_len < CMSG_SPACE (sizeof (struct cmsgcred)))
+	    {
+	      __set_errno (EINVAL);
+	      return -1;
+	    }
+
+	  u = (struct __kernel_ucred *) CMSG_DATA (cm);
+	  cc = (struct cmsgcred *) CMSG_DATA (cm);
+	  /* Linux expects the calling process to pass in
+	     its credentials, and sanity checks them.
+	     You can send real, effective, or set- uid and gid.
+	     If the user hasn't filled in the buffer, we default to
+	     real uid and gid. */
+	  pid = getpid ();
+	  if (cc->cmcred_pid != pid)
+	  {
+	      u->pid = pid;
+	      u->uid = getuid ();
+	      u->gid = getgid ();
+	  }
+	  else
+	  {
+	      struct __kernel_ucred v;
+	      v.pid = cc->cmcred_pid;
+	      v.uid = cc->cmcred_uid;
+	      v.gid = cc->cmcred_gid;
+	      u->pid = v.pid;
+	      u->uid = v.uid;
+	      u->gid = v.gid;
+	  }
+	}
+      cm = CMSG_NXTHDR ((struct msghdr *) message, cm);
+    }
+
+  return __sendmsg (fd, message, flags);
+}