aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-08-08 20:02:34 +0000
committerUlrich Drepper <drepper@redhat.com>1998-08-08 20:02:34 +0000
commit7ce241a03e2c0b49482d9d05c8ddb765e89a01d9 (patch)
treee8278ec57d7c434f389dc57afe24f66f93c06ced /sysdeps/unix/sysv/linux
parent9fbffc467639130663cc1959a59eb980b9207210 (diff)
downloadglibc-7ce241a03e2c0b49482d9d05c8ddb765e89a01d9.tar
glibc-7ce241a03e2c0b49482d9d05c8ddb765e89a01d9.tar.gz
glibc-7ce241a03e2c0b49482d9d05c8ddb765e89a01d9.tar.bz2
glibc-7ce241a03e2c0b49482d9d05c8ddb765e89a01d9.zip
Update.
1998-07-31 17:59 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/bits/byteswap.h: Fix problems with side effects. * manual/filesys.texi: Document truncate and ftruncate. Patch by Michael Deutschmann <michael@talamasca.wkpowerlink.com>. * shadow/putspent.c: Lock stream while generating the output. * sunrpc/clnt_unix.c: Use ucred instead of cmsgcred again. (__msgwrite): Rewrite accordingly. * sunrpc/svc_unix.c: Likewise. * sysdeps/unix/sysv/linux/Dist: Remove __recvmsg.S and __sendmsg.S. * sysdeps/unix/sysv/linux/Makefile [$(subdir)==socket] (sysdep_routines): Remove __sendmsg and __recvmsg. * sysdeps/unix/sysv/linux/__recvmsg.S: Removed. * sysdeps/unix/sysv/linux/__sendmsg.S: Removed. * sysdeps/unix/sysv/linux/recvmsg.c: Removed. * sysdeps/unix/sysv/linux/sendmsg.c: Removed. * sysdeps/unix/sysv/linux/recvmsg.S: New file. * sysdeps/unix/sysv/linux/sendmsg.S: New file. * sysdeps/unix/sysv/linux/bits/socket.h: Define SCM_CREDENTIALS and struct ucred. Remove struct cmsgcred. Patches by Thorsten Kukuk. 1998-08-03 Andreas Jaeger <aj@arthur.rhein-neckar.de> * inet/rcmd.c (__ivaliduser): Allow '#' as comment character. 1998-08-08 14:42 Ulrich Drepper <drepper@cygnus.com> * argp/argp-help.c: Prepare to be used outside glibc without gcc by adding usual alloca cruft. Reported by Eleftherios Gkioulekas <lf@amath.washington.edu>. 1998-04-05 Jim Meyering <meyering@ascend.com> * lib/regex.c (WIDE_CHAR_SUPPORT): Define. This now depends on HAVE_BTOWC so systems that lack btowc (like solaris-2.5.1) don't lose. 1998-08-07 Mark Kettenis <kettenis@phys.uva.nl> * sysdeps/generic/bits/sigaction.h: Remove definition of SA_DISABLE. * sysdeps/generic/bits/sigstack.h: Define SS_DISABLE, SS_ONSTACK, MINSIGSTKZ and SIGSTKSZ. Definitions match BSD. * hurd/sigunwind.c (_hurdsig_longjmp_from_handler): Use SS_ONSTACK instead of SA_ONSTACK. * sysdeps/mach/hurd/sigaltstack.c (__sigaltstack): Renamed from sigaltstack, and created a weak alias. Use SS_DISABLE and SS_ONSTACK instead of SA_DISABLE and SA_ONSTACK. * sysdeps/mach/hurd/sigstack.c (sigstack): Use SS_ONSTACK instead of SA_ONSTACK. Call __sigaltstack instead of sigaltstack. * sysdeps/mach/hurd/i386/sigreturn.c (__sigreturn): Use SS_ONSTACK instead of SA_ONSTACK. * sysdeps/mach/hurd/alpha/sigreturn.c (__sigreturn): Likewise. * sysdeps/mach/hurd/mips/sigreturn.c (__sigreturn): Likewise. * sysdeps/mach/hurd/i386/trampoline.c (_hurd_setup_sighandler): Use SS_DISABLE instead of SA_DISABLE. Use SS_ONSTACK instead of SA_ONSTACK where appropriate. * sysdeps/mach/hurd/alpha/trampoline.c (_hurd_setup_sighandler): Likewise. * sysdeps/mach/hurd/hppa/trampoline.c (_hurd_setup_sighandler): Likewise. * sysdeps/mach/hurd/mips/trampoline.c (_hurd_setup_sighandler): Likewise. * manual/signal.texi (Signal Stack): Talk about SS_DISABLE and SS_ONSTACK instead of SA_DISABLE and SA_ONSTACK in discussion of the `ss_flags' member of `struct sigaltstack'. 1998-08-05 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/Makefile (routines) [$(versioning)=yes]: Add oldtmpfile. (shared-only-routines): Likewise. * libio/oldtmpfile.c: New file * stdio-common/tmpfile.c: Use __fdopen and __close. [USE_IN_LIBIO]: Use _IO_fdopen instead of _IO_new_fdopen. Put tmpfile on symbol version GLIBC_2.1. * stdio-common/tmpfile64.c: Use __fdopen and __close. [USE_IN_LIBIO]: Use _IO_fdopen instead of _IO_new_fdopen. * stdio-common/Version [GLIBC_2.1]: Add tmpfile. * stdio-common/tempnam.c: Use __strdup instead of strdup. * sysdeps/posix/fdopen.c: Define __fdopen and make fdopen weak alias. * sysdeps/generic/fdopen.c: Likewise. * sysdeps/mach/hurd/fdopen.c: Likewise. * stdio/stdio.h: Declare __fdopen. * sunrpc/openchild.c: Use __fdopen instead of fdopen. [USE_IN_LIBIO]: Map __fdopen to _IO_fdopen. * sysdeps/posix/tempname.c (__gen_tempname): Don't bother checking __stub_open64, it is never defined. 1998-08-05 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/iofopen64.c: Fix typo. Avoid unnessary casts. * libio/iopopen.c: Unlink file before freeing it if command creation failed. Avoid unnessary casts. * libio/iofdopen.c: Avoid unnecessary cast. * pwd/fgetpwent_r.c [USE_IN_LIBIO]: Map funlockfile to _IO_funlockfile. * pwd/fgetspent_r.c [USE_IN_LIBIO]: Likewise. 1998-08-06 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * grp/grp.h, pwd/pwd.h: Don't declare __grpopen, __grpread, __grpalloc, __grpscan and the corresponding pwd functions, they were removed long ago. 1998-08-06 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * math/libm-test.c (csqrt_test): Adjust epsilons. (casinh_test): Likewise. 1998-08-06 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * posix/globtest.sh: Fix typo. Remove second test output file. 1998-08-07 Cristian Gafton <gafton@redhat.com> * pwd/putpwent.c (putpwent): Avoid writting (none) in the passwd file. * shadow/putspent.c (putspent): Likewise. * grp/putgrent.c: New file. * grp/Makefile (routines): Add putgrent. * grp/Versions [GLIBC_2.1]: Add putgrent. * grp/grp.h: Add putgrent prototype. 1998-08-04 19:33 Ulrich Drepper <drepper@cygnus.com> * elf/elf.h: More ELF definitions.
Diffstat (limited to 'sysdeps/unix/sysv/linux')
-rw-r--r--sysdeps/unix/sysv/linux/Dist2
-rw-r--r--sysdeps/unix/sysv/linux/Makefile2
-rw-r--r--sysdeps/unix/sysv/linux/__recvmsg.S5
-rw-r--r--sysdeps/unix/sysv/linux/__sendmsg.S5
-rw-r--r--sysdeps/unix/sysv/linux/bits/socket.h23
-rw-r--r--sysdeps/unix/sysv/linux/recvmsg.S4
-rw-r--r--sysdeps/unix/sysv/linux/recvmsg.c74
-rw-r--r--sysdeps/unix/sysv/linux/sendmsg.S4
-rw-r--r--sysdeps/unix/sysv/linux/sendmsg.c124
9 files changed, 16 insertions, 227 deletions
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index e813a08c14..dbe401de3f 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -75,7 +75,5 @@ sys/user.h
sys/vt.h
xstatconv.c
getdents64.c
-__sendmsg.S
-__recvmsg.S
getresuid.c
getresgid.c
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index af53184cb2..b84fbed0c7 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 __sendmsg __recvmsg
+sysdep_routines += cmsg_nxthdr sa_len
endif
ifeq ($(subdir),sunrpc)
diff --git a/sysdeps/unix/sysv/linux/__recvmsg.S b/sysdeps/unix/sysv/linux/__recvmsg.S
deleted file mode 100644
index f76cce0913..0000000000
--- a/sysdeps/unix/sysv/linux/__recvmsg.S
+++ /dev/null
@@ -1,5 +0,0 @@
-#define socket ___syscall_recvmsg
-#define __socket __syscall_recvmsg
-#define SOCKOP____syscall_recvmsg SOCKOP_recvmsg
-#define NARGS 3
-#include <socket.S>
diff --git a/sysdeps/unix/sysv/linux/__sendmsg.S b/sysdeps/unix/sysv/linux/__sendmsg.S
deleted file mode 100644
index bd935bd7a9..0000000000
--- a/sysdeps/unix/sysv/linux/__sendmsg.S
+++ /dev/null
@@ -1,5 +0,0 @@
-#define socket ___syscall_sendmsg
-#define __socket __syscall_sendmsg
-#define SOCKOP____syscall_sendmsg SOCKOP_sendmsg
-#define NARGS 3
-#include <socket.S>
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index c1f752ec29..226e332043 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -225,29 +225,20 @@ enum
SCM_RIGHTS = 0x01, /* Transfer file descriptors. */
#define SCM_RIGHTS SCM_RIGHTS
#ifdef __USE_BSD
- SCM_CREDS = 0x02, /* BSD-compatible credentials passing. */
-# define SCM_CREDS SCM_CREDS
+ SCM_CREDENTIALS = 0x02, /* Credentials passing. */
+# define SCM_CREDENTIALS SCM_CREDENTIALS
#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) */
+/* User visible structure for SCM_CREDENTIALS message */
-# define CMGROUP_MAX 16 /* Linux does not provide this info, so it doesn't
- matter... use what bsd does. */
-struct cmsgcred
+struct ucred
{
- 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. */
+ pid_t pid; /* PID of sending process. */
+ uid_t uid; /* UID of sending process. */
+ gid_t gid; /* GID of sending process. */
};
-#endif
/* Get socket manipulation related informations from kernel headers. */
#include <asm/socket.h>
diff --git a/sysdeps/unix/sysv/linux/recvmsg.S b/sysdeps/unix/sysv/linux/recvmsg.S
new file mode 100644
index 0000000000..b4125d2caa
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/recvmsg.S
@@ -0,0 +1,4 @@
+#define socket recvmsg
+#define __socket __libc_recvmsg
+#define NARGS 3
+#include <socket.S>
diff --git a/sysdeps/unix/sysv/linux/recvmsg.c b/sysdeps/unix/sysv/linux/recvmsg.c
deleted file mode 100644
index 52a0abcf67..0000000000
--- a/sysdeps/unix/sysv/linux/recvmsg.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* 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 __syscall_recvmsg (int, struct msghdr *, int);
-
-int
-__libc_recvmsg (int fd, struct msghdr *message, int flags)
-{
- struct cmsghdr *cm;
- int ret;
-
- ret = __syscall_recvmsg (fd, message, flags);
-
- if (ret == -1)
- return ret;
-
- /* Postprocess the message control block for SCM_CREDS. */
- cm = CMSG_FIRSTHDR (message);
- 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;
-}
-
-weak_alias (__libc_recvmsg, recvmsg)
diff --git a/sysdeps/unix/sysv/linux/sendmsg.S b/sysdeps/unix/sysv/linux/sendmsg.S
new file mode 100644
index 0000000000..0defce9f9e
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sendmsg.S
@@ -0,0 +1,4 @@
+#define socket sendmsg
+#define __socket __libc_sendmsg
+#define NARGS 3
+#include <socket.S>
diff --git a/sysdeps/unix/sysv/linux/sendmsg.c b/sysdeps/unix/sysv/linux/sendmsg.c
deleted file mode 100644
index 304aa6e2a1..0000000000
--- a/sysdeps/unix/sysv/linux/sendmsg.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* 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 <stdlib.h>
-#include <string.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;
- };
-
-struct credmsg
- {
- struct cmsghdr cm;
- struct cmsgcred cc;
- };
-
-struct kcredmsg
- {
- struct cmsghdr cm;
- struct kernel_ucred cc;
- };
-
-extern int __syscall_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
-__libc_sendmsg (int fd, const struct msghdr *message, int flags)
-{
- struct msghdr m;
- char *buf, *a, *b;
- struct credmsg *cred = 0;
- struct kcredmsg *kcred;
- struct cmsghdr *cm;
- long int offset = 0;
- pid_t pid;
-
- /* Preprocess the message control block for SCM_CREDS. */
- if (message->msg_controllen)
- {
- cm = CMSG_FIRSTHDR (message);
- while (cm)
- {
- if (cm->cmsg_type == SCM_CREDS)
- {
- if (cred ||
- cm->cmsg_len < CMSG_LEN (sizeof (struct cmsgcred)))
- {
- __set_errno (EINVAL);
- return -1;
- }
- else
- {
- cred = (struct credmsg *) cm;
- offset = (char *) cm - (char *) message->msg_control;
- }
- }
- cm = CMSG_NXTHDR ((struct msghdr *) message, cm);
- }
-
- if (cred)
- {
- buf = alloca (message->msg_controllen);
- memcpy (buf, message->msg_control, message->msg_controllen);
- kcred = (struct kcredmsg *) (buf + offset);
- a = (char *) kcred + CMSG_LEN (sizeof (struct kernel_ucred));
- b = (char *) kcred + CMSG_LEN (sizeof (struct cmsgcred));
- memmove (a, b, message->msg_controllen - (b - buf));
-
- kcred->cm.cmsg_len = CMSG_LEN (sizeof (struct kernel_ucred));
-
- /* 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 (cred->cc.cmcred_pid != pid)
- {
- kcred->cc.pid = pid;
- kcred->cc.uid = __getuid ();
- kcred->cc.gid = __getgid ();
- }
- else
- {
- kcred->cc.uid = cred->cc.cmcred_uid;
- kcred->cc.gid = cred->cc.cmcred_gid;
- }
- memcpy (&m, message, sizeof (struct msghdr));
- m.msg_control = buf;
- m.msg_controllen -= b - a;
- return __syscall_sendmsg (fd, &m, flags);
- }
- }
- return __syscall_sendmsg (fd, message, flags);
-}
-
-weak_alias (__libc_sendmsg, sendmsg)