aboutsummaryrefslogtreecommitdiff
path: root/nscd
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-07-16 11:44:36 +0000
committerUlrich Drepper <drepper@redhat.com>1998-07-16 11:44:36 +0000
commit50304ef0572fb41ba853262046dc7594f6a15241 (patch)
tree7bd5691f3d9acc632bdfcd61379cef9aeeb5b84b /nscd
parente31cac9420203a4e01327eaffe1cc27f15463afb (diff)
downloadglibc-50304ef0572fb41ba853262046dc7594f6a15241.zip
glibc-50304ef0572fb41ba853262046dc7594f6a15241.tar.gz
glibc-50304ef0572fb41ba853262046dc7594f6a15241.tar.bz2
Update.
1998-07-16 10:23 Ulrich Drepper <drepper@cygnus.com> * argp/argp-fmtstream.c: Unify names of used global functions. * argp/argp-help.c: Likewise. * assert/assert-perr.c: Likewise * assert/assert.c: Likewise * dirent/scandir.c: Likewise * dirent/scandir64.c: Likewise * dirent/versionsort.c: Likewise * dirent/versionsort64.c: Likewise * gmon/bb_exit_func.c: Likewise. * gmon/gmon.c: Likewise. * grp/initgroups.c: Likewise. * iconv/gconv_conf.c: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent_r.c: Likewise. * inet/inet_ntoa.c: Likewise. * inet/rcmd.c: Likewise. * inet/rexec.c: Likewise. * inet/ruserpass.c: Likewise. * io/fts.c: Likewise. * io/ftw.c: Likewise. * io/ftw64.c: Likewise. * io/getdirname.c: Likewise. * io/getwd.c: Likewise. * io/lockf.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iopopen.c: Likewise. * login/utmp_daemon.c: Likewise. * malloc/mtrace.c: Likewise. * malloc/obstack.c * misc/daemon.c: Likewise. * misc/efgcvt_r.c: Likewise. * misc/err.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/getttyent.c: Likewise. * misc/mntent_r.c: Likewise. * misc/search.h: Likewise. * misc/syslog.c: Likewise. * nscd/nscd_getgr_r.c: Likewise. * nscd/nscd_getpw_r.c: Likewise. * posix/getpgrp.c: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent_r.c: Likewise. * pwd/getpw.c: Likewise. * resolv/herror.c: Likewise. * resolv/res_init.c: Likewise. * shadow/fgetspent_r.c: Likewise. * shadow/lckpwdf.c: Likewise. * signal/sigrelse.c: Likewise. * stdio-common/asprintf.c: Likewise. * stdio-common/dprintf.c: Likewise. * stdio-common/getw.c: Likewise. * stdio-common/putw.c: Likewise. * stdio-common/snprintf.c: Likewise. * stdio-common/sprintf.c: Likewise. * stdio-common/sscanf.c: Likewise. * stdlib/lrand48_r.c: Likewise. * stdlib/mrand48_r.c: Likewise. * string/argz-replace.c: Likewise. * string/envz.c: Likewise. * sunrpc/auth_des.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/clnt_gen.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_simp.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/get_myaddr.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/netname.c: Likewise. * sunrpc/openchild.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rpc_dtable.c: Likewise. * sunrpc/rtime.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svcauth_des.c: Likewise. * sunrpc/xdr_array.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sysdeps/generic/abort.c: Likewise. * sysdeps/generic/dl-sysdep.c: Likewise. * sysdeps/generic/fstatfs64.c: Likewise. * sysdeps/generic/ftruncate64.c: Likewise. * sysdeps/generic/getrlimit64.c: Likewise. * sysdeps/generic/glob.c: Likewise. * sysdeps/generic/prof-freq.c: Likewise. * sysdeps/generic/putenv.c: Likewise. * sysdeps/generic/statfs64.c: Likewise. * sysdeps/generic/ttyname_r.c: Likewise. * sysdeps/generic/utmp_file.c: Likewise. * sysdeps/generic/vlimit.c: Likewise. * sysdeps/generic/vtimes.c: Likewise. * sysdeps/posix/cuserid.c: Likewise. * sysdeps/posix/euidaccess.c: Likewise. * sysdeps/posix/mkstemp.c: Likewise. * sysdeps/posix/mktemp.c: Likewise. * sysdeps/posix/pread.c: Likewise. * sysdeps/posix/pread64.c: Likewise. * sysdeps/posix/profil.c: Likewise. * sysdeps/posix/pwrite.c: Likewise. * sysdeps/posix/pwrite64.c: Likewise. * sysdeps/posix/sigblock.c: Likewise. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/posix/waitid.c: Likewise. * sysdeps/unix/getlogin_r.c: Likewise. * sysdeps/unix/grantpt.c: Likewise. * sysdeps/unix/rewinddir.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * sysdeps/unix/sysv/linux/getpt.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/ptsname.c: Likewise. * sysdeps/unix/sysv/linux/sendmsg.c: Likewise. * sysdeps/unix/sysv/linux/statvfs.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise. * sysdeps/unix/sysv/linux/ulimit.c: Likewise. * sysdeps/unix/sysv/linux/unlockpt.c: Likewise. * sysvipc/sys/shm.h: Likewise. * time/ctime_r.c: Likewise. * time/strptime.c: Likewise. * wcsmbs/mbrlen.c: Likewise. * wcsmbs/wcsdup.c: Likewise. * wcsmbs/wcsxfrm.c: Likewise. * wctype/wcfuncs.c: Likewise. * sysdeps/unix/sysv/linux/i386/socker.S: Change to honor NO_WEAK_ALIAS. * sysdeps/unix/sysv/linux/accept.S: Don't generate __ name. * sysdeps/unix/sysv/linux/bind.S: Likewise. * sysdeps/unix/sysv/linux/getsockname.S: Likewise. * sysdeps/unix/sysv/linux/listen.S: Likewise. * sysdeps/unix/sysv/linux/recvfrom.S: Likewise. * sysdeps/unix/sysv/linux/sendto.S: Likewise. * sysdeps/unix/sysv/linux/setsockopt.S: Likewise. * grp/fgetgrent_r.c: Use explicit locking of the stream. * elf/Makefile (rtld-routines): Add dl-environ. * sysdeps/generic/dl-environ.c: New file. * libio/Makefile [REENTRANT] (routines): Add iofputs_u. * libio/Versions: Add fputs_unlocked. * libio/iofputs_u.c: New file. * libio/stdio.h: Add prototype for fputs_unlocked. * sunrpc/rpc/auth.h: Use __PMT instead of __P in type definitions. * sunrpc/rpc/clnt.h: Likewise. * sunrpc/rpc/pmap_clnt.h: Likewise. * sunrpc/rpc/svc.h: Likewise. * sunrpc/rpc/xdr.h: Likewise. * sysdeps/i386/memchr.S: Correct for more strict gas. * sysdeps/i386/fpu/bits/mathinline.h: Likewise. * sysdeps/libm-i387/i686/s_fdim.S: Likewise. * sysdeps/libm-i387/i686/s_fdimf.S: Likewise. * sysdeps/libm-i387/i686/s_fdiml.S: Likewise. 1998-07-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * configure.in: Change message for binutils version from 2.8.1.0.17->2.8.1.0.23. 1998-07-15 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h: Define LOC. Patch by John Tobey <jtobey@banta-im.com>.
Diffstat (limited to 'nscd')
-rw-r--r--nscd/nscd_getgr_r.c44
-rw-r--r--nscd/nscd_getpw_r.c24
2 files changed, 34 insertions, 34 deletions
diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c
index decfa3d..ec4b8f2 100644
--- a/nscd/nscd_getgr_r.c
+++ b/nscd/nscd_getgr_r.c
@@ -82,7 +82,7 @@ nscd_open_socket (void)
strcpy (addr.sun_path, _PATH_NSCDSOCKET);
if (__connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0)
{
- close (sock);
+ __close (sock);
__set_errno (saved_errno);
return -1;
}
@@ -108,31 +108,31 @@ __nscd_getgr_r (const char *key, request_type type, struct group *resultbuf,
req.version = NSCD_VERSION;
req.type = type;
req.key_len = strlen (key);
- nbytes = write (sock, &req, sizeof (request_header));
+ nbytes = __write (sock, &req, sizeof (request_header));
if (nbytes != sizeof (request_header))
{
- close (sock);
+ __close (sock);
return 1;
}
- nbytes = write (sock, key, req.key_len);
+ nbytes = __write (sock, key, req.key_len);
if (nbytes != req.key_len)
{
- close (sock);
+ __close (sock);
return 1;
}
- nbytes = read (sock, &gr_resp, sizeof (gr_response_header));
+ nbytes = __read (sock, &gr_resp, sizeof (gr_response_header));
if (nbytes != sizeof (gr_response_header))
{
- close (sock);
+ __close (sock);
return 1;
}
if (gr_resp.found == -1)
{
/* The daemon does not cache this database. */
- close (sock);
+ __close (sock);
__nss_not_use_nscd_group = 1;
return 1;
}
@@ -145,16 +145,16 @@ __nscd_getgr_r (const char *key, request_type type, struct group *resultbuf,
if (buflen < gr_resp.gr_name_len + 1)
{
__set_errno (ERANGE);
- close (sock);
+ __close (sock);
return -1;
}
resultbuf->gr_name = p;
p += gr_resp.gr_name_len + 1;
buflen -= (gr_resp.gr_name_len + 1);
- nbytes = read (sock, resultbuf->gr_name, gr_resp.gr_name_len);
+ nbytes = __read (sock, resultbuf->gr_name, gr_resp.gr_name_len);
if (nbytes != gr_resp.gr_name_len)
{
- close (sock);
+ __close (sock);
return 1;
}
resultbuf->gr_name[gr_resp.gr_name_len] = '\0';
@@ -162,16 +162,16 @@ __nscd_getgr_r (const char *key, request_type type, struct group *resultbuf,
if (buflen < gr_resp.gr_passwd_len + 1)
{
__set_errno (ERANGE);
- close (sock);
+ __close (sock);
return -1;
}
resultbuf->gr_passwd = p;
p += gr_resp.gr_passwd_len + 1;
buflen -= (gr_resp.gr_passwd_len + 1);
- nbytes = read (sock, resultbuf->gr_passwd, gr_resp.gr_passwd_len);
+ nbytes = __read (sock, resultbuf->gr_passwd, gr_resp.gr_passwd_len);
if (nbytes != gr_resp.gr_passwd_len)
{
- close (sock);
+ __close (sock);
return 1;
}
resultbuf->gr_passwd[gr_resp.gr_passwd_len] = '\0';
@@ -181,7 +181,7 @@ __nscd_getgr_r (const char *key, request_type type, struct group *resultbuf,
if (buflen < ((gr_resp.gr_mem_len + 1) * sizeof (char *)))
{
__set_errno (ERANGE);
- close (sock);
+ __close (sock);
return -1;
}
resultbuf->gr_mem = (char **)p;
@@ -193,36 +193,36 @@ __nscd_getgr_r (const char *key, request_type type, struct group *resultbuf,
for (i = 0; i < gr_resp.gr_mem_len; ++i)
{
size_t len;
- nbytes = read (sock, &len, sizeof (len));
+ nbytes = __read (sock, &len, sizeof (len));
if (nbytes != sizeof (len))
{
- close (sock);
+ __close (sock);
return 1;
}
if (buflen < (len + 1))
{
__set_errno (ERANGE);
- close (sock);
+ __close (sock);
return -1;
}
resultbuf->gr_mem[i] = p;
p += len + 1;
buflen -= (len + 1);
- nbytes = read (sock, resultbuf->gr_mem[i], len);
+ nbytes = __read (sock, resultbuf->gr_mem[i], len);
resultbuf->gr_mem[i][len] = '\0';
if (nbytes != len)
{
- close (sock);
+ __close (sock);
return 1;
}
}
- close (sock);
+ __close (sock);
return 0;
}
else
{
- close (sock);
+ __close (sock);
return -1;
}
}
diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c
index d075c85..a24d33b 100644
--- a/nscd/nscd_getpw_r.c
+++ b/nscd/nscd_getpw_r.c
@@ -82,7 +82,7 @@ nscd_open_socket (void)
strcpy (addr.sun_path, _PATH_NSCDSOCKET);
if (__connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0)
{
- close (sock);
+ __close (sock);
__set_errno (saved_errno);
return -1;
}
@@ -108,31 +108,31 @@ __nscd_getpw_r (const char *key, request_type type, struct passwd *resultbuf,
req.version = NSCD_VERSION;
req.type = type;
req.key_len = strlen (key);
- nbytes = write (sock, &req, sizeof (request_header));
+ nbytes = __write (sock, &req, sizeof (request_header));
if (nbytes != sizeof (request_header))
{
- close (sock);
+ __close (sock);
return 1;
}
- nbytes = write (sock, key, req.key_len);
+ nbytes = __write (sock, key, req.key_len);
if (nbytes != req.key_len)
{
- close (sock);
+ __close (sock);
return 1;
}
- nbytes = read (sock, &pw_resp, sizeof (pw_response_header));
+ nbytes = __read (sock, &pw_resp, sizeof (pw_response_header));
if (nbytes != sizeof (pw_response_header))
{
- close (sock);
+ __close (sock);
return 1;
}
if (pw_resp.found == -1)
{
/* The daemon does not cache this database. */
- close (sock);
+ __close (sock);
__nss_not_use_nscd_passwd = 1;
return 1;
}
@@ -147,7 +147,7 @@ __nscd_getpw_r (const char *key, request_type type, struct passwd *resultbuf,
+ pw_resp.pw_shell_len + 1))
{
__set_errno (ERANGE);
- close (sock);
+ __close (sock);
return -1;
}
@@ -182,7 +182,7 @@ __nscd_getpw_r (const char *key, request_type type, struct passwd *resultbuf,
+ pw_resp.pw_gecos_len + pw_resp.pw_dir_len
+ pw_resp.pw_shell_len))
{
- close (sock);
+ __close (sock);
return 1;
}
@@ -199,12 +199,12 @@ __nscd_getpw_r (const char *key, request_type type, struct passwd *resultbuf,
resultbuf->pw_shell = vec[4].iov_base;
resultbuf->pw_shell[pw_resp.pw_shell_len] = '\0';
- close (sock);
+ __close (sock);
return 0;
}
else
{
- close (sock);
+ __close (sock);
return -1;
}
}