Update.

1998-03-12  Matthias Urlichs <smurf@noris.de>

	* nscd/nscd.c: Ignore SIGPIPE.

1998-03-12  Ulrich Drepper  <drepper@cygnus.com>

	* nscd/nscd_getgr_r.c: Use __ protected names.
	* nscd/nscd_getpw_r.c: Likewise.

1998-03-12  Matthias Urlichs <smurf@noris.de>

	* nscd/nscd_getpw_r.c: Use pw_*_len values correctly.
	* nscd/nscd_getpw_r.c: Fix length calculation in result check,
	null bytes are not transmitted.

1998-03-12 00:40  Franz Sirl <Franz.Sirl-kernel@lauterbach.com>

	* powerpc/syscalls.list: Correct typo.
	* alpha/syscalls.list: Likewise.
	* mips/syscalls.list: Likewise.

1998-03-12  Ulrich Drepper  <drepper@cygnus.com>

	* socket/sys/socket.h: Add prototype for __socket.

diff --git a/ChangeLog b/ChangeLog
index d549f8ab86166b4dbecfa026482f170dd40aeabc..b2dd2c85d249913c4c5440fff386e777dd413b87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+1998-03-12  Matthias Urlichs <smurf@noris.de>
+
+       * nscd/nscd.c: Ignore SIGPIPE.
+
+1998-03-12  Ulrich Drepper  <drepper@cygnus.com>
+
+       * nscd/nscd_getgr_r.c: Use __ protected names.
+       * nscd/nscd_getpw_r.c: Likewise.
+
+1998-03-12  Matthias Urlichs <smurf@noris.de>
+
+       * nscd/nscd_getpw_r.c: Use pw_*_len values correctly.
+       * nscd/nscd_getpw_r.c: Fix length calculation in result check,
+       null bytes are not transmitted.
+
+1998-03-12 00:40  Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
+
+       * powerpc/syscalls.list: Correct typo.
+       * alpha/syscalls.list: Likewise.
+       * mips/syscalls.list: Likewise.
+
+1998-03-12  Ulrich Drepper  <drepper@cygnus.com>
+
+       * socket/sys/socket.h: Add prototype for __socket.
+
 1998-03-11 15:27  Ulrich Drepper  <drepper@cygnus.com>
 
        * elf/rtld.c: Update help message.

diff --git a/nscd/nscd.c b/nscd/nscd.c
index a53abc1fe0cf41076a2fea1a98b902656527f28e..83a7b5be865d503feccf5c4a052a35401432f3c6 100644 (file)
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -117,6 +117,7 @@ main (int argc, char **argv)
   signal (SIGINT, termination_handler);
   signal (SIGQUIT, termination_handler);
   signal (SIGTERM, termination_handler);
+  signal (SIGPIPE, SIG_IGN);
 
   /* Check if we are already running. */
   if (check_pid (_PATH_NSCDPID))

diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c
index 71acc0608a3c81cc9557d6d40f26ee9f12faa15d..7db28c215e2f2ad0d071e851216de10706c76621 100644 (file)
--- a/nscd/nscd_getgr_r.c
+++ b/nscd/nscd_getgr_r.c
@@ -71,7 +71,7 @@ nscd_open_socket (void)
   int sock;
   int saved_errno = errno;
 
-  sock = socket (PF_UNIX, SOCK_STREAM, 0);
+  sock = __socket (PF_UNIX, SOCK_STREAM, 0);
   if (sock < 0)
     {
       __set_errno (saved_errno);
@@ -80,7 +80,7 @@ nscd_open_socket (void)
 
   addr.sun_family = AF_UNIX;
   strcpy (addr.sun_path, _PATH_NSCDSOCKET);
-  if (connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0)
+  if (__connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0)
     {
       close (sock);
       __set_errno (saved_errno);

diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c
index 4804a4578add4dfabd74bbcf8ca7faa187ea9064..fd512ab1b5a1e1a734e9325368280ce7ec04482c 100644 (file)
--- a/nscd/nscd_getpw_r.c
+++ b/nscd/nscd_getpw_r.c
@@ -71,7 +71,7 @@ nscd_open_socket (void)
   int sock;
   int saved_errno = errno;
 
-  sock = socket (PF_UNIX, SOCK_STREAM, 0);
+  sock = __socket (PF_UNIX, SOCK_STREAM, 0);
   if (sock < 0)
     {
       __set_errno (saved_errno);
@@ -80,7 +80,7 @@ nscd_open_socket (void)
 
   addr.sun_family = AF_UNIX;
   strcpy (addr.sun_path, _PATH_NSCDSOCKET);
-  if (connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0)
+  if (__connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0)
     {
       close (sock);
       __set_errno (saved_errno);
@@ -142,9 +142,9 @@ __nscd_getpw_r (const char *key, request_type type, struct passwd *resultbuf,
       struct iovec vec[5];
       char *p = buffer;
 
-      if (buflen < pw_resp.pw_name_len + 1 + pw_resp.pw_passwd_len + 1
-         + pw_resp.pw_gecos_len + 1 + pw_resp.pw_dir_len + 1
-         + pw_resp.pw_shell_len + 1)
+      if (buflen < (pw_resp.pw_name_len + 1 + pw_resp.pw_passwd_len + 1
+                   + pw_resp.pw_gecos_len + 1 + pw_resp.pw_dir_len + 1
+                   + pw_resp.pw_shell_len + 1))
        {
          __set_errno (ERANGE);
          close (sock);
@@ -173,14 +173,14 @@ __nscd_getpw_r (const char *key, request_type type, struct passwd *resultbuf,
       buflen -= (pw_resp.pw_dir_len + 1);
       /* get pw_pshell */
       vec[4].iov_base = p;
-      vec[4].iov_len = pw_resp.pw_dir_len;
-      p += pw_resp.pw_dir_len + 1;
-      buflen -= (pw_resp.pw_dir_len + 1);
+      vec[4].iov_len = pw_resp.pw_shell_len;
+      p += pw_resp.pw_shell_len + 1;
+      buflen -= (pw_resp.pw_shell_len + 1);
 
       nbytes = readv (sock, vec, 5);
-      if (nbytes !=  pw_resp.pw_name_len + 1 + pw_resp.pw_passwd_len + 1 +
-         pw_resp.pw_gecos_len + 1 + pw_resp.pw_dir_len + 1 +
-         pw_resp.pw_shell_len + 1)
+      if (nbytes !=  (pw_resp.pw_name_len + pw_resp.pw_passwd_len
+                     + pw_resp.pw_gecos_len + pw_resp.pw_dir_len
+                     + pw_resp.pw_shell_len))
        {
          close (sock);
          return 1;

diff --git a/socket/sys/socket.h b/socket/sys/socket.h
index c3b75b382dec0a466ab8b339eb20f5c599135941..2358ab55824c8a9b8d0664178093e499c6868d04 100644 (file)
--- a/socket/sys/socket.h
+++ b/socket/sys/socket.h
@@ -85,6 +85,7 @@ typedef union { __SOCKADDR_ALLTYPES
 /* Create a new socket of type TYPE in domain DOMAIN, using
    protocol PROTOCOL.  If PROTOCOL is zero, one is chosen automatically.
    Returns a file descriptor for the new socket, or -1 for errors.  */
+extern int __socket __P ((int __domain, int __type, int __protocol));
 extern int socket __P ((int __domain, int __type, int __protocol));
 
 /* Create two new sockets, of type TYPE in domain DOMAIN and using

diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list
index fb15ea9baefbb36cd0f5f1b86474f6ba576d5450..8b593a016239e6f967a18b8138048fd7f5622242 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/syscalls.list
+++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list
@@ -55,7 +55,7 @@ socketpair    -       socketpair      4       __socketpair    socketpair
 sysctl         -       _sysctl         6       sysctl
 
 getresuid      -       getresuid       3       getresuid
-getresgid      -       getresgid       3       getresuid
+getresgid      -       getresgid       3       getresgid
 
 # access pci space protected from machine checks:
 pciconfig_read EXTRA   pciconfig_read  5       pciconfig_read

diff --git a/sysdeps/unix/sysv/linux/mips/syscalls.list b/sysdeps/unix/sysv/linux/mips/syscalls.list
index c00ee6bed45b9eb7ec39ea76fd7cc91cb84f6ac4..b9392001e4542fc178eb11ad45a79f627924d209 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/syscalls.list
+++ b/sysdeps/unix/sysv/linux/mips/syscalls.list
@@ -35,7 +35,7 @@ socket                -       socket          3       __socket        socket
 socketpair     -       socketpair      4       __socketpair    socketpair
 
 getresuid      -       getresuid       3       getresuid
-getresgid      -       getresgid       3       getresuid
+getresgid      -       getresgid       3       getresgid
 
 #
 # There are defined locally because the caller is also defined in this dir.

diff --git a/sysdeps/unix/sysv/linux/powerpc/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/syscalls.list
index c5f772526970a120bf057cf477820b5e93809854..605762a2a40287796cccc529e08ebf4c76bc81e3 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/syscalls.list
+++ b/sysdeps/unix/sysv/linux/powerpc/syscalls.list
@@ -3,4 +3,4 @@
 s_llseek       llseek  _llseek         5       __sys_llseek
 
 getresuid      -       getresuid       3       getresuid
-getresgid      -       getresgid       3       getresuid
+getresgid      -       getresgid       3       getresgid