diff options
author | casper <none@none> | 2006-05-01 11:23:49 -0700 |
---|---|---|
committer | casper <none@none> | 2006-05-01 11:23:49 -0700 |
commit | 004388ebfdfe2ed7dfd2d153a876dfcc22d2c006 (patch) | |
tree | 9f3972760e2696f63065521871e50e1440bfbb75 /usr/src/lib/libnsl/rpc/netnamer.c | |
parent | 0ade2cf005fcaecc5255dacf7d76683de855a9da (diff) | |
download | illumos-joyent-004388ebfdfe2ed7dfd2d153a876dfcc22d2c006.tar.gz |
4916205 libcmd should not use file operation routines from C library
6234782 Kerberos and GSSAPI should not use fopen
6259671 vold won't be killed by TERM signal when several removable devices are managed
6386770 pam_authenticate can fail if open files are >= 255 and the soft fd limit is greater than 256
6414401 Remove shadow stdio implementation obsoleted by PSARC 2006/162
6414404 __rpc_openchild never called and not exported by library
6416815 ON needs to be hardened against the 32-bit fopen/255 problem
--HG--
rename : usr/src/lib/libnsl/common/nsl_stdio_prv.c => deleted_files/usr/src/lib/libnsl/common/nsl_stdio_prv.c
rename : usr/src/lib/libnsl/include/nsl_stdio_prv.h => deleted_files/usr/src/lib/libnsl/include/nsl_stdio_prv.h
rename : usr/src/lib/libnsl/rpc/openchild.c => deleted_files/usr/src/lib/libnsl/rpc/openchild.c
rename : usr/src/lib/libnsl/rpc/xdr_stdio_prv.c => deleted_files/usr/src/lib/libnsl/rpc/xdr_stdio_prv.c
rename : usr/src/lib/libresolv2/req.flg => deleted_files/usr/src/lib/libresolv2/req.flg
rename : usr/src/lib/nsswitch/compat/req.flg => deleted_files/usr/src/lib/nsswitch/compat/req.flg
rename : usr/src/lib/nsswitch/files/req.flg => deleted_files/usr/src/lib/nsswitch/files/req.flg
rename : usr/src/lib/nsswitch/req.flg => deleted_files/usr/src/lib/nsswitch/req.flg
rename : usr/src/lib/nsswitch/user/req.flg => deleted_files/usr/src/lib/nsswitch/user/req.flg
Diffstat (limited to 'usr/src/lib/libnsl/rpc/netnamer.c')
-rw-r--r-- | usr/src/lib/libnsl/rpc/netnamer.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/usr/src/lib/libnsl/rpc/netnamer.c b/usr/src/lib/libnsl/rpc/netnamer.c index 38f964ca44..ee54f94151 100644 --- a/usr/src/lib/libnsl/rpc/netnamer.c +++ b/usr/src/lib/libnsl/rpc/netnamer.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -21,7 +20,7 @@ */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -64,7 +63,6 @@ #include <rpc/rpc.h> #include <rpcsvc/nis.h> #include <rpcsvc/ypclnt.h> -#include "nsl_stdio_prv.h" #include <nss_dbdefs.h> static const char OPSYS[] = "unix"; @@ -218,10 +216,10 @@ netname2user_files(int *err, char *netname, struct netid_userdata *argp) char *name; char *value; char *res; - __NSL_FILE *fd; + FILE *fd; - fd = __nsl_fopen(NETIDFILE, "r"); - if (fd == (__NSL_FILE *)0) { + fd = fopen(NETIDFILE, "rF"); + if (fd == NULL) { *err = __NSW_UNAVAIL; return (0); } @@ -231,8 +229,8 @@ netname2user_files(int *err, char *netname, struct netid_userdata *argp) * netid uid:grp,grp,grp # for users * netid 0:hostname # for hosts */ - while (!__nsl_feof(fd)) { - res = __nsl_fgets(buf, 512, fd); + while (!feof(fd)) { + res = fgets(buf, 512, fd); if (res == NULL) break; @@ -257,14 +255,14 @@ netname2user_files(int *err, char *netname, struct netid_userdata *argp) *value++ = '\0'; /* nul terminate the name */ if (strcasecmp(name, netname) == 0) { - (void) __nsl_fclose(fd); + (void) fclose(fd); while (isspace(*value)) value++; *err = parse_netid_str(value, argp); return (*err == __NSW_SUCCESS); } } - (void) __nsl_fclose(fd); + (void) fclose(fd); *err = __NSW_NOTFOUND; return (0); } |