aboutsummaryrefslogtreecommitdiff
path: root/nscd/nscd_getpw_r.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-04-22 19:52:59 +0000
committerUlrich Drepper <drepper@redhat.com>2003-04-22 19:52:59 +0000
commit4c5dd2a2071c60eaa2d36f8a000fb90a5a5a5813 (patch)
treec649760d18479be11f0d3f74aafffcfe906405e4 /nscd/nscd_getpw_r.c
parentdc2f6455a41f635a6388c2ca4435ecc0d89251fd (diff)
downloadglibc-4c5dd2a2071c60eaa2d36f8a000fb90a5a5a5813.tar
glibc-4c5dd2a2071c60eaa2d36f8a000fb90a5a5a5813.tar.gz
glibc-4c5dd2a2071c60eaa2d36f8a000fb90a5a5a5813.tar.bz2
glibc-4c5dd2a2071c60eaa2d36f8a000fb90a5a5a5813.zip
Update.
2003-04-22 Ulrich Drepper <drepper@redhat.com> * nscd/nscd-client.h: Add declaration for __nscd_open_socket. * nscd/nscd_gethst_r.c (__nscd_open_socket): Renamed from open_socket. Not static anymore. (nscd_gethst_r): Use __nscd_open_socket. * nscd/nscd_getgr_r.c (open_socket): Removed. (nscd_getgr_r): Use __nscd_open_socket. * nscd/nscd_getpw_r.c (open_socket): Removed. (nscd_getpw_r): Use __nscd_open_socket. * nscd/nscd.c (main): Change type of fdn to long int and use strtol. * nscd/connections.c (handle_request): Add cast to avoid warning.
Diffstat (limited to 'nscd/nscd_getpw_r.c')
-rw-r--r--nscd/nscd_getpw_r.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c
index 7e7ed619c8..abd059e539 100644
--- a/nscd/nscd_getpw_r.c
+++ b/nscd/nscd_getpw_r.c
@@ -60,39 +60,13 @@ __nscd_getpwuid_r (uid_t uid, struct passwd *resultbuf, char *buffer,
return nscd_getpw_r (buf, n, GETPWBYUID, resultbuf, buffer, buflen);
}
-/* Create a socket connected to a name. */
-static int
-open_socket (void)
-{
- struct sockaddr_un addr;
- int sock;
- int saved_errno = errno;
-
- sock = __socket (PF_UNIX, SOCK_STREAM, 0);
- if (sock < 0)
- {
- __set_errno (saved_errno);
- return -1;
- }
-
- addr.sun_family = AF_UNIX;
- strcpy (addr.sun_path, _PATH_NSCDSOCKET);
- if (__connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0)
- {
- __close (sock);
- __set_errno (saved_errno);
- return -1;
- }
-
- return sock;
-}
static int
internal_function
nscd_getpw_r (const char *key, size_t keylen, request_type type,
struct passwd *resultbuf, char *buffer, size_t buflen)
{
- int sock = open_socket ();
+ int sock = __nscd_open_socket ();
request_header req;
pw_response_header pw_resp;
ssize_t nbytes;