.gitignore | 4 ++++
Makefile.am | 6 +++---
README | 26 ++++++++++++++++++++++++++
configure.ac | 12 ++++++------
gethost.c | 3 ++-
process.c | 3 ++-
xauth.man | 55 +++++++++++++++++++++++++++++--------------------------
7 files changed, 72 insertions(+), 37 deletions(-)
New commits:
commit d2d802ea9f882b7b7eac1251309d8141e55f213e
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Mon Sep 21 20:25:09 2009 -0700
xauth 1.0.4
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/configure.ac b/configure.ac
index 90d1d29..a2e824f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xauth,[1.0.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
+AC_INIT(xauth,[1.0.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit e4ab625fd4e31a6cc043dfabbb7d5a801e87d526
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Mon Sep 21 20:22:28 2009 -0700
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/Makefile.am b/Makefile.am
index 21f3fc5..9faf89b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xauth
-AM_CFLAGS = $(XAUTH_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XAUTH_CFLAGS)
xauth_LDADD = $(XAUTH_LIBS)
xauth_SOURCES = \
@@ -43,7 +43,7 @@ CLEANFILES = $(appman_DATA)
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(xauth_CFLAGS)
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(XAUTH_CFLAGS)
lint:
$(LINT) $(ALL_LINT_FLAGS) $(xauth_SOURCES) $(xauth_LDADD)
diff --git a/configure.ac b/configure.ac
index 42e3d83..90d1d29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,14 +27,14 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_WITH_LINT, XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_WITH_LINT, XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AC_PROG_CC
AC_PROG_INSTALL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
AC_TYPE_SIGNAL
@@ -42,7 +42,6 @@ AC_CHECK_HEADERS([net/errno.h])
# Checks for pkg-config packages
PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu)
-XAUTH_CFLAGS="$CWARNFLAGS $XAUTH_CFLAGS"
AC_SUBST(XAUTH_CFLAGS)
AC_SUBST(XAUTH_LIBS)
@@ -51,8 +50,5 @@ AC_SUBST(XAUTH_LIBS)
XTRANS_CONNECTION_FLAGS
XORG_WITH_LINT
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile])
commit 2cbcbed9dedb696535fe54290189478c6c007270
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Mon Sep 21 20:17:48 2009 -0700
Man page updates: add "SEE ALSO", update xdm references
Also trim trailing whitespaces and fix a spelling error
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/xauth.man b/xauth.man
index 9e7bdc0..1e3521f 100644
--- a/xauth.man
+++ b/xauth.man
@@ -1,15 +1,14 @@
-.\" $Xorg: xauth.man,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $
.\" Copyright 1993, 1998 The Open Group
-.\"
+.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
.\" documentation for any purpose is hereby granted without fee, provided that
.\" the above copyright notice appear in all copies and that both that
.\" copyright notice and this permission notice appear in supporting
.\" documentation.
-.\"
+.\"
.\" The above copyright notice and this permission notice 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.
@@ -17,13 +16,12 @@
.\" 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.
-.\"
+.\"
.\" Except as contained in this notice, the name of The Open Group shall
.\" not be used in advertising or otherwise to promote the sale, use or
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/xauth/xauth.man,v 1.8tsi Exp $
.\"
.TH XAUTH 1 __xorgversion__
.SH NAME
@@ -33,17 +31,18 @@ xauth \- X authority file utility
[ \fB\-f\fP \fIauthfile\fP ] [ \fB\-vqibn\fP ] [ \fIcommand arg ...\fP ]
.SH DESCRIPTION
.PP
-The \fIxauth\fP program is used to edit and display the authorization
+The \fIxauth\fP program is used to edit and display the authorization
information used in connecting to the X server. This program is usually
-used to extract authorization records from one machine and merge them in on
+used to extract authorization records from one machine and merge them in on
another (as is the case when using remote logins or granting access to
other users). Commands (described below) may be entered interactively,
on the \fIxauth\fP command line, or in scripts. Note that this program
does \fBnot\fP contact the X server except when the generate command is used.
Normally \fIxauth\fP is not used to create the authority file entry in
-the first place; \fIxdm\fP does that.
+the first place; the program that starts the X server (often \fIxdm\fP
+or \fIstartx\fP) does that.
.SH OPTIONS
-The following options may be used with \fIxauth\fP. They may be given
+The following options may be used with \fIxauth\fP. They may be given
individually (e.g., \fI\-q \-i\|\fP) or may combined (e.g., \fI\-qi\|\fP).
.TP 8
.B "\-f \fIauthfile\fP"
@@ -67,7 +66,7 @@ directed to a terminal.
.B \-i
This option indicates that \fIxauth\fP should ignore any authority file
locks. Normally, \fIxauth\fP will refuse to read or edit any authority files
-that have been locked by other programs (usually \fIxdm\fP or another
+that have been locked by other programs (usually \fIxdm\fP or another
\fIxauth\fP).
.TP 8
.B \-b
@@ -84,11 +83,11 @@ The following commands may be used to manipulate authority
files:
.B "add \fIdisplayname protocolname hexkey"
An authorization entry for the indicated display using the given protocol
and key data is added to the authorization file. The data is specified as
-an even-lengthed string of hexadecimal digits, each pair representing
+an even-lengthed string of hexadecimal digits, each pair representing
one octet. The first digit of each pair gives the most significant 4 bits
of the octet, and the second digit of the pair gives the least significant 4
bits. For example, a 32 character hexkey would represent a 128-bit value.
-A protocol name consisting of just a
+A protocol name consisting of just a
single period is treated as an abbreviation for \fIMIT-MAGIC-COOKIE-1\fP.
.TP 8
@@ -135,24 +134,24 @@ The default is to send no data.
.TP 8
.B "[n]extract \fIfilename displayname..."
-Authorization entries for each of the specified displays are written to the
+Authorization entries for each of the specified displays are written to the
indicated file. If the \fInextract\fP command is used, the entries are written
in a numeric format suitable for non-binary transmission (such as secure
-electronic mail). The extracted entries can be read back in using the
-\fImerge\fP and \fInmerge\fP commands. If the filename consists of
+electronic mail). The extracted entries can be read back in using the
+\fImerge\fP and \fInmerge\fP commands. If the filename consists of
just a single dash, the entries will be written to the standard output.
.TP 8
.B "[n]list \fR[\fIdisplayname\fP...]"
Authorization entries for each of the specified displays (or all if no
displays are named) are printed on the standard output. If the \fInlist\fP
-command is used, entries will be shown in the numeric format used by
+command is used, entries will be shown in the numeric format used by
the \fInextract\fP command; otherwise, they are shown in a textual format.
Key data is always displayed in the hexadecimal format given in the
description of the \fIadd\fP command.
.TP 8
.B "[n]merge \fR[\fIfilename\fP...]"
Authorization entries are read from the specified files and are merged into
-the authorization database, superceding any matching existing entries. If
+the authorization database, superseding any matching existing entries. If
the \fInmerge\fP command is used, the numeric format given in the description
of the \fIextract\fP command is used. If a filename consists of just a single
dash, the standard input will be read if it hasn't been read before.
@@ -163,14 +162,14 @@ authority file.
.TP 8
.B "source \fIfilename"
The specified file is treated as a script containing \fIxauth\fP commands
-to execute. Blank lines and lines beginning with a sharp sign (#) are
+to execute. Blank lines and lines beginning with a sharp sign (#) are
ignored. A single dash may be used to indicate the standard input, if it
hasn't already been read.
.TP 8
.B "info"
Information describing the authorization file, whether or not any changes
have been made, and from where \fIxauth\fP commands are being read
-is printed on the standard output.
+is printed on the standard output.
.TP 8
.B "exit"
If any modifications have been made, the authority file is written out (if
@@ -194,13 +193,13 @@ DISPLAY environment variable and the common
\fI\-display\fP command line
argument. Display-specific information (such as the screen number)
is unnecessary and will be ignored.
Same-machine connections (such as local-host sockets,
-shared memory, and the Internet Protocol hostname \fIlocalhost\fP) are
+shared memory, and the Internet Protocol hostname \fIlocalhost\fP) are
referred to as \fIhostname\fP/unix:\fIdisplaynumber\fP so that
local entries for different machines may be stored in one authority file.
.SH EXAMPLE
.PP
-The most common use for \fIxauth\fP is to extract the entry for the
-current display, copy it to another machine, and merge it into the
+The most common use for \fIxauth\fP is to extract the entry for the
+current display, copy it to another machine, and merge it into the
user's authority file on the remote machine:
.sp
.nf
@@ -227,10 +226,14 @@ to get the user's home directory if XAUTHORITY isn't
defined.
.TP 8
.I $HOME/.Xauthority
default authority file if XAUTHORITY isn't defined.
+.SH "SEE ALSO"
+X(__miscmansuffix__), Xsecurity(__miscmansuffix__), xhost(__appmansuffix__),
+Xserver(__appmansuffix__), xdm(__appmansuffix__), startx(__appmansuffix__),
+Xau(__libmansuffix__).
.SH BUGS
.PP
-Users that have unsecure networks should take care to use encrypted
-file transfer mechanisms to copy authorization entries between machines.
+Users that have unsecure networks should take care to use encrypted
+file transfer mechanisms to copy authorization entries between machines.
Similarly, the \fIMIT-MAGIC-COOKIE-1\fP protocol is not very useful in
unsecure environments. Sites that are interested in additional security
may need to use encrypted authorization mechanisms such as Kerberos.
commit d376341c3cbeca0aec335462dffb796e5a8e5d03
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Mon Sep 21 20:08:10 2009 -0700
Add pointers to mailing list, bugzilla, wiki & git repo to README
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/README b/README
index e69de29..8718d1a 100644
--- a/README
+++ b/README
@@ -0,0 +1,26 @@
+The xauth program is used to edit and display the authorization
+information used in connecting to the X server.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/xauth
+
+ http://cgit.freedesktop.org/xorg/app/xauth
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
commit 6d47c482a198f5421a7007221a69ee24d5f0a2a4
Author: Matthieu Herrb <matthieu.he...@laas.fr>
Date: Sun Jul 19 10:27:49 2009 +0200
Initialize ed.used_stdout at the beginning of do_extract()
This avoids reading uninitialized memory later.
Problem reported by Philip Guenther. Thanks.
Signed-off-by: Matthieu Herrb <matthieu.he...@laas.fr>
diff --git a/process.c b/process.c
index 52a4868..893b51d 100644
--- a/process.c
+++ b/process.c
@@ -1500,6 +1500,7 @@ do_extract(char *inputfilename, int lineno, int argc,
char **argv)
ed.fp = NULL;
ed.filename = argv[1];
+ ed.used_stdout = False;
ed.numeric = (argv[0][0] == 'n');
ed.nwritten = 0;
ed.cmd = argv[0];
commit b0aec5d07ea5c9fccacf250fe1c665d92243fb61
Author: Michael Scherer <m...@mandriva.org>
Date: Sat Mar 7 12:14:26 2009 +0100
Fix format error
diff --git a/process.c b/process.c
index 1e61d49..52a4868 100644
--- a/process.c
+++ b/process.c
@@ -960,7 +960,7 @@ fprintfhex(register FILE *fp, int len, char *cp)
char *hex;
hex = bintohex(len, cp);
- fprintf(fp, hex);
+ fprintf(fp, "%s", hex);
free(hex);
}
commit 31395a96cff3570440229b2715c8ba557a6ce8d4
Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Mon Jan 19 19:05:44 2009 -0200
Correct make distcheck.
No warnings were generated by gcc 4.3 neither sparse when using
XORG_CWARNFLAGS.
diff --git a/.gitignore b/.gitignore
index a96219c..cbf2a13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,7 @@ stamp-h1
xauth
xauth.1
*~
+*.o
+xauth-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 24a12c0..21f3fc5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,6 +79,6 @@ MAINTAINERCLEANFILES=ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git
directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index ffe378c..42e3d83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,19 +27,22 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.1)
+# Require xorg-macros: XORG_WITH_LINT, XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
AC_PROG_CC
AC_PROG_INSTALL
+XORG_CWARNFLAGS
+
AC_TYPE_SIGNAL
AC_CHECK_HEADERS([net/errno.h])
# Checks for pkg-config packages
PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu)
+XAUTH_CFLAGS="$CWARNFLAGS $XAUTH_CFLAGS"
AC_SUBST(XAUTH_CFLAGS)
AC_SUBST(XAUTH_LIBS)
@@ -50,5 +53,6 @@ XTRANS_CONNECTION_FLAGS
XORG_WITH_LINT
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile])
commit 64d1fe69362bb0edcd5736ee6988d9bd394ea5c0
Author: Matthieu Herrb <matthieu.he...@laas.fr>
Date: Tue Jun 17 23:31:58 2008 +0200
Replace rsh by ssh the extract/merge example. Rsh is no more.
diff --git a/xauth.man b/xauth.man
index 92645ee..9e7bdc0 100644
--- a/xauth.man
+++ b/xauth.man
@@ -204,7 +204,7 @@ current display, copy it to another machine, and merge it
into the
user's authority file on the remote machine:
.sp
.nf
- % xauth extract \- $DISPLAY | rsh otherhost xauth merge \-
+ % xauth extract \- $DISPLAY | ssh otherhost xauth merge \-
.fi
.PP
.sp
commit 3cc17297124ea5c9917e6eacc0ab7ae021e8a386
Author: Jens Granseuer <jen...@gmx.net>
Date: Sun Mar 9 20:06:49 2008 +0100
C89 fix
65a0917d4661e370b50beed8f06f5577bfeea59f broke the build with non-C99
aware compilers.
diff --git a/gethost.c b/gethost.c
index 94c1d99..3bfdb39 100644
--- a/gethost.c
+++ b/gethost.c
@@ -295,6 +295,8 @@ struct addrlist *get_address_info (
hints.ai_protocol = 0;
if (getaddrinfo(host,NULL,&hints,&firstai) !=0) return NULL;
for (ai = firstai; ai != NULL; ai = ai->ai_next) {
+ struct addrlist *duplicate;
+
if (ai->ai_family == AF_INET) {
struct sockaddr_in *sin = (struct sockaddr_in *)ai->ai_addr;
src = &(sin->sin_addr);
@@ -307,7 +309,6 @@ struct addrlist *get_address_info (
family = FamilyInternet6;
}
- struct addrlist *duplicate;
for(duplicate = retval; duplicate != NULL; duplicate =
duplicate->next) {
if(duplicate->family == family && duplicate->len == len &&
memcmp(duplicate->address, src, len) == 0) {
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
