libxau: Changes to 'upstream-unstable'
.gitignore | 5 +
AuLock.c | 30 ++++++--
Makefile.am | 6 -
README | 4 -
configure.ac | 21 +----
include/.gitignore | 1
include/X11/Xauth.h | 17 ----
k5encode.c | 186 ----------------------------------------------------
8 files changed, 36 insertions(+), 234 deletions(-)
New commits:
commit 825435514bd91d0d903247c46249a87d6fe8ae09
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 28 14:34:32 2009 +1000
libXau 1.0.5
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index a5888f1..c63adcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(libXau, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau)
+AC_INIT(libXau, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit fc54a4f03b926dfdb590b112c7128516ffc25539
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun Feb 22 11:14:04 2009 -0800
Make file locking more robust for network shares like AFP
diff --git a/AuLock.c b/AuLock.c
index 0012356..69b1fd6 100644
--- a/AuLock.c
+++ b/AuLock.c
@@ -90,14 +90,28 @@ long dead)
(void) close (creat_fd);
}
if (creat_fd != -1) {
- if (link (creat_name, link_name) != -1)
- return LOCK_SUCCESS;
- if (errno == ENOENT) {
- creat_fd = -1; /* force re-creat next time around */
- continue;
- }
- if (errno != EEXIST)
- return LOCK_ERROR;
+#ifndef X_NOT_POSIX
+ /* The file system may not support hard links, and pathconf should tell us that. */
+ if (1 == pathconf(creat_name, _PC_LINK_MAX)) {
+ if (-1 == rename(creat_name, link_name)) {
+ /* Is this good enough? Perhaps we should retry. TEST */
+ return LOCK_ERROR;
+ } else {
+ return LOCK_SUCCESS;
+ }
+ } else {
+#endif
+ if (link (creat_name, link_name) != -1)
+ return LOCK_SUCCESS;
+ if (errno == ENOENT) {
+ creat_fd = -1; /* force re-creat next time around */
+ continue;
+ }
+ if (errno != EEXIST)
+ return LOCK_ERROR;
+#ifndef X_NOT_POSIX
+ }
+#endif
}
(void) sleep ((unsigned) timeout);
--retries;
commit 742ff03dcad4d16ca8901ed47be91b303523a385
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Feb 6 11:35:40 2009 -0800
Restore FamilyKrb5Principal definition
Even if Kerberos5 support is currently unimplemented in the X server &
libXau, the Family id for the X11 protocol is still defined and reserved
for Kerberos5, and should be recorded here for interoperability with
other implementations and to avoid reuse if someone adds a new
authentication family in the future.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/include/X11/Xauth.h b/include/X11/Xauth.h
index 741da24..ace975d 100644
--- a/include/X11/Xauth.h
+++ b/include/X11/Xauth.h
@@ -53,6 +53,7 @@ typedef struct xauth {
# define FamilyLocal (256) /* not part of X standard (i.e. X.h) */
# define FamilyWild (65535)
# define FamilyNetname (254) /* not part of X standard */
+# define FamilyKrb5Principal (253) /* Kerberos 5 principal name */
# define FamilyLocalHost (252) /* for local non-net authentication */
commit c147fb417582e7384b5464bb53cfd492f9d7c69d
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon Feb 2 16:54:20 2009 -0200
Remove old api kerberos.
LibXau uses a 1993 kerberos api, but the X Server side support has
been already removed for quite some time.
This corrects bug report
https://bugs.freedesktop.org/show_bug.cgi?id=14684
diff --git a/Makefile.am b/Makefile.am
index f877dbc..01e2414 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,10 +18,6 @@ libXau_la_SOURCES = \
AuUnlock.c \
AuWrite.c
-if KERBEROS
-libXau_la_SOURCES +=k5encode.c
-endif KERBEROS
-
xauincludedir=$(includedir)/X11
xauinclude_HEADERS = include/X11/Xauth.h
diff --git a/README b/README
index 404eef0..9ee12e7 100644
--- a/README
+++ b/README
@@ -39,9 +39,7 @@ This scheme involves changes to the following parts of the sample release:
- remove entries from user's auth file
This mechanism assumes that the superuser and the transport layer between
-the client and the server is secure. Organizations that desire stricter
-security are encouraged to look at systems such as Kerberos (at Project
-Athena).
+the client and the server is secure.
Description
diff --git a/configure.ac b/configure.ac
index 43c7992..a5888f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,9 +47,6 @@ XAU_CFLAGS="$CWARNFLAGS $XAU_CFLAGS"
AC_SUBST(XAU_CFLAGS)
AC_SUBST(XAU_LIBS)
-kerberos=false
-AM_CONDITIONAL(KERBEROS, test x$kerberos = xtrue)
-
AC_ARG_ENABLE(xthreads,
AC_HELP_STRING([--disable-xthreads],
[Disable libXau support for Multithreading]),
diff --git a/include/X11/Xauth.h b/include/X11/Xauth.h
index 181618a..741da24 100644
--- a/include/X11/Xauth.h
+++ b/include/X11/Xauth.h
@@ -53,7 +53,6 @@ typedef struct xauth {
# define FamilyLocal (256) /* not part of X standard (i.e. X.h) */
# define FamilyWild (65535)
# define FamilyNetname (254) /* not part of X standard */
-# define FamilyKrb5Principal (253) /* Kerberos 5 principal name */
# define FamilyLocalHost (252) /* for local non-net authentication */
@@ -128,23 +127,6 @@ void XauDisposeAuth(
Xauth* /* auth */
);
-#ifdef K5AUTH
-#include <krb5/krb5.h>
-/* 9/93: krb5.h leaks some symbols */
-#undef BITS32
-#undef xfree
-
-int XauKrb5Encode(
- krb5_principal /* princ */,
- krb5_data * /* outbuf */
-);
-
-int XauKrb5Decode(
- krb5_data /* inbuf */,
- krb5_principal * /* princ */
-);
-#endif /* K5AUTH */
-
_XFUNCPROTOEND
/* Return values from XauLockAuth */
diff --git a/k5encode.c b/k5encode.c
deleted file mode 100644
index a3c6c09..0000000
--- a/k5encode.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* $Xorg: k5encode.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */
-
-/*
-
-Copyright 1993, 1994, 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. IN NO EVENT SHALL THE
-OPEN GROUP 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.
-
-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.
-
-*/
-
-/*
- * functions to encode/decode Kerberos V5 principals
- * into something that can be reasonable spewed over
- * the wire
- *
- * Author: Tom Yu <tlyu@MIT.EDU>
- *
- * Still needs to be fixed up wrt signed/unsigned lengths, but we'll worry
- * about that later.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <krb5/krb5.h>
-/* 9/93: krb5.h leaks some symbols */
-#undef BITS32
-#undef xfree
-
-#include <X11/X.h>
-#include <X11/Xos.h>
-#include <X11/Xmd.h>
-#include <X11/Xfuncs.h>
-
-/*
- * XauKrb5Encode
- *
- * this function encodes the principal passed to it in a format that can
- * easily be dealt with by stuffing it into an X packet. Encoding is as
- * follows:
- * length count of the realm name
- * realm
- * component count
- * length of component
- * actual principal component
- * etc....
- *
- * Note that this function allocates a hunk of memory, which must be
- * freed to avoid nasty memory leak type things. All counts are
- * byte-swapped if needed. (except for the total length returned)
- *
- * nevermind.... stuffing the encoded packet in net byte order just to
- * always do the right thing. Don't have to frob with alignment that way.
- */
-int
-XauKrb5Encode(princ, outbuf)
- krb5_principal princ; /* principal to encode */
- krb5_data *outbuf; /* output buffer */
-{
- CARD16 i, numparts, totlen = 0, plen, rlen;
- char *cp, *pdata;
-
- rlen = krb5_princ_realm(princ)->length;
- numparts = krb5_princ_size(princ);
- totlen = 2 + rlen + 2; /* include room for realm length
- and component count */
- for (i = 0; i < numparts; i++)
- totlen += krb5_princ_component(princ, i)->length + 2;
- /* add 2 bytes each time for length */
- if ((outbuf->data = (char *)malloc(totlen)) == NULL)
- return -1;
- cp = outbuf->data;
- *cp++ = (char)((int)(0xff00 & rlen) >> 8);
- *cp++ = (char)(0x00ff & rlen);
- memcpy(cp, krb5_princ_realm(princ)->data, rlen);
- cp += rlen;
- *cp++ = (char)((int)(0xff00 & numparts) >> 8);
- *cp++ = (char)(0x00ff & numparts);
- for (i = 0; i < numparts; i++)
- {
- plen = krb5_princ_component(princ, i)->length;
- pdata = krb5_princ_component(princ, i)->data;
- *cp++ = (char)((int)(0xff00 & plen) >> 8);
- *cp++ = (char)(0x00ff & plen);
- memcpy(cp, pdata, plen);
- cp += plen;
- }
- outbuf->length = totlen;
- return 0;
-}
-
-/*
- * XauKrb5Decode
- *
- * This function essentially reverses what XauKrb5Encode does.
- * return value: 0 if okay, -1 if malloc fails, -2 if inbuf format bad
- */
-int
-XauKrb5Decode(inbuf, princ)
- krb5_data inbuf;
- krb5_principal *princ;
-{
- CARD16 i, numparts, plen, rlen;
- CARD8 *cp, *pdata;
-
- if (inbuf.length < 4)
- {
- return -2;
- }
- *princ = (krb5_principal)malloc(sizeof (krb5_principal_data));
- if (*princ == NULL)
- return -1;
- bzero(*princ, sizeof (krb5_principal_data));
- cp = (CARD8 *)inbuf.data;
- rlen = *cp++ << 8;
- rlen |= *cp++;
- if (inbuf.length < 4 + (int)rlen + 2)
- {
- krb5_free_principal(*princ);
- return -2;
- }
- krb5_princ_realm(*princ)->data = (char *)malloc(rlen);
- if (krb5_princ_realm(*princ)->data == NULL)
- {
- krb5_free_principal(*princ);
- return -1;
- }
- krb5_princ_realm(*princ)->length = rlen;
- memcpy(krb5_princ_realm(*princ)->data, cp, rlen);
- cp += rlen;
- numparts = *cp++ << 8;
- numparts |= *cp++;
- krb5_princ_name(*princ) =
- (krb5_data *)malloc(numparts * sizeof (krb5_data));
- if (krb5_princ_name(*princ) == NULL)
- {
- krb5_free_principal(*princ);
- return -1;
- }
- krb5_princ_size(*princ) = 0;
- for (i = 0; i < numparts; i++)
- {
- if (cp + 2 > (CARD8 *)inbuf.data + inbuf.length)
- {
- krb5_free_principal(*princ);
- return -2;
- }
- plen = *cp++ << 8;
- plen |= *cp++;
- if (cp + plen > (CARD8 *)inbuf.data + inbuf.length)
- {
- krb5_free_principal(*princ);
- return -2;
- }
- pdata = (CARD8 *)malloc(plen);
- if (pdata == NULL)
- {
- krb5_free_principal(*princ);
- return -1;
- }
- krb5_princ_component(*princ, i)->data = (char *)pdata;
- krb5_princ_component(*princ, i)->length = plen;
- memcpy(pdata, cp, plen);
- cp += plen;
- krb5_princ_size(*princ)++;
- }
- return 0;
-}
commit 11fbe620625520668f5e88e4f5a8fe149a7cfa3f
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Jan 29 15:08:23 2009 -0200
Janitor: Correct make distcheck and remove extra .gitignore file.
diff --git a/.gitignore b/.gitignore
index 924ce71..42ffde7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,9 @@ missing
mkinstalldirs
stamp-h1
xau.pc
+Xau.3
*~
+*.o
+libXau-*tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 635fdb9..f877dbc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,6 +87,6 @@ Xau.$(LIB_MAN_SUFFIX): $(srcdir)/Xau.man
.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 9e1b2a5..43c7992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,9 +30,9 @@ 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_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
+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
@@ -40,8 +40,10 @@ AC_PROG_LN_S
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
AC_PROG_MAKE_SET
+XORG_CWARNFLAGS
PKG_CHECK_MODULES(XAU, xproto)
+XAU_CFLAGS="$CWARNFLAGS $XAU_CFLAGS"
AC_SUBST(XAU_CFLAGS)
AC_SUBST(XAU_LIBS)
@@ -77,15 +79,9 @@ XORG_WITH_LINT
XORG_LINT_LIBRARY([Xau])
LINT_FLAGS="${LINT_FLAGS} ${XAU_CFLAGS}"
-if test "x$GCC" = "xyes"; then
- GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations \
- -Wnested-externs -fno-strict-aliasing"
- XAU_CFLAGS="$GCC_WARNINGS $XAU_CFLAGS"
-fi
-
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
xau.pc])
diff --git a/include/.gitignore b/include/.gitignore
deleted file mode 100644
index 08d2b99..0000000
--- a/include/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-X11
Reply to: