diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:42:57 +0000 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:42:57 +0000 |
| commit | 7731482870d55945142f85ef51e9723b1d2467e2 (patch) | |
| tree | ec12e5537e263fff6aa6f527311d1d623ef34ace | |
| parent | e7743f4b397fae6fdf62f9a5980bdc8e89955fbf (diff) | |
Merge the new release from HEADXACE-SELINUX
| -rw-r--r-- | Xtrans.c | 2 | ||||
| -rw-r--r-- | Xtransint.h | 2 | ||||
| -rw-r--r-- | Xtranssock.c | 9 | ||||
| -rw-r--r-- | Xtransutil.c | 4 |
4 files changed, 9 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* $XdotOrg: Xtrans.c,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */ +/* $XdotOrg: xc/lib/xtrans/Xtrans.c,v 1.2 2004/04/23 18:44:27 eich Exp $ */ /* $Xorg: Xtrans.c,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */ /* diff --git a/Xtransint.h b/Xtransint.h index 50a41cc..dad0d8a 100644 --- a/Xtransint.h +++ b/Xtransint.h @@ -1,4 +1,4 @@ -/* $XdotOrg: Xtransint.h,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */ +/* $XdotOrg: xc/lib/xtrans/Xtransint.h,v 1.2 2004/04/23 18:44:27 eich Exp $ */ /* $Xorg: Xtransint.h,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */ /* diff --git a/Xtranssock.c b/Xtranssock.c index 4a5afae..4c18324 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/lib/xtrans/Xtranssock.c,v 1.1.4.5 2003/12/20 00:28:22 kaleb Exp $ */ +/* $XdotOrg: xc/lib/xtrans/Xtranssock.c,v 1.2 2004/04/23 18:44:27 eich Exp $ */ /* $Xorg: Xtranssock.c,v 1.11 2001/02/09 02:04:06 xorgcvs Exp $ */ /* @@ -865,9 +865,10 @@ TRANS(SocketCreateListener) (XtransConnInfo ciptr, if (errno == EADDRINUSE) { if (flags & ADDR_IN_USE_ALLOWED) break; - } else - return TRANS_ADDR_IN_USE; - + else + return TRANS_ADDR_IN_USE; + } + if (retry-- == 0) { PRMSG (1, "SocketCreateListener: failed to bind listener\n", 0, 0, 0); diff --git a/Xtransutil.c b/Xtransutil.c index d84b1a8..865c20f 100644 --- a/Xtransutil.c +++ b/Xtransutil.c @@ -573,14 +573,14 @@ trans_mkdir(char *path, int mode) if (updateOwner && !updatedOwner) { PRMSG(1, "mkdir: Owner of %s should be set to root\n", path, 0, 0); -#if !defined(__CYGWIN__) && !defined(__DARWIN__) +#if 0 && !defined(__CYGWIN__) && !defined(__DARWIN__) sleep(5); #endif } if (updateMode && !updatedMode) { PRMSG(1, "mkdir: Mode of %s should be set to %04o\n", path, mode, 0); -#if !defined(__CYGWIN__) && !defined(__DARWIN__) +#if 0 && !defined(__CYGWIN__) && !defined(__DARWIN__) sleep(5); #endif } |