aboutsummaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-07-08 00:44:35 +0000
committerUlrich Drepper <drepper@redhat.com>1997-07-08 00:44:35 +0000
commit9c2322bc08c01e34c7488ef12c1d1bf26097190b (patch)
treeec433de31ad6b94ffc5b422c95fcefb9895fd571 /nss
parent762a2918eee55943319f2c81f35257d59450ad5b (diff)
downloadglibc-9c2322bc08c01e34c7488ef12c1d1bf26097190b.tar
glibc-9c2322bc08c01e34c7488ef12c1d1bf26097190b.tar.gz
glibc-9c2322bc08c01e34c7488ef12c1d1bf26097190b.tar.bz2
glibc-9c2322bc08c01e34c7488ef12c1d1bf26097190b.zip
1997-07-08 02:18 Ulrich Drepper <drepper@cygnus.com> * io/lockf.c (lockf): Clear fl before using. Patch by sr@adb.fr. * libio/strops.c: Correctly handle _IO_write_end. * nss/libnss_files.map: Add __nss_netgroup_parseline. * nss/nss_files/files-netgroup.c (_nss_netgroup_parseline): Don't panic if setnetgrent wasn't called before, return error. Patch by Thorsten Kukuk <kukuk@uni-paderborn.de>. * time/mktime.c: Define localtime_r function as my_mktime_localtime_r if locally defined. * time/strftime.c: Define localtime_r function as my_ftime_localtime_r if locally defined. Define tm_diff function as ftime_tm_diff if locally defined. Reported by Richard Stallman <rms@gnu.ai.mit.edu>.
Diffstat (limited to 'nss')
-rw-r--r--nss/libnss_files.map1
-rw-r--r--nss/nss_files/files-netgrp.c5
2 files changed, 3 insertions, 3 deletions
diff --git a/nss/libnss_files.map b/nss/libnss_files.map
index e2c4922c76..de023668f0 100644
--- a/nss/libnss_files.map
+++ b/nss/libnss_files.map
@@ -22,6 +22,7 @@ GLIBC_2.0 {
_nss_files_setgrent; _nss_files_sethostent; _nss_files_setnetent;
_nss_files_setnetgrent; _nss_files_setprotoent; _nss_files_setpwent;
_nss_files_setrpcent; _nss_files_setservent; _nss_files_setspent;
+ __nss_netgroup_parseline;
local:
*;
diff --git a/nss/nss_files/files-netgrp.c b/nss/nss_files/files-netgrp.c
index d9dbf94a19..7552d4c3b1 100644
--- a/nss/nss_files/files-netgrp.c
+++ b/nss/nss_files/files-netgrp.c
@@ -1,5 +1,5 @@
/* Netgroup file parser in nss_files modules.
- Copyright (C) 1996 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -170,8 +170,7 @@ _nss_netgroup_parseline (char **cursor, struct __netgrent *result,
/* Some sanity checks. */
if (cp == NULL)
- /* User bug. setnetgrent() wasn't called before. */
- abort ();
+ return NSS_STATUS_NOTFOUND;
/* First skip leading spaces. */
while (isspace (*cp))