diff options
Diffstat (limited to 'usr/src/man')
-rw-r--r-- | usr/src/man/man1m/boot.1m | 36 | ||||
-rw-r--r-- | usr/src/man/man1m/installgrub.1m | 13 | ||||
-rw-r--r-- | usr/src/man/man1m/rpcinfo.1m | 12 | ||||
-rw-r--r-- | usr/src/man/man1m/svccfg.1m | 14 | ||||
-rw-r--r-- | usr/src/man/man3socket/Makefile | 4 | ||||
-rw-r--r-- | usr/src/man/man3socket/ethers.3socket | 31 | ||||
-rw-r--r-- | usr/src/man/man4/mod_ipp.4 | 112 |
7 files changed, 76 insertions, 146 deletions
diff --git a/usr/src/man/man1m/boot.1m b/usr/src/man/man1m/boot.1m index deb21f1182..07de722086 100644 --- a/usr/src/man/man1m/boot.1m +++ b/usr/src/man/man1m/boot.1m @@ -1,10 +1,11 @@ '\" te +.\" Copyright 2015 Nexenta Systems Inc. .\" Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved .\" Copyright 1989 AT&T .\" The contents of this file are subject to the terms of the 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. .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the .\" fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH BOOT 1M "Mar 2, 2009" +.TH BOOT 1M "Jan 14, 2015" .SH NAME boot \- start the system kernel or a standalone program .SH SYNOPSIS @@ -23,7 +24,6 @@ boot \- start the system kernel or a standalone program .fi .SH DESCRIPTION -.sp .LP Bootstrapping is the process of loading and executing a standalone program. For the purpose of this discussion, bootstrapping means the process of loading and @@ -44,7 +44,6 @@ Once the kernel is loaded, it starts the UNIX system, mounts the necessary file systems (see \fBvfstab\fR(4)), and runs \fB/sbin/init\fR to bring the system to the "initdefault" state specified in \fB/etc/inittab\fR. See \fBinittab\fR(4). .SS "SPARC Bootstrap Procedure" -.sp .LP On SPARC based systems, the bootstrap procedure on most machines consists of the following basic phases. @@ -424,7 +423,6 @@ of the \fB-o\fR options, subject to the OBP limit of 128 bytes for boot arguments. For example, \fB-o\fR \fBlist,go\fR would simply list current (default) values of the parameters and then continue booting. .SS "iSCSI Boot" -.sp .LP iSCSI boot is currently supported only on x86. The host being booted must be equipped with NIC(s) capable of iBFT (iSCSI Boot Firmware Table) or have the @@ -441,7 +439,6 @@ of the process of iSCSI booting is the same as booting from a local disk. To configure the iBFT properly, users need to refer to the documentation from their hardware vendors. .SS "Booting from Disk" -.sp .LP When booting from disk, the OpenBoot PROM firmware reads the boot blocks from blocks 1 to 15 of the partition specified as the boot device. This standalone @@ -473,7 +470,6 @@ system and the capabilities of the hardware and firmware. .LP The path to the kernel must not contain any whitespace. .SS "Booting from ZFS" -.sp .LP Booting from ZFS differs from booting from UFS in that, with ZFS, a device specifier identifies a storage pool, not a single root file system. A storage @@ -485,7 +481,6 @@ the one identified by the pool's \fBbootfs\fR property. This default selection can be overridden by specifying an alternate bootable dataset with the \fB-Z\fR option. .SS "Boot Archive Phase" -.sp .LP The boot archive contains a file system image that is mounted using an in-memory disk. The image is self-describing, specifically containing a file @@ -512,7 +507,6 @@ modules from the in-memory filesystem until I/O can be turned on and the root filesystem mounted. Once the root filesystem is mounted, the in-memory filesystem is no longer needed and is discarded. .SS "OpenBoot PROM \fBboot\fR Command Behavior" -.sp .LP The OpenBoot \fBboot\fR command takes arguments of the following form: .sp @@ -931,7 +925,6 @@ using infinite retries. attempted before the DHCP process is determined to have failed. Defaults to of using infinite retries. .SS "x86 Bootstrap Procedure" -.sp .LP On x86 based systems, the bootstrapping process consists of two conceptually distinct phases, kernel loading and kernel initialization. Kernel loading is @@ -970,7 +963,6 @@ the root file system on the real root device. At this point, the kernel regains storage I/O, mounts additional file systems (see \fBvfstab\fR(4)), and starts various operating system services (see \fBsmf\fR(5)). .SS "Failsafe Mode" -.sp .LP A requirement of booting from a root filesystem image built into a boot archive then remounting root onto the actual root device is that the contents of the @@ -1030,14 +1022,12 @@ service, the administrator may elect to rebuild the archive by invoking: .sp .SS "Failsafe Boot Archive" -.sp .LP The failsafe archive can be used to boot the machine at any time for maintenance or troubleshooting. The failsafe boot archive is installed on the machine, sourced from the miniroot archive. Booting the failsafe archive causes the machine to boot using the in-memory filesystem as the root device. .SS "SPARC" -.sp .LP The SPARC failsafe archive is: .sp @@ -1072,7 +1062,6 @@ ok \fBboot [\fIdevice-specifier\fR] -Z \fIdataset\fR -F failsafe\fR .sp .SS "x86" -.sp .LP The x86 failsafe archive is: .sp @@ -1089,7 +1078,6 @@ The x86 failsafe archive is: GRUB menu. .SH OPTIONS .SS "SPARC" -.sp .LP The following SPARC options are supported: .sp @@ -1214,7 +1202,6 @@ Boot from the root file system in the specified ZFS dataset. .RE .SS "x86" -.sp .LP The following x86 options are supported: .sp @@ -1267,7 +1254,6 @@ the machine. .RE .SH X86 BOOT SEQUENCE DETAILS -.sp .LP After a PC-compatible machine is turned on, the system firmware in the \fBBIOS ROM\fR executes a power-on self test (POST), runs \fBBIOS\fR extensions in @@ -1277,7 +1263,6 @@ consists of trying to read the first physical sector from the first diskette drive, or, if that fails, from the first hard disk. The processor then jumps to the first byte of the sector image in memory. .SH X86 PRIMARY BOOT -.sp .LP The first sector on a floppy disk contains the master boot block (GRUB \fBstage1\fR). The stage 1 is responsible for loading GRUB \fBstage2\fR. Now @@ -1295,7 +1280,7 @@ program that maintains it. The master boot finds the active partition in the first byte in memory. This completes the standard PC-compatible hard disk boot sequence. If GRUB \fBstage1\fR is installed on the master boot block (see the \fB-m\fR option of \fBinstallgrub\fR(1M)), then \fBstage2\fR is loaded directly -from the Solaris \fBFDISK\fR partition regardless of the active partition. +from the Solaris partition regardless of the active partition. .sp .LP An x86 \fBFDISK\fR partition for the Solaris software begins with a @@ -1312,6 +1297,13 @@ GRUB menu is displayed, the user can choose to boot an operating system on a different partition, a different disk, or possibly from the network. .sp .LP +The behavior is slightly different when a disk is using \fBEFI\fR +partitioning. In that case the GRUB \fBstage1\fR is always installed +in the first sector of the disk, and it always loads \fBstage2\fR from +the partition specified at GRUB installation time. This only works on +partitions containing a ZFS root pool. +.sp +.LP For network booting, the supported method is Intel's Preboot eXecution Environment (PXE) standard. When booting from the network using PXE, the system or network adapter BIOS uses DHCP to locate a network bootstrap program @@ -1320,7 +1312,6 @@ Protocol (TFTP). The BIOS executes the \fBpxegrub\fR by jumping to its first byte in memory. The \fBpxegrub\fR program downloads a menu file and presents the entries to user. .SH X86 KERNEL STARTUP -.sp .LP The kernel startup process is independent of the kernel loading process. During kernel startup, console I/O goes to the device specified by the \fBconsole\fR @@ -1486,7 +1477,6 @@ to \fB/boot/grub/menu.lst\fR, and use the \fBset-menu\fR subcommand of \fBbootadm set-menu\fR. .SH FILES -.sp .ne 2 .na \fB\fB/platform/\fR\fIplatform-name\fR\fB/ufsboot\fR\fR @@ -1517,7 +1507,6 @@ Program that brings the system to the \fBinitdefault\fR state .RE .SS "64-bit SPARC Only" -.sp .ne 2 .na \fB\fB/platform/\fR\fIplatform-name\fR\fB/kernel/sparcv9/unix\fR\fR @@ -1528,7 +1517,6 @@ Default program to boot system. .RE .SS "x86 Only" -.sp .ne 2 .na \fB\fB/boot\fR\fR @@ -1559,7 +1547,6 @@ Menu of bootable operating systems displayed by GRUB. .RE .SS "64-bit x86 Only" -.sp .ne 2 .na \fB\fB/platform/i86pc/kernel/amd64/unix\fR\fR @@ -1570,7 +1557,6 @@ Menu of bootable operating systems displayed by GRUB. .RE .SH SEE ALSO -.sp .LP \fBkmdb\fR(1), \fBuname\fR(1), \fBbootadm\fR(1M), \fBeeprom\fR(1M), \fBinit\fR(1M), \fBinstallboot\fR(1M), \fBkernel\fR(1M), \fBmonitor\fR(1M), @@ -1603,14 +1589,12 @@ RFC 2396, \fIUniform Resource Identifiers (URI): Generic Syntax\fR, .LP \fIOpenBoot Command Reference Manual\fR .SH WARNINGS -.sp .LP The \fBboot\fR utility is unable to determine which files can be used as bootable programs. If the booting of a file that is not bootable is requested, the \fBboot\fR utility loads it and branches to it. What happens after that is unpredictable. .SH NOTES -.sp .LP \fIplatform-name\fR can be found using the \fB-i\fR option of \fBuname\fR(1). \fIhardware-class-name\fR can be found using the \fB-m\fR option of diff --git a/usr/src/man/man1m/installgrub.1m b/usr/src/man/man1m/installgrub.1m index 57aaab893c..b6d64978db 100644 --- a/usr/src/man/man1m/installgrub.1m +++ b/usr/src/man/man1m/installgrub.1m @@ -1,9 +1,10 @@ '\" te +.\" Copyright 2015 Nexenta Systems Inc. .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved .\" The contents of this file are subject to the terms of the 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. .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH INSTALLGRUB 1M "Jul 2, 2009" +.TH INSTALLGRUB 1M "Jan 14, 2015" .SH NAME installgrub \- install GRUB in a disk partition or a floppy .SH SYNOPSIS @@ -13,7 +14,6 @@ installgrub \- install GRUB in a disk partition or a floppy .fi .SH DESCRIPTION -.sp .LP The \fBinstallgrub\fR command is an x86-only program. GRUB stands for GRand Unified Bootloader. @@ -23,7 +23,6 @@ Unified Bootloader. disk partition. If you specify the \fB-m\fR option, \fBinstallgrub\fR installs the stage 1 file on the master boot sector of the disk. .SH OPTIONS -.sp .LP The \fBinstallgrub\fR command accepts the following options: .sp @@ -42,11 +41,11 @@ Suppresses interaction when overwriting the master boot sector. .ad .RS 6n Installs GRUB \fIstage1\fR on the master boot sector interactively. You must -use this option if Solaris is installed on an extended partition. +use this option if Solaris is installed on an extended FDISK or an EFI/GPT +partition. .RE .SH OPERANDS -.sp .LP The \fBinstallgrub\fR command accepts the following operands: .sp @@ -114,7 +113,6 @@ example# mount -F pcfs /dev/diskette /mnt .in -2 .SH FILES -.sp .ne 2 .na \fB\fB/boot/grub\fR\fR @@ -124,7 +122,6 @@ Directory where GRUB files reside. .RE .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -140,12 +137,10 @@ Interface Stability Uncommitted .TE .SH SEE ALSO -.sp .LP \fBboot\fR(1M), \fBfdisk\fR(1M), \fBfmthard\fR(1M), \fBkernel\fR(1M), \fBattributes\fR(5) .SH WARNINGS -.sp .LP Installing GRUB on the master boot sector (\fB-m\fR option) overrides any boot manager currently installed on the machine. The system will always boot the diff --git a/usr/src/man/man1m/rpcinfo.1m b/usr/src/man/man1m/rpcinfo.1m index 24df1c4527..7151ccea0f 100644 --- a/usr/src/man/man1m/rpcinfo.1m +++ b/usr/src/man/man1m/rpcinfo.1m @@ -1,16 +1,17 @@ '\" te +.\" Copyright 2015 Nexenta Systems, Inc. All rights reserved. .\" Copyright (c) 2001 Sun Microsystems, Inc. All Rights Reserved .\" Copyright 1989 AT&T .\" The contents of this file are subject to the terms of the 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. See the License for the specific language governing permissions and limitations under the License. .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH RPCINFO 1M "Jul 13, 2001" +.TH RPCINFO 1M "Feb 20, 2015" .SH NAME rpcinfo \- report RPC information .SH SYNOPSIS .LP .nf -\fBrpcinfo\fR [\fB-m\fR | \fB-s\fR] [\fIhost\fR] +\fBrpcinfo\fR [\fB-T\fR \fItransport\fR] [\fB-m\fR | \fB-s\fR] [\fIhost\fR] .fi .LP @@ -54,7 +55,6 @@ rpcinfo \- report RPC information .fi .SH DESCRIPTION -.sp .LP \fBrpcinfo\fR makes an \fBRPC\fR call to an \fBRPC\fR server and reports what it finds. @@ -95,7 +95,6 @@ required for \fB-b\fR and \fB-d\fR options. .LP The \fBEXAMPLES\fR section describe other ways of using \fBrpcinfo\fR. .SH OPTIONS -.sp .ne 2 .na \fB\fB-T\fR\fI transport\fR\fR @@ -280,7 +279,7 @@ The information displayed by the above commands can be quite lengthy. Use the .TS l l l l l l l l l l . -\fBprogram\fR \fBvrsn\fR \fBnetid(s)\fR \fBservice\fR \fBowner\fR +\fBprogram\fR \fBversion(s)\fR \fBnetid(s)\fR \fBservice\fR \fBowner\fR \fB100000\fR \fB2,3,4\fR \fBtcp,udp,ticlts,ticots,ticotsord\fR \fBrpcbind\fR \fBsuperuser\fR \fB100008\fR \fB1\fR \fBticotsord,ticots,ticlts,udp,tcp\fR \fBwalld\fR \fBsuperuser\fR \fB100002\fR \fB2,1\fR \fBticotsord,ticots,ticlts,udp,tcp\fR \fBrusersd\fR \fBsuperuser\fR @@ -288,7 +287,7 @@ l l l l l . \fB100012\fR \fB1\fR \fBticotsord,ticots,ticlts,udp,tcp\fR \fBsprayd\fR \fBsuperuser\fR \fB100007\fR \fB3\fR \fBticotsord,ticots,ticlts,udp,tcp\fR \fBypbind\fR \fBsuperuser\fR \fB100029\fR \fB1\fR \fBticotsord,ticots,ticlts\fR \fBkeyserv\fR \fBsuperuser\fR -\fB100078\fR \fB4\fR \fBticotsord,ticots,ticlts\fR \fB-\fR superuser +\fB100078\fR \fB4\fR \fBticotsord,ticots,ticlts\fR \fB-\fR \fBsuperuser\fR \fB100024\fR \fB1\fR \fBticotsord,ticots,ticlts,udp,tcp\fR \fBstatus\fR \fBsuperuser\fR \fB100021\fR \fB2,1\fR \fBticotsord,ticots,ticlts,udp,tcp\fR \fBnlockmgr\fR \fBsuperuser\fR \fB100020\fR \fB1\fR \fBticotsord,ticots,ticlts,udp,tcp\fR \fBllockmgr\fR \fBsuperuser\fR @@ -347,7 +346,6 @@ or .sp .SH SEE ALSO -.sp .LP \fBrpcbind\fR(1M), \fBrpc\fR(3NSL), \fBnetconfig\fR(4), \fBrpc\fR(4), \fBattributes\fR(5) diff --git a/usr/src/man/man1m/svccfg.1m b/usr/src/man/man1m/svccfg.1m index c2e2cf28cd..cbb1a7ef29 100644 --- a/usr/src/man/man1m/svccfg.1m +++ b/usr/src/man/man1m/svccfg.1m @@ -24,7 +24,6 @@ svccfg \- import, export, and modify service configurations .fi .SH DESCRIPTION -.sp .LP The \fBsvccfg\fR command manipulates data in the service configuration repository. \fBsvccfg\fR can be invoked interactively, with an individual @@ -37,7 +36,6 @@ effect for that service until the next time the service instance is refreshed. See the \fBrefresh\fR subcommand on the \fBsvcadm\fR(1M) man page for more details. .SH OPTIONS -.sp .LP The following options are supported: .sp @@ -72,7 +70,6 @@ Verbose. .RE .SH SUBCOMMANDS -.sp .LP Subcommands are divided into the categories specified in the subsections that follow. @@ -124,7 +121,6 @@ Abbreviated forms of \fIFMRI\fRs are unstable, and should not be used in scripts or other permanent tools. If a pattern matches more than one instance or service, an error message is printed and no action is taken. .SS "General Subcommands" -.sp .ne 2 .na \fB\fBend\fR\fR @@ -189,7 +185,6 @@ Turns off verbose mode. .RE .SS "Service Profile Subcommands" -.sp .ne 2 .na \fB\fBapply\fR [\fB-n\fR] \fIfile\fR\fR @@ -225,7 +220,6 @@ a file. .RE .SS "Service Manifest Subcommands" -.sp .ne 2 .na \fB\fBarchive\fR [\fB-a\fR]\fR @@ -360,7 +354,6 @@ See \fBsmf_template\fR(5) for a description of templates. .RE .SS "Entity Selection, Modification, and Navigation Subcommands" -.sp .LP An "entity" refers to a scope, service, or service instance. .sp @@ -428,7 +421,6 @@ The parent of the current selection becomes the current selection. .RE .SS "Property Inspection and Modification Subcommands" -.sp .ne 2 .na \fB\fBaddpg\fR \fIname\fR \fItype\fR [\fIflags\fR]\fR @@ -639,7 +631,6 @@ modify properties. .RE .SS "Snapshot Navigation and Selection Subcommands" -.sp .ne 2 .na \fB\fBlistsnap\fR\fR @@ -676,7 +667,6 @@ read-only. .RE .SS "Instance Subcommands" -.sp .ne 2 .na \fB\fBrefresh\fR\fR @@ -797,7 +787,6 @@ ttymon/label astring console .sp .SH ENVIRONMENTAL VARIABLES -.sp .ne 2 .na \fBEDITOR\fR @@ -809,7 +798,6 @@ editor is \fBvi\fR(1). .RE .SH EXIT STATUS -.sp .LP The following exit values are returned: .sp @@ -844,7 +832,6 @@ Invalid command line options were specified. .RE .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -864,7 +851,6 @@ Interface Stability See below. The interactive output is Uncommitted. The invocation and non-interactive output are Committed. .SH SEE ALSO -.sp .LP \fBsvcprop\fR(1), \fBsvcs\fR(1), \fBsvcadm\fR(1M), \fBsvc.configd\fR(1M), \fBlibscf\fR(3LIB), \fBlibumem\fR(3LIB), \fBscf_service_add_pg\fR(3SCF), diff --git a/usr/src/man/man3socket/Makefile b/usr/src/man/man3socket/Makefile index c4bbd116c7..5174020548 100644 --- a/usr/src/man/man3socket/Makefile +++ b/usr/src/man/man3socket/Makefile @@ -63,9 +63,11 @@ MANLINKS= accept4.3socket \ endprotoent.3socket \ endservent.3socket \ ether_aton.3socket \ + ether_aton_r.3socket \ ether_hostton.3socket \ ether_line.3socket \ ether_ntoa.3socket \ + ether_ntoa_r.3socket \ ether_ntohost.3socket \ freeaddrinfo.3socket \ freehostent.3socket \ @@ -155,9 +157,11 @@ ntohll.3socket := LINKSRC = byteorder.3socket ntohs.3socket := LINKSRC = byteorder.3socket ether_aton.3socket := LINKSRC = ethers.3socket +ether_aton_r.3socket := LINKSRC = ethers.3socket ether_hostton.3socket := LINKSRC = ethers.3socket ether_line.3socket := LINKSRC = ethers.3socket ether_ntoa.3socket := LINKSRC = ethers.3socket +ether_ntoa_r.3socket := LINKSRC = ethers.3socket ether_ntohost.3socket := LINKSRC = ethers.3socket freeaddrinfo.3socket := LINKSRC = getaddrinfo.3socket diff --git a/usr/src/man/man3socket/ethers.3socket b/usr/src/man/man3socket/ethers.3socket index 94cec9c957..77a5e330a6 100644 --- a/usr/src/man/man3socket/ethers.3socket +++ b/usr/src/man/man3socket/ethers.3socket @@ -1,12 +1,13 @@ '\" te .\" Copyright 1989 AT&T. .\" Copyright (C) 2004, Sun Microsystems, Inc. All Rights Reserved. +.\" Copyright (C) 2014, Joyent, Inc. All Rights Reserved. .\" The contents of this file are subject to the terms of the 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. See the License for the specific language governing permissions and limitations under the License. .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH ETHERS 3SOCKET "Apr 5, 2004" +.TH ETHERS 3SOCKET "Aug 9, 2014" .SH NAME -ethers, ether_ntoa, ether_aton, ether_ntohost, ether_hostton, ether_line \- +ethers, ether_ntoa, ether_ntoa_r, ether_aton, ether_aton_r, ether_ntohost, ether_hostton, ether_line \- Ethernet address mapping operations .SH SYNOPSIS .LP @@ -20,11 +21,21 @@ Ethernet address mapping operations .LP .nf +\fBchar *\fR\fBether_ntoa_r\fR(\fBconst struct ether_addr *\fR\fIe\fR, \fBchar *\fR\fIs\fR); +.fi + +.LP +.nf \fBstruct ether_addr *\fR\fBether_aton\fR(\fBconst char *\fR\fIs\fR); .fi .LP .nf +\fBstruct ether_addr *\fR\fBether_aton_r\fR(\fBconst char *\fR\fIs\fR, \fBstruct ether_addr *\fR\fIe\fR); +.fi + +.LP +.nf \fBint\fR \fBether_ntohost\fR(\fBchar *\fR\fIhostname\fR, \fBconst struct ether_addr *\fR\fIe\fR); .fi @@ -39,7 +50,6 @@ Ethernet address mapping operations .fi .SH DESCRIPTION -.sp .LP These routines are useful for mapping 48 bit Ethernet numbers to their ASCII representations or their corresponding host names, and vice versa. @@ -55,6 +65,18 @@ representation back to a 48 bit Ethernet number; the function returns \fINULL\fR if the string cannot be scanned successfully. .sp .LP +The functions \fBether_ntoa()\fR and \fBether_aton()\fR return values in +per-thread buffers, one for each function. A second call to one of these +functions will overwrite the previous value. The functions +\fBether_ntoa_r()\fR and \fBether_aton_r()\fR behave identically to +their non-reentrant versions; however, instead of using a per-thread +buffer, they use caller supplied buffers. It is the callers +responsibility to ensure that the character buffer passed to +\fBether_ntoa_r()\fR is at least \fBETHERADDRSTRL\fR bytes large -- the +minimum size to hold the ASCII representation of a 48 bit Ethernet +number and a null terminator. +.sp +.LP The function \fBether_ntohost()\fR maps an Ethernet number (pointed to by \fIe\fR) to its associated hostname. The string pointed to by hostname must be long enough to hold the hostname and a \fINULL\fR character. The function @@ -75,7 +97,6 @@ to by hostname must be long enough to hold the hostname and a \fINULL\fR character. The function returns zero upon success and non-zero upon failure. The format of the scanned line is described by \fBethers\fR(4). .SH FILES -.sp .ne 2 .na \fB\fB/etc/ethers\fR\fR @@ -94,7 +115,6 @@ configuration file for the name service switch .RE .SH ATTRIBUTES -.sp .LP See \fBattributes\fR(5) for descriptions of the following attributes: .sp @@ -110,6 +130,5 @@ MT-Level MT-Safe .TE .SH SEE ALSO -.sp .LP \fBethers\fR(4), \fBnsswitch.conf\fR(4), \fBattributes\fR(5) diff --git a/usr/src/man/man4/mod_ipp.4 b/usr/src/man/man4/mod_ipp.4 index b4a8c26580..672bca7a01 100644 --- a/usr/src/man/man4/mod_ipp.4 +++ b/usr/src/man/man4/mod_ipp.4 @@ -1,21 +1,32 @@ '\" te .\" Copyright (c) 2003, Sun Microsystems, Inc. .\" All Rights Reserved. -.\" The contents of this file are subject to the terms of the 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. See the License for the specific language governing permissions and limitations under the License. -.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH MOD_IPP 4 "Nov 26, 2003" +.\" The contents of this file are subject to the terms of the +.\" 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. +.\" See the License for the specific language governing permissions +.\" and limitations under the License. +.\" +.\" When distributing Covered Code, include this CDDL HEADER in each +.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE. +.\" If applicable, add the following below this CDDL HEADER, with the +.\" fields enclosed by brackets "[]" replaced with your own identifying +.\" information: Portions Copyright [yyyy] [name of copyright owner] +.\" +.TH MOD_IPP 4 "Feb 14, 2015" .SH NAME mod_ipp \- Embedded Internet Print Protocol (IPP) listener for the Apache HTTP server .SH SYNOPSIS .LP .nf -\fB/usr/apache/libexec/mod_ipp.so\fR +\fB/usr/lib/lp/ipp/mod_ipp.so\fR .fi .SH DESCRIPTION -.sp .LP The \fBmod_ipp\fR module implements RFCs 2910 and 2911 to provide an IPP handling service for the Apache HTTP server. When loaded on the Apache server, @@ -23,7 +34,6 @@ handling service for the Apache HTTP server. When loaded on the Apache server, \fBapplication/ipp\fR. The \fBmod_ipp\fR module also processes additional configuration directives to enable or disable portions of the protocol support. .SS "Using Configuration Directives" -.sp .LP The following is a list of configuration directives that apply to the Apache IPP Listening service: @@ -50,7 +60,6 @@ will disable support for the named operation. .RE .RE .SS "Operations" -.sp .LP The following is a list of IPP handling service operations: .sp @@ -248,83 +257,20 @@ operations implemented by the \fBmod_ipp\fR Apache module. The following configuration file can be used to start a standalone Apache server to respond to IPP request sent to port 631. -.sp -.in +2 -.nf -ServerType standalone -ServerRoot "/usr/apache" -PidFile /var/run/httpd-standalone-ipp.pid -ErrorLog /var/lp/logs/ipp-errors - -Timeout 300 -KeepAlive On -MaxKeepAliveRequests 100 -KeepAliveTimeout 15 - -MinSpareServers 1 -MaxSpareServers 3 -StartServers 1 -MaxClients 150 -MaxRequestsPerChild 0 - -LoadModule ipp_module libexec/mod_ipp.so - -ClearModuleList -AddModule mod_ipp.c -AddModule mod_so.c - -Port 631 - -User lp -Group lp - -ServerAdmin lp@localhost -DefaultType application/ipp - -<IFModule mod_app> - <Location /> - ipp-operation all on - </Location> -</IFModule mod_app> -.fi -.in -2 - -.sp -.LP -A more restrictive configuration might include the following parameters: - -.sp -.in +2 +See .nf -<IFModule mod_app> - <Location /> - ipp-operation all offn - ipp-operation required on - </Location> -</IFModule mod_app> + \fB/etc/lp/ipp/httpd-standalone-ipp.conf\fR .fi -.in -2 -.SH ATTRIBUTES -.sp -.LP -See \fBattributes\fR(5) or descriptions of the following attributes: -.sp - -.sp -.TS -box; -c | c -l | l . -ATTRIBUTE TYPE ATTRIBUTE VALUE -_ -Interface Stability External -.TE +Note that this will require a usable printer configured under the +\fBlp\fR print system. See \fBlpadmin\fR(1M) for details. +The CUPS printing system has its own IPP listener separate from +this Apache module. See \fBprint-service\fR for instructions +on switching between the \fBlp\fR and \fBcups\fR systems. .SH SEE ALSO -.sp .LP -\fBman\fR(1), \fBcatman\fR(1M), \fBattributes\fR(5) +\fBlp\fR(1), \fBlpadmin\fR(1M), \fBprint-service\fR(1M) .sp .LP Herriot, R., Ed., Butler, S., Moore, P., Turner, R., Wenn, J. \fIRFC 2910, @@ -339,7 +285,6 @@ Group. September 2000. .LP http://www.apache.org .SH NOTES -.sp .LP Configuration file directives are processed in the order listed in the config file. The default behavior is to enable support for all operations implemented @@ -390,7 +335,6 @@ information is available at http://www.apache.org .sp .LP The \fBhttpd\fR(8) man page and other Apache man pages are provided with the -programming modules. To view the Apache manual pages with the man command, add -\fB/usr/apache/man\fR to the \fBMANPATH\fR environment variable. See -\fBman\fR(1) for more information. Running \fBcatman\fR(1M) on the Apache -manual pages is not supported. +programming modules. To view the Apache manual pages with the man command, +add (i.e.) \fB/usr/apache2/2.2/man\fR to the \fBMANPATH\fR environment +variable. See \fBman\fR(1) for more information. |