diff options
| author | tsi <tsi> | 2008-10-31 19:10:29 +0000 |
|---|---|---|
| committer | tsi <tsi> | 2008-10-31 19:10:29 +0000 |
| commit | 4f4e82ca7a3c461d3aec8085122a06987fb9a32c (patch) | |
| tree | 9a2eea31af4dd3ca7d561b692e9261872f6aa3cd | |
| parent | a40f88647b58a549a510c219758389f0ff872354 (diff) | |
68. Move CloseWellKnownConnections() calls into OsCleanup(TRUE) calls.
Catches yet another server exit case where sockets were not being closed
(Marc La France).
| -rw-r--r-- | programs/Xserver/dix/main.c | 3 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/CHANGELOG | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/programs/Xserver/dix/main.c b/programs/Xserver/dix/main.c index d5b6d750d..30c218a9b 100644 --- a/programs/Xserver/dix/main.c +++ b/programs/Xserver/dix/main.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.54tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.55tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -471,7 +471,6 @@ main(int argc, const char *argv[], char *envp[]) if (dispatchException & DE_TERMINATE) { - CloseWellKnownConnections(); OsCleanup(TRUE); ddxGiveUp(); break; diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index 81dfc8002..0220b2720 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,4 +1,7 @@ XFree86 4.7.99.29 (xx November 2008) + 68. Move CloseWellKnownConnections() calls into OsCleanup(TRUE) calls. + Catches yet another server exit case where sockets were not being closed + (Marc La France). XFree86 4.7.99.28 (23 October 2008) 67. When using BSD authentication in xdm, wipe out the password as soon as @@ -20820,4 +20823,4 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3981 2008/10/15 21:19:18 tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3982 2008/10/23 11:03:47 dawes Exp $ |