2 files changed, 7 insertions, 2 deletions

diff --git a/core/launcher/qcopbridge.cpp b/core/launcher/qcopbridge.cpp
index e339dc7..64eb096 100644
--- a/core/launcher/qcopbridge.cpp
+++ b/core/launcher/qcopbridge.cpp
@@ -44,8 +44,9 @@ using namespace Opie::Core;
 #endif
 #ifndef Q_OS_WIN32
 #include <pwd.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #endif
 
 #if defined(_OS_LINUX_)
@@ -60,10 +61,11 @@ QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent,
       desktopChannel( 0 ),
       cardChannel( 0 )
 {
     if ( !ok() )
-    owarn << "Failed to bind to port " << port << "" << oendl;
+        owarn << "Failed to bind to port " << port << "" << oendl;
     else {
+        ::fcntl( socket(), F_SETFD, FD_CLOEXEC );
 #ifndef QT_NO_COP
         desktopChannel = new QCopChannel( "QPE/Desktop", this );
         connect( desktopChannel, SIGNAL(received(const QCString&,const QByteArray&)),
                  this, SLOT(desktopMessage(const QCString&,const QByteArray&)) );
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index 2b2e435..a219c0f 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -38,8 +38,9 @@ using namespace Opie::Core;
 /* STD */
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <time.h>
 
 #ifndef Q_OS_MACX
@@ -54,9 +55,11 @@ TransferServer::TransferServer( Q_UINT16 port, QObject *parent,
     : QServerSocket( port, 1, parent, name )
 {
     connections.setAutoDelete( TRUE );
     if ( !ok() )
-    owarn << "Failed to bind to port " << port << "" << oendl;
+            owarn << "Failed to bind to port " << port << "" << oendl;
+    else
+                ::fcntl( socket(), F_SETFD, FD_CLOEXEC );
 }
 
 void TransferServer::authorizeConnections()
 {