aboutsummaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
Diffstat (limited to 'nss')
-rw-r--r--nss/Makefile11
-rw-r--r--nss/ethers-lookup.c22
-rw-r--r--nss/getXXent_r.c4
-rw-r--r--nss/nss_files/files-XXX.c21
-rw-r--r--nss/nss_files/files-ethers.c73
5 files changed, 115 insertions, 16 deletions
diff --git a/nss/Makefile b/nss/Makefile
index 91c4ef7380..bdf1651bb1 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -25,10 +25,10 @@ distribute := nsswitch.h XXX-lookup.c getXXbyYY.c getXXbyYY_r.c \
getXXent.c getXXent_r.c
# This is the trivial part which goes into libc itself.
-routines := nsswitch \
- $(addsuffix -lookup,proto service host network \
- grp pwd rpc)
+routines = nsswitch $(addsuffix -lookup,$(databases))
+# These are the databases that go through nss dispatch.
+databases = proto service host network grp pwd rpc ethers
# Specify rules for the nss_* modules. We have some services.
services := files dns
@@ -36,12 +36,11 @@ services := files dns
extra-libs = $(services:%=libnss_%)
# The sources are found in the appropriate subdir.
-subdir-dirs = nss_files nss_dns
+subdir-dirs = $(services:%=nss_%)
vpath %.c $(subdir-dirs)
-libnss_files-routines := files-proto files-service files-network \
- files-hosts files-grp files-pwd files-rpc
+libnss_files-routines := $(addprefix files-,$(databases))
distribute += files-XXX.c files-parse.c
libnss_dns-routines := dns-host dns-network
diff --git a/nss/ethers-lookup.c b/nss/ethers-lookup.c
new file mode 100644
index 0000000000..7746781a0c
--- /dev/null
+++ b/nss/ethers-lookup.c
@@ -0,0 +1,22 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+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.
+
+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. */
+
+#define DATABASE_NAME ethers
+
+#include "XXX-lookup.c"
diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c
index 3d1e9593e6..07e575997a 100644
--- a/nss/getXXent_r.c
+++ b/nss/getXXent_r.c
@@ -101,7 +101,7 @@ extern int DB_LOOKUP_FCT (service_user **nip, const char *name, void **fctp);
void
-APPEND_R (SETFUNC_NAME) (STAYOPEN)
+SETFUNC_NAME (STAYOPEN)
{
set_function fct;
int no_more;
@@ -138,7 +138,7 @@ APPEND_R (SETFUNC_NAME) (STAYOPEN)
void
-APPEND_R (ENDFUNC_NAME) (void)
+ENDFUNC_NAME (void)
{
end_function fct;
int no_more;
diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c
index 40bb7df81e..7291c75d84 100644
--- a/nss/nss_files/files-XXX.c
+++ b/nss/nss_files/files-XXX.c
@@ -102,9 +102,6 @@ internal_endent (void)
fclose (stream);
stream = NULL;
}
-
- /* Reset STAYOPEN flag. */
- keep_stream = 0;
}
@@ -116,6 +113,9 @@ CONCAT(_nss_files_end,ENTNAME) (void)
internal_endent ();
+ /* Reset STAYOPEN flag. */
+ keep_stream = 0;
+
__libc_lock_unlock (lock);
return NSS_STATUS_SUCCESS;
@@ -131,15 +131,17 @@ internal_getent (struct STRUCTURE *result,
struct parser_data *data = (void *) buffer;
int linebuflen = buffer + buflen - data->linebuffer;
- /* Someone called internal_setent before calling us, so if the
- stream is not open now the file could not be opened. */
+ /* Be prepared that the set*ent function was not called before. */
if (stream == NULL)
{
- H_ERRNO_SET (NETDB_INTERNAL);
- return NSS_STATUS_UNAVAIL;
+ enum nss_status status;
+
+ status = internal_setent (0);
+ if (status != NSS_STATUS_SUCCESS)
+ return status;
}
- if (buflen < sizeof *data + 1)
+ if (buflen < (int) sizeof *data + 1)
{
errno = ERANGE;
return NSS_STATUS_NOTFOUND;
@@ -155,6 +157,9 @@ internal_getent (struct STRUCTURE *result,
return NSS_STATUS_NOTFOUND;
}
+ /* Terminate the line for any case. */
+ data->linebuffer[linebuflen - 1] = '\0';
+
/* Skip leading blanks. */
while (isspace (*p))
++p;
diff --git a/nss/nss_files/files-ethers.c b/nss/nss_files/files-ethers.c
new file mode 100644
index 0000000000..e7579a48bc
--- /dev/null
+++ b/nss/nss_files/files-ethers.c
@@ -0,0 +1,73 @@
+/* Copyright (C) 1996 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 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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
+
+#include <string.h>
+#include <netinet/if_ether.h>
+
+/* Because the `ethers' lookup does not fit so well in the scheme so
+ we define a dummy struct here which helps us to use the available
+ functions. */
+struct etherent
+{
+ const char *e_name;
+ struct ether_addr e_addr;
+};
+struct etherent_data {};
+
+#define ENTNAME etherent
+#define DATAFILE "/etc/ethers"
+#include "files-parse.c"
+LINE_PARSER
+(
+ MIDLINE_COMMENTS;
+ /* Read the ethernet address: 6 x 8bit hexadecimal number. */
+ {
+ size_t cnt;
+
+ for (cnt = 0; cnt < 6; ++cnt)
+ {
+ unsigned int number;
+
+ if (cnt < 5)
+ INT_FIELD (number, ISCOLON , 0, 16, (unsigned int))
+ else
+ INT_FIELD (number, isspace, 0, 16, (unsigned int))
+
+ if (number > 0xff)
+ return 0;
+ result->e_addr.ether_addr_octet[cnt] = number;
+ }
+ };
+ STRING_FIELD (result->e_name, isspace, 1);
+ )
+
+
+#include "files-XXX.c"
+
+DB_LOOKUP (hostton,
+ {
+ if (strcmp (result->e_name, name) == 0)
+ break;
+ }, const char *name)
+
+DB_LOOKUP (ntohost,
+ {
+ if (memcmp (&result->e_addr, addr,
+ sizeof (struct ether_addr)) == 0)
+ break;
+ }, struct ether_addr *addr)