summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-04-04 08:14:00 +0000
committerUlrich Drepper <drepper@redhat.com>2001-04-04 08:14:00 +0000
commited40d9c0016b30ae08917be563256d714f1510be (patch)
treefa79186615133720078e43f4b063b796afe3bc92
parent754f65763937c4ebb03dc8a2f4d6eb6f7bd67be2 (diff)
downloadglibc-ed40d9c0016b30ae08917be563256d714f1510be.tar.gz
glibc-ed40d9c0016b30ae08917be563256d714f1510be.tar.xz
glibc-ed40d9c0016b30ae08917be563256d714f1510be.zip
Update.
2001-04-04  Ulrich Drepper  <drepper@redhat.com>

	* nis/nss_nis/nis-service.c (_nss_nis_getservbyname_r): Pass
	pointer to int as last parameter of yp_match.
	Patch by kanazawa@flab.fujitsu.co.jp.
-rw-r--r--ChangeLog6
-rw-r--r--nis/nss_nis/nis-service.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f3baabbf8a..81aa465167 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-04  Ulrich Drepper  <drepper@redhat.com>
+
+	* nis/nss_nis/nis-service.c (_nss_nis_getservbyname_r): Pass
+	pointer to int as last parameter of yp_match.
+	Patch by kanazawa@flab.fujitsu.co.jp.
+
 2001-04-03  Ulrich Drepper  <drepper@redhat.com>
 
 	* resolv/netdb.h (gai_strerror): Make return value const.
diff --git a/nis/nss_nis/nis-service.c b/nis/nss_nis/nis-service.c
index ea1e06eab3..a161aa1128 100644
--- a/nis/nss_nis/nis-service.c
+++ b/nis/nss_nis/nis-service.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
 
@@ -228,6 +228,7 @@ _nss_nis_getservbyname_r (const char *name, const char *protocol,
       char key[strlen (name) + strlen (protocol) + 2];
       char *cp, *domain, *result;
       size_t keylen, len;
+      int int_len;
 
       /* If this fails, the other solution will also fail. */
       if (yp_get_default_domain (&domain))
@@ -239,7 +240,8 @@ _nss_nis_getservbyname_r (const char *name, const char *protocol,
       stpcpy (cp, protocol);
       keylen = strlen (key);
       status = yperr2nss (yp_match (domain, "services.byservicename", key,
-				    keylen, &result, &len));
+				    keylen, &result, &int_len));
+      len = int_len;
 
       /* If we found the key, it's ok and parse the result. If not,
 	 fall through and parse the complete table. */