xtrans: Changes to 'upstream-unstable'
Xtranssock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 02fcb08803dca5bb2df4f8be490a845659bd7ed3
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 12 17:49:41 2008 -0400
Connection failure for abstract socket is ECONNREFUSED, not ENOENT.
Apropos of bug #15884.
diff --git a/Xtranssock.c b/Xtranssock.c
index 8b8e4a9..309839c 100644
--- a/Xtranssock.c
+++ b/Xtranssock.c
@@ -2161,7 +2161,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
return TRANS_IN_PROGRESS;
else if (olderrno == EINTR)
return TRANS_TRY_CONNECT_AGAIN;
- else if (olderrno == ENOENT) {
+ else if (olderrno == ENOENT || olderrno == ECONNREFUSED) {
/* If opening as abstract socket failed, try again normally */
if (abstract) {
ciptr->transptr->flags &= ~(TRANS_ABSTRACT);
commit 906294025573d07c739894fa3b2eedc82813a379
Author: Bill Nottingham <notting@redhat.com>
Date: Mon May 12 17:43:36 2008 -0400
Ignore mkdir() errors when creating the abstract socket.
Red Hat bug #445303.
diff --git a/Xtranssock.c b/Xtranssock.c
index 9be7f5a..8b8e4a9 100644
--- a/Xtranssock.c
+++ b/Xtranssock.c
@@ -1148,7 +1148,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port,
#else
mode = 0777;
#endif
- if (trans_mkdir(UNIX_DIR, mode) == -1) {
+ if (!abstract && trans_mkdir(UNIX_DIR, mode) == -1) {
PRMSG (1, "SocketUNIXCreateListener: mkdir(%s) failed, errno = %d\n",
UNIX_DIR, errno, 0);
(void) umask (oldUmask);
commit 08134c2ce72bc43c172b6ae134d8a94a40b45c9b
Author: James Cloos <cloos@jhcloos.com>
Date: Sat May 10 07:02:09 2008 -0400
Remove extraneous execute bit from .c file
diff --git a/Xtransutil.c b/Xtransutil.c
old mode 100755
new mode 100644
Reply to: