summaryrefslogtreecommitdiff
path: root/usr/src/lib/nsswitch/files/common/files_common.c
diff options
context:
space:
mode:
authorcasper <none@none>2006-05-01 11:23:49 -0700
committercasper <none@none>2006-05-01 11:23:49 -0700
commit004388ebfdfe2ed7dfd2d153a876dfcc22d2c006 (patch)
tree9f3972760e2696f63065521871e50e1440bfbb75 /usr/src/lib/nsswitch/files/common/files_common.c
parent0ade2cf005fcaecc5255dacf7d76683de855a9da (diff)
downloadillumos-gate-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/nsswitch/files/common/files_common.c')
-rw-r--r--usr/src/lib/nsswitch/files/common/files_common.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/usr/src/lib/nsswitch/files/common/files_common.c b/usr/src/lib/nsswitch/files/common/files_common.c
index 2a8c30bc43..bdf03a3ca9 100644
--- a/usr/src/lib/nsswitch/files/common/files_common.c
+++ b/usr/src/lib/nsswitch/files/common/files_common.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.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 1995-2003 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*
* Common code and structures used by name-service-switch "files" backends.
@@ -54,11 +53,11 @@ _nss_files_setent(be, dummy)
/* Backend isn't initialized properly? */
return (NSS_UNAVAIL);
}
- if ((be->f = __nsl_fopen(be->filename, "r")) == 0) {
+ if ((be->f = fopen(be->filename, "rF")) == 0) {
return (NSS_UNAVAIL);
}
} else {
- __nsl_rewind(be->f);
+ rewind(be->f);
}
return (NSS_SUCCESS);
}
@@ -70,7 +69,7 @@ _nss_files_endent(be, dummy)
void *dummy;
{
if (be->f != 0) {
- __nsl_fclose(be->f);
+ fclose(be->f);
be->f = 0;
}
if (be->buf != 0) {
@@ -93,7 +92,7 @@ _nss_files_endent(be, dummy)
*/
int
_nss_files_read_line(f, buffer, buflen)
- __NSL_FILE *f;
+ FILE *f;
char *buffer;
int buflen;
{
@@ -104,7 +103,7 @@ _nss_files_read_line(f, buffer, buflen)
while (1) {
linelen = 0;
while (linelen < buflen - 1) { /* "- 1" saves room for \n\0 */
- switch (c = __nsl_getc_unlocked(f)) {
+ switch (c = getc_unlocked(f)) {
case EOF:
if (linelen == 0 ||
buffer[linelen - 1] == '\\') {
@@ -131,7 +130,7 @@ _nss_files_read_line(f, buffer, buflen)
/* Buffer overflow -- eat rest of line and loop again */
/* ===> Should syslog() */
do {
- c = __nsl_getc_unlocked(f);
+ c = getc_unlocked(f);
if (c == EOF) {
return (-1);
}