From 29215ba31a7e173e55e7db73eb4c0040ae82881c Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 19 Jan 2011 10:06:56 -0500 Subject: config: move man pages into their own directory Use services provided by XORG_MANPAGE_SECTIONS. Use standard Makefile for man pages. Signed-off-by: Gaetan Nadon --- Makefile.am | 12 +--- configure.ac | 5 +- man/Makefile.am | 12 ++++ man/xhost.man | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ xhost.man | 175 -------------------------------------------------------- 5 files changed, 192 insertions(+), 187 deletions(-) create mode 100644 man/Makefile.am create mode 100644 man/xhost.man delete mode 100644 xhost.man diff --git a/Makefile.am b/Makefile.am index 2c67d26..be6f2c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,4 @@ +SUBDIRS = man bin_PROGRAMS = xhost xhost_SOURCES = xhost.c @@ -5,15 +6,7 @@ xhost_SOURCES = xhost.c AM_CFLAGS = $(CWARNFLAGS) $(XHOST_CFLAGS) xhost_LDADD = $(XHOST_LIBS) -appman_PRE = xhost.man - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) .PHONY: ChangeLog INSTALL @@ -25,7 +18,4 @@ ChangeLog: dist-hook: ChangeLog INSTALL -SUFFIXES = .$(APP_MAN_SUFFIX) .man -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/configure.ac b/configure.ac index 8451ea9..a30c5e2 100644 --- a/configure.ac +++ b/configure.ac @@ -26,4 +26,7 @@ XTRANS_CONNECTION_FLAGS # Secure RPC detection macro from xtrans.m4 XTRANS_SECURE_RPC_FLAGS -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..3e85ee9 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xhost.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/man/xhost.man b/man/xhost.man new file mode 100644 index 0000000..a805edf --- /dev/null +++ b/man/xhost.man @@ -0,0 +1,175 @@ +.\" Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. +.\" +.\" Permission is hereby granted, free of charge, to any person obtaining a +.\" copy of this software and associated documentation files (the "Software"), +.\" to deal in the Software without restriction, including without limitation +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\" and/or sell copies of the Software, and to permit persons to whom the +.\" Software is furnished to do so, subject to the following conditions: +.\" +.\" The above copyright notice and this permission notice (including the next +.\" paragraph) shall be included in all copies or substantial portions of the +.\" Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +.\" DEALINGS IN THE SOFTWARE. +.\" +.\" Copyright 1988, 1998 The Open Group +.\" +.\" Permission is hereby granted, free of charge, to any person obtaining a +.\" copy of this software and associated documentation files (the +.\" "Software"), to deal in the Software without restriction, including +.\" without limitation the rights to use, copy, modify, merge, publish, +.\" distribute, and/or sell copies of the Software, and to permit persons +.\" to whom the Software is furnished to do so, provided that the above +.\" copyright notice(s) and this permission notice appear in all copies of +.\" the Software and that both the above copyright notice(s) and this +.\" permission notice appear in supporting documentation. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.\" Except as contained in this notice, the name of a copyright holder +.\" shall not be used in advertising or otherwise to promote the sale, use +.\" or other dealings in this Software without prior written authorization +.\" of the copyright holder. +.\" +.\" X Window System is a trademark of The Open Group. +.\" +.TH XHOST 1 __xorgversion__ +.SH NAME +xhost \- server access control program for X +.SH SYNOPSIS +.B xhost +[[+\-]name ...] +.SH DESCRIPTION +The \fIxhost\fP program +is used to add and delete host names or user names to the list allowed +to make connections to the X server. In the case of hosts, this provides +a rudimentary form of privacy control and security. It is only sufficient +for a workstation (single user) environment, although it does limit the +worst abuses. Environments which require more sophisticated measures should +implement the user-based mechanism or use the hooks in the +protocol for passing other authentication data to the server. +.SH OPTIONS +\fIXhost\fP accepts the following command line options described below. For +security, the options that affect access control may only be run from the +"controlling host". For workstations, this is the same machine as the +server. For X terminals, it is the login host. +.TP 8 +.B \-help +Prints a usage message. +.TP 8 +.BI "[+]" "name" +The given \fIname\fP (the plus sign is optional) +is added to the list allowed to connect to the X server. +The name can be a host name or a user name. +.TP 8 +.BI \- "name" +The given \fIname\fP is removed from the list of allowed +to connect to the server. The name can be a host name or a user name. +Existing connections are not broken, but new +connection attempts will be denied. +Note that the current machine is allowed to be removed; however, further +connections (including attempts to add it back) will not be permitted. +Resetting the server (thereby breaking all connections) +is the only way to allow local connections again. +.TP 8 +.B \+ +Access is granted to everyone, even if they aren't on the list +(i.e., access control is turned off). +.TP 8 +.B \- +Access is restricted to only those on the list +(i.e., access control is turned on). +.TP 8 +.I nothing +If no command line arguments are given, +a message indicating whether or not access control is currently enabled +is printed, followed by the list of those allowed to connect. +This is the only option that may be used from machines other than +the controlling host. +.SH NAMES +A complete name has the syntax +``family:name'' where the families are +as follows: +.PP +.nf +.ta 1i +inet Internet host (IPv4) +inet6 Internet host (IPv6) +dnet DECnet host +nis Secure RPC network name +krb Kerberos V5 principal +local contains only one name, the empty string +si Server Interpreted +.fi +.PP +The family is case insensitive. +The format of the name varies with the family. +.PP +When Secure RPC is being used, the +network independent netname (e.g., "nis:unix.\fIuid\fP@\fIdomainname\fP") can +be specified, or a local user can be specified with just the username +and a trailing at-sign (e.g., "nis:pat@"). +.PP +For backward compatibility with pre-R6 \fIxhost\fP, +names that contain an at-sign (@) are assumed to be in the nis family. +Otherwise they are assumed to be Internet addresses. If compiled to support +IPv6, then all IPv4 and IPv6 addresses returned by getaddrinfo(__libmansuffix__) are added to +the access list in the appropriate inet or inet6 family. +.PP +Server interpreted addresses consist of a case-sensitive type tag and a +string representing a given value, separated by a colon. For example, +"si:hostname:almas" is a server interpreted address of type \fIhostname\fP, +with a value of \fIalmas\fP. For more information on the available forms +of server interpreted addresses, see the \fIXsecurity\fP(__miscmansuffix__) +manual page. +.PP +The initial access control list for display number \fBn\fP +may be set by the file \fI/etc/X\fBn\fI.hosts\fR, where +\fBn\fP is the display number of the server. See \fIXserver\fP(__appmansuffix__) +for details. +.SH DIAGNOSTICS +For each name added to the access control list, +a line of the form "\fIname\fP being added to access control list" +is printed. +For each name removed from the access control list, +a line of the form "\fIname\fP being removed from access control list" +is printed. +.SH "SEE ALSO" +X(__miscmansuffix__), Xsecurity(__miscmansuffix__), Xserver(__appmansuffix__), xdm(__appmansuffix__), xauth(__appmansuffix__), getaddrinfo(__libmansuffix__) +.SH ENVIRONMENT +.TP 8 +.B DISPLAY +to get the default host and display to use. +.SH BUGS +.PP +You can't specify a display on the command line because +.B \-display +is a valid command line argument (indicating that you want +to remove the machine named +.I ``display'' +from the access list). +.PP +The X server stores network addresses, not host names, unless you use +the server-interpreted hostname type address. If somehow you change a +host's network address while the server is still running, and you are +using a network-address based form of authentication, \fIxhost\fP must +be used to add the new address and/or remove the old address. +.SH AUTHORS +Bob Scheifler, MIT Laboratory for Computer Science, +.br +Jim Gettys, MIT Project Athena (DEC). diff --git a/xhost.man b/xhost.man deleted file mode 100644 index a805edf..0000000 --- a/xhost.man +++ /dev/null @@ -1,175 +0,0 @@ -.\" Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the -.\" Software is furnished to do so, subject to the following conditions: -.\" -.\" The above copyright notice and this permission notice (including the next -.\" paragraph) shall be included in all copies or substantial portions of the -.\" Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -.\" DEALINGS IN THE SOFTWARE. -.\" -.\" Copyright 1988, 1998 The Open Group -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the -.\" "Software"), to deal in the Software without restriction, including -.\" without limitation the rights to use, copy, modify, merge, publish, -.\" distribute, and/or sell copies of the Software, and to permit persons -.\" to whom the Software is furnished to do so, provided that the above -.\" copyright notice(s) and this permission notice appear in all copies of -.\" the Software and that both the above copyright notice(s) and this -.\" permission notice appear in supporting documentation. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.\" -.\" Except as contained in this notice, the name of a copyright holder -.\" shall not be used in advertising or otherwise to promote the sale, use -.\" or other dealings in this Software without prior written authorization -.\" of the copyright holder. -.\" -.\" X Window System is a trademark of The Open Group. -.\" -.TH XHOST 1 __xorgversion__ -.SH NAME -xhost \- server access control program for X -.SH SYNOPSIS -.B xhost -[[+\-]name ...] -.SH DESCRIPTION -The \fIxhost\fP program -is used to add and delete host names or user names to the list allowed -to make connections to the X server. In the case of hosts, this provides -a rudimentary form of privacy control and security. It is only sufficient -for a workstation (single user) environment, although it does limit the -worst abuses. Environments which require more sophisticated measures should -implement the user-based mechanism or use the hooks in the -protocol for passing other authentication data to the server. -.SH OPTIONS -\fIXhost\fP accepts the following command line options described below. For -security, the options that affect access control may only be run from the -"controlling host". For workstations, this is the same machine as the -server. For X terminals, it is the login host. -.TP 8 -.B \-help -Prints a usage message. -.TP 8 -.BI "[+]" "name" -The given \fIname\fP (the plus sign is optional) -is added to the list allowed to connect to the X server. -The name can be a host name or a user name. -.TP 8 -.BI \- "name" -The given \fIname\fP is removed from the list of allowed -to connect to the server. The name can be a host name or a user name. -Existing connections are not broken, but new -connection attempts will be denied. -Note that the current machine is allowed to be removed; however, further -connections (including attempts to add it back) will not be permitted. -Resetting the server (thereby breaking all connections) -is the only way to allow local connections again. -.TP 8 -.B \+ -Access is granted to everyone, even if they aren't on the list -(i.e., access control is turned off). -.TP 8 -.B \- -Access is restricted to only those on the list -(i.e., access control is turned on). -.TP 8 -.I nothing -If no command line arguments are given, -a message indicating whether or not access control is currently enabled -is printed, followed by the list of those allowed to connect. -This is the only option that may be used from machines other than -the controlling host. -.SH NAMES -A complete name has the syntax -``family:name'' where the families are -as follows: -.PP -.nf -.ta 1i -inet Internet host (IPv4) -inet6 Internet host (IPv6) -dnet DECnet host -nis Secure RPC network name -krb Kerberos V5 principal -local contains only one name, the empty string -si Server Interpreted -.fi -.PP -The family is case insensitive. -The format of the name varies with the family. -.PP -When Secure RPC is being used, the -network independent netname (e.g., "nis:unix.\fIuid\fP@\fIdomainname\fP") can -be specified, or a local user can be specified with just the username -and a trailing at-sign (e.g., "nis:pat@"). -.PP -For backward compatibility with pre-R6 \fIxhost\fP, -names that contain an at-sign (@) are assumed to be in the nis family. -Otherwise they are assumed to be Internet addresses. If compiled to support -IPv6, then all IPv4 and IPv6 addresses returned by getaddrinfo(__libmansuffix__) are added to -the access list in the appropriate inet or inet6 family. -.PP -Server interpreted addresses consist of a case-sensitive type tag and a -string representing a given value, separated by a colon. For example, -"si:hostname:almas" is a server interpreted address of type \fIhostname\fP, -with a value of \fIalmas\fP. For more information on the available forms -of server interpreted addresses, see the \fIXsecurity\fP(__miscmansuffix__) -manual page. -.PP -The initial access control list for display number \fBn\fP -may be set by the file \fI/etc/X\fBn\fI.hosts\fR, where -\fBn\fP is the display number of the server. See \fIXserver\fP(__appmansuffix__) -for details. -.SH DIAGNOSTICS -For each name added to the access control list, -a line of the form "\fIname\fP being added to access control list" -is printed. -For each name removed from the access control list, -a line of the form "\fIname\fP being removed from access control list" -is printed. -.SH "SEE ALSO" -X(__miscmansuffix__), Xsecurity(__miscmansuffix__), Xserver(__appmansuffix__), xdm(__appmansuffix__), xauth(__appmansuffix__), getaddrinfo(__libmansuffix__) -.SH ENVIRONMENT -.TP 8 -.B DISPLAY -to get the default host and display to use. -.SH BUGS -.PP -You can't specify a display on the command line because -.B \-display -is a valid command line argument (indicating that you want -to remove the machine named -.I ``display'' -from the access list). -.PP -The X server stores network addresses, not host names, unless you use -the server-interpreted hostname type address. If somehow you change a -host's network address while the server is still running, and you are -using a network-address based form of authentication, \fIxhost\fP must -be used to add the new address and/or remove the old address. -.SH AUTHORS -Bob Scheifler, MIT Laboratory for Computer Science, -.br -Jim Gettys, MIT Project Athena (DEC). -- cgit v1.2.3