From 9c2322bc08c01e34c7488ef12c1d1bf26097190b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 8 Jul 1997 00:44:35 +0000 Subject: Update. 1997-07-08 02:18 Ulrich Drepper * 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 . * 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 . --- nss/libnss_files.map | 1 + nss/nss_files/files-netgrp.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nss') 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 , 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)) -- cgit 1.4.1