PERFORCE change 95881 for review
soc-bushman
soc-bushman at FreeBSD.org
Sat Apr 22 16:06:20 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=95881
Change 95881 by soc-bushman at soc-bushman_stinger on 2006/04/22 16:05:34
branches integrated
Affected files ...
.. //depot/projects/soc2005/nsswitch_cached/src/etc/defaults/devfs.rules#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/etc/rc.bsdextended#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/include/stdio.h#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/Makefile.inc#5 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/Symbol.map#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/fclose.3#3 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/fcloseall.c#1 branch
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/local.h#5 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mmap.2#6 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/register.hlp#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/usb.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/usbd/Makefile#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/usbd/usbd.8#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/usbd/usbd.c#3 delete
.. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/usbd/usbd.conf.5#3 delete
Differences ...
==== //depot/projects/soc2005/nsswitch_cached/src/etc/defaults/devfs.rules#2 (text+ko) ====
@@ -1,6 +1,6 @@
#
# The following are some default rules for devfs(5) mounts.
-# The format is very simple. Empty lines and lines begining
+# The format is very simple. Empty lines and lines beginning
# with a hash '#' are ignored. If the hash mark occurs anywhere
# other than the beginning of a line, it and any subsequent
# characters will be ignored. A line in between brackets '[]'
@@ -10,10 +10,10 @@
# passed to the devfs(8) command. These will be passed
# "as-is" to the devfs(8) command with the exception that
# any references to other rulesets will be expanded first. These
-# references must include a dollar sign '$' in-front of the
+# references must include a dollar sign '$' in front of the
# name to be expanded properly.
#
-# $FreeBSD: src/etc/defaults/devfs.rules,v 1.3 2004/01/22 20:53:15 cperciva Exp $
+# $FreeBSD: src/etc/defaults/devfs.rules,v 1.4 2006/04/22 13:42:49 brueffer Exp $
#
# Very basic and secure ruleset: Hide everything.
==== //depot/projects/soc2005/nsswitch_cached/src/etc/rc.bsdextended#2 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.bsdextended,v 1.1 2004/09/29 00:12:28 trhodes Exp $
+# $FreeBSD: src/etc/rc.bsdextended,v 1.2 2006/04/22 11:02:44 trhodes Exp $
#
####
@@ -48,34 +48,25 @@
####
# WARNING: recommended reading is the handbook's MAC
-# chapter and the ugidfw(8)
-# manual page. You can lock yourself out of the system
-# very quickly by setting incorrect values here.
+# chapter and the ugidfw(8) manual page. You can
+# lock yourself out of the system very quickly by setting
+# incorrect values here. These are only examples.
####
####
-# Set the value of 'x' to system users. This would be nice but it
-# does not get the \n proper. Work around is used below.
-#x=`awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' /etc/passwd`;
-#l=`awk -F: '($3 >= 1001) && ($3 != 65534) { print $3 }' /etc/passwd`;
-####
-
-####
# Build a generic list of rules here, these should be
# modified before using this script.
-# ugidfw add 1 subject uid USER1 object uid USER2 mode n
-# ugidfw add 2 subject gid USER1 object gid USER2 mode n
#
# For apache to read user files, the ruleadd must give
# it permissions by default.
####
-${CMD} add subject uid 80 object not uid 80 mode rxws;
-${CMD} add subject gid 80 object not gid 80 mode rxws;
+#${CMD} add subject uid 80 object not uid 80 mode rxws;
+#${CMD} add subject gid 80 object not gid 80 mode rxws;
####
# majordomo compat:
#${CMD} add subject uid 54 object not uid 54 mode rxws;
-${CMD} add subject gid 26 object gid 54 mode rxws;
+#${CMD} add subject gid 26 object gid 54 mode rxws;
####
# This is for root:
@@ -83,14 +74,9 @@
${CMD} add subject gid 0 object not gid 0 mode arxws;
####
-# And for mailnull:
-${CMD} add subject uid 26 object not uid 26 mode rxws;
-${CMD} add subject gid 26 object not gid 26 mode rxws;
-
-####
# And for majordomo:
-${CMD} add subject uid 54 object not uid 54 mode rxws;
-${CMD} add subject gid 54 object not gid 54 mode rxws;
+#${CMD} add subject uid 54 object not uid 54 mode rxws;
+#${CMD} add subject gid 54 object not gid 54 mode rxws;
####
# And for bin:
@@ -99,8 +85,8 @@
####
# And for mail/pop:
-${CMD} add subject uid 68 object not uid 68 mode rxws;
-${CMD} add subject gid 6 object not gid 6 mode arxws;
+#${CMD} add subject uid 68 object not uid 68 mode rxws;
+#${CMD} add subject gid 6 object not gid 6 mode arxws;
####
# And for smmsp:
@@ -114,13 +100,13 @@
####
# For cyrus:
-${CMD} add subject uid 60 object not uid 60 mode rxws;
-${CMD} add subject gid 60 object not gid 60 mode rxws;
+#${CMD} add subject uid 60 object not uid 60 mode rxws;
+#${CMD} add subject gid 60 object not gid 60 mode rxws;
####
# For stunnel:
-${CMD} add subject uid 1018 object not uid 1018 mode rxws;
-${CMD} add subject gid 1018 object not gid 1018 mode rxws;
+#${CMD} add subject uid 1018 object not uid 1018 mode rxws;
+#${CMD} add subject gid 1018 object not gid 1018 mode rxws;
####
# For the nobody account:
@@ -136,12 +122,6 @@
done;
####
-# Work around majordomo problem where gid is `4'.
-for x in `awk -F: '($3 >= 1001) && ($3 != 65534) { print $1 }' /etc/passwd`;
- do ${CMD} add subject uid $x object gid 4 mode arwxs;
-done;
-
-####
# Use some script to get a list of users and
# add all users to mode n for all other users. This
# will isolate all users from other user home directories while
==== //depot/projects/soc2005/nsswitch_cached/src/include/stdio.h#3 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)stdio.h 8.5 (Berkeley) 4/29/95
- * $FreeBSD: src/include/stdio.h,v 1.57 2006/01/26 20:53:40 stefanf Exp $
+ * $FreeBSD: src/include/stdio.h,v 1.58 2006/04/22 15:10:11 deischen Exp $
*/
#ifndef _STDIO_H_
@@ -327,6 +327,7 @@
#if __BSD_VISIBLE
int asprintf(char **, const char *, ...) __printflike(2, 3);
char *ctermid_r(char *);
+void fcloseall(void);
char *fgetln(FILE *, size_t *);
__const char *fmtcheck(const char *, const char *) __format_arg(2);
int fpurge(FILE *);
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/Makefile.inc#5 (text+ko) ====
@@ -1,12 +1,12 @@
# @(#)Makefile.inc 8.3 (Berkeley) 4/17/94
-# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.36 2006/03/13 01:14:59 deischen Exp $
+# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.37 2006/04/22 15:09:15 deischen Exp $
# stdio sources
.PATH: ${.CURDIR}/stdio
-SRCS+= _flock_stub.c asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c \
- fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetwln.c \
- fgetws.c \
+SRCS+= _flock_stub.c asprintf.c clrerr.c fclose.c fcloseall.c fdopen.c \
+ feof.c ferror.c fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c \
+ fgetwln.c fgetws.c \
fileno.c findfp.c flags.c fopen.c fprintf.c fpurge.c fputc.c fputs.c \
fputwc.c fputws.c fread.c freopen.c fscanf.c fseek.c fsetpos.c \
ftell.c funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwscanf.c \
@@ -36,6 +36,7 @@
printf.3 putc.3 putwc.3 remove.3 scanf.3 setbuf.3 stdio.3 tmpnam.3 \
ungetc.3 ungetwc.3 wprintf.3 wscanf.3
+MLINKS+=fclose.3 fcloseall.3
MLINKS+=ferror.3 ferror_unlocked.3 \
ferror.3 clearerr.3 ferror.3 clearerr_unlocked.3 \
ferror.3 feof.3 ferror.3 feof_unlocked.3 \
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/Symbol.map#3 (text) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.2 2006/03/30 04:37:08 deischen Exp $
+# $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.4 2006/04/22 15:11:33 deischen Exp $
FBSD_1.0 {
flockfile;
@@ -7,6 +7,7 @@
asprintf;
clearerr;
fclose;
+ fcloseall;
fdopen;
feof;
ferror;
@@ -135,7 +136,6 @@
};
FBSDprivate {
- _cleanup; # To be replaced with fcloseall().
_flockfile;
_flockfile_debug_stub;
_flockfile_debug;
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/fclose.3#3 (text+ko) ====
@@ -34,13 +34,14 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)fclose.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdio/fclose.3,v 1.12 2002/12/18 12:45:10 ru Exp $
+.\" $FreeBSD: src/lib/libc/stdio/fclose.3,v 1.13 2006/04/22 15:09:15 deischen Exp $
.\"
.Dd June 4, 1993
.Dt FCLOSE 3
.Os
.Sh NAME
-.Nm fclose
+.Nm fclose ,
+.Nm fcloseall
.Nd close a stream
.Sh LIBRARY
.Lb libc
@@ -48,6 +49,8 @@
.In stdio.h
.Ft int
.Fn fclose "FILE *stream"
+.Ft void
+.Fn fcloseall void
.Sh DESCRIPTION
The
.Fn fclose
@@ -58,6 +61,12 @@
If the stream was being used for output, any buffered data is written
first, using
.Xr fflush 3 .
+.Pp
+The
+.Fn fcloseall
+function calls
+.Fn fclose
+on all open streams.
.Sh RETURN VALUES
Upon successful completion 0 is returned.
Otherwise,
@@ -99,3 +108,8 @@
function
conforms to
.St -isoC .
+.Pp
+The
+.Fn fcloseall
+function first appeared in
+.Fx 7.0 .
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/local.h#5 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)local.h 8.3 (Berkeley) 7/3/94
- * $FreeBSD: src/lib/libc/stdio/local.h,v 1.28 2005/12/16 02:50:53 davidxu Exp $
+ * $FreeBSD: src/lib/libc/stdio/local.h,v 1.29 2006/04/22 15:09:15 deischen Exp $
*/
#include <sys/types.h> /* for off_t */
@@ -53,6 +53,7 @@
extern int _ftello(FILE *, fpos_t *);
extern int _fseeko(FILE *, off_t, int, int);
extern int __fflush(FILE *fp);
+extern void __fcloseall(void);
extern wint_t __fgetwc(FILE *);
extern wint_t __fputwc(wchar_t, FILE *);
extern int __sflush(FILE *);
==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mmap.2#6 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mmap.2 8.4 (Berkeley) 5/11/95
-.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.53 2006/03/23 23:37:06 peter Exp $
+.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.54 2006/04/21 07:22:55 trhodes Exp $
.\"
-.Dd November 17, 2001
+.Dd April 21, 2006
.Dt MMAP 2
.Os
.Sh NAME
@@ -311,12 +311,6 @@
was specified and the
.Fa fd
argument was not -1.
-.It Bq Er EINVAL
-.Dv MAP_ANON
-has not been specified and
-.Fa fd
-did not reference a regular or character special file.
-.It Bq Er EINVAL
The
.Fa offset
argument
@@ -324,6 +318,11 @@
(See
.Sx BUGS
below.)
+.It Bq Er ENODEV
+.Dv MAP_ANON
+has not been specified and
+.Fa fd
+did not reference a regular or character special file.
.It Bq Er ENOMEM
.Dv MAP_FIXED
was specified and the
More information about the p4-projects
mailing list