update from main archive 961201

[platform/upstream/glibc.git] / sunrpc / clnt_gen.c

diff --git a/sunrpc/clnt_gen.c b/sunrpc/clnt_gen.c
index e54e778..d7b949c 100644 (file)
--- a/sunrpc/clnt_gen.c
+++ b/sunrpc/clnt_gen.c
@@ -6,11 +6,11 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
@@ -18,11 +18,11 @@
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -33,6 +33,8 @@ static char sccsid[] = "@(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";
 /*
  * Copyright (C) 1987, Sun Microsystems, Inc.
  */
+#include <alloca.h>
+#include <errno.h>
 #include <rpc/rpc.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
@@ -40,7 +42,7 @@ static char sccsid[] = "@(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";
 
 /*
  * Generic client creation: takes (hostname, program-number, protocol) and
- * returns client handle. Default options are set, which the user can 
+ * returns client handle. Default options are set, which the user can
  * change using the rpc equivalent of ioctl()'s.
  */
 CLIENT *
@@ -50,36 +52,64 @@ clnt_create(hostname, prog, vers, proto)
        unsigned vers;
        char *proto;
 {
-       struct hostent *h;
-       struct protoent *p;
+       struct hostent hostbuf, *h;
+       size_t hstbuflen;
+       char *hsttmpbuf;
+       struct protoent protobuf, *p;
+       size_t prtbuflen;
+       char *prttmpbuf;
        struct sockaddr_in sin;
        int sock;
        struct timeval tv;
        CLIENT *client;
+       int herr;
+
+       hstbuflen = 1024;
+       hsttmpbuf = __alloca (hstbuflen);
+       while (__gethostbyname_r (hostname, &hostbuf, hsttmpbuf, hstbuflen,
+                                 &h, &herr) < 0)
+         if (herr != NETDB_INTERNAL || errno != ERANGE)
+           {
+             rpc_createerr.cf_stat = RPC_UNKNOWNHOST;
+             return NULL;
+           }
+         else
+           {
+             /* Enlarge the buffer.  */
+             hstbuflen *= 2;
+             hsttmpbuf = __alloca (hstbuflen);
+           }
 
-       h = gethostbyname(hostname);
-       if (h == NULL) {
-               rpc_createerr.cf_stat = RPC_UNKNOWNHOST;
-               return (NULL);
-       }
        if (h->h_addrtype != AF_INET) {
                /*
                 * Only support INET for now
                 */
                rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-               rpc_createerr.cf_error.re_errno = EAFNOSUPPORT; 
+               rpc_createerr.cf_error.re_errno = EAFNOSUPPORT;
                return (NULL);
        }
        sin.sin_family = h->h_addrtype;
        sin.sin_port = 0;
        bzero(sin.sin_zero, sizeof(sin.sin_zero));
        bcopy(h->h_addr, (char*)&sin.sin_addr, h->h_length);
-       p = getprotobyname(proto);
-       if (p == NULL) {
-               rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-               rpc_createerr.cf_error.re_errno = EPFNOSUPPORT; 
-               return (NULL);
-       }
+
+       prtbuflen = 1024;
+       prttmpbuf = __alloca (prtbuflen);
+       while (__getprotobyname_r (proto, &protobuf, prttmpbuf, prtbuflen, &p)
+              < 0)
+         if (errno != ERANGE)
+           {
+             rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
+             rpc_createerr.cf_error.re_errno = EPFNOSUPPORT;
+             return NULL;
+           }
+         else
+           {
+             /* Enlarge the buffer.  */
+             prtbuflen *= 2;
+             prttmpbuf = __alloca (prtbuflen);
+           }
+
        sock = RPC_ANYSOCK;
        switch (p->p_proto) {
        case IPPROTO_UDP:
@@ -103,7 +133,7 @@ clnt_create(hostname, prog, vers, proto)
                break;
        default:
                rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-               rpc_createerr.cf_error.re_errno = EPFNOSUPPORT; 
+               rpc_createerr.cf_error.re_errno = EPFNOSUPPORT;
                return (NULL);
        }
        return (client);