Fix allocation size to include length of PROTO.

[kopensolaris-gnu/glibc.git] / nss / nss_files / files-service.c

diff --git a/nss/nss_files/files-service.c b/nss/nss_files/files-service.c
index f0dba50..186b8a2 100644 (file)
--- a/nss/nss_files/files-service.c
+++ b/nss/nss_files/files-service.c
@@ -1,28 +1,28 @@
 /* Services file parser in nss_files module.
-Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <netinet/in.h>
 #include <netdb.h>
 
 
 #define ENTNAME                servent
-#define DATAFILE       _PATH_SERVICES
+#define DATABASE       "services"
 
 struct servent_data {};
 
@@ -37,14 +37,22 @@ LINE_PARSER
  STRING_FIELD (result->s_proto, isspace, 1);
  )
 
-#include "files-XXX.c"
+#include GENERIC
 
-DB_LOOKUP (servbyname,
-          LOOKUP_NAME (s_name, s_aliases),
-          const char *name)
-
-DB_LOOKUP (servbyport,
+DB_LOOKUP (servbyname, 2 + strlen (name) + strlen (proto),
+          (".%s/%s", name, proto),
+          {
+            /* Must match both protocol (if specified) and name.  */
+            if (proto != NULL && strcmp (result->s_proto, proto))
+              continue;
+            LOOKUP_NAME (s_name, s_aliases)
+          },
+          const char *name, const char *proto)
+
+DB_LOOKUP (servbyport, 21 + strlen (proto), ("=%d/%s", port, proto),
           {
-            if (result->s_port == port)
+            /* Must match both port and protocol.  */
+            if (result->s_port == port
+                && strcmp (result->s_proto, proto) == 0)
               break;
-          }, int port)
+          }, int port, const char *proto)