1 files changed, 24 insertions, 2 deletions

diff --git a/src/lib/libc/net/getservbyname.c b/src/lib/libc/net/getservbyname.c
index 25f0e27d06..7375c89404 100644
--- a/src/lib/libc/net/getservbyname.c
+++ b/src/lib/libc/net/getservbyname.c
@@ -32,21 +32,28 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getservbyname.c,v 1.3 1997/07/09 01:08:34 millert Exp $";
+static char rcsid[] = "$OpenBSD: getservbyname.c,v 1.4 1998/11/20 11:18:44 d Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <netdb.h>
 #include <string.h>
+#include "thread_private.h"
 
 extern int _serv_stayopen;
 
+_THREAD_PRIVATE_MUTEX(getservbyname_r)
+
 struct servent *
-getservbyname(name, proto)
+getservbyname_r(name, proto, se, buf, buflen)
         const char *name, *proto;
+        struct servent *se;
+        char *buf;
+        int buflen;
 {
         register struct servent *p;
         register char **cp;
 
+        _THREAD_PRIVATE_MUTEX_LOCK(getservbyname_r);
         setservent(_serv_stayopen);
         while ((p = getservent())) {
                 if (strcmp(name, p->s_name) == 0)
@@ -61,5 +68,20 @@ gotname:
         }
         if (!_serv_stayopen)
                 endservent();
+        _THREAD_PRIVATE_MUTEX_UNLOCK(getservbyname_r);
         return (p);
 }
+
+struct servent *getservbyname(name, proto)
+        const char *name, *proto;
+{
+        _THREAD_PRIVATE_KEY(getservbyname)
+        static char buf[4096];
+        char *bufp = (char*)_THREAD_PRIVATE(getservbyname, buf, NULL);
+
+        if (bufp == NULL)
+                return (NULL);
+        return getservbyname_r(name, proto, (struct servent*) bufp, 
+                bufp + sizeof(struct servent), 
+                sizeof buf - sizeof(struct servent) );
+}