Attachment 28736 Details for Bug 66288

[patch] secure-ICE-connection.diff

secure-ICE-connection.diff (text/plain), 1.84 KB, created by Adrian Schröter on 2005-02-23 10:33:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Schröter

Created: 2005-02-23 10:33:45 UTC

Size: 1.84 KB

patch

obsolete

>Index: dcopserver.cpp
>===================================================================
>RCS file: /home/kde/kdelibs/dcop/dcopserver.cpp,v
>retrieving revision 1.172
>diff -u -p -r1.172 dcopserver.cpp
>--- dcop/dcopserver.cpp	13 Nov 2004 12:05:58 -0000	1.172
>+++ dcop/dcopserver.cpp	9 Feb 2005 14:04:21 -0000
>@@ -952,7 +952,7 @@ DCOPServer::DCOPServer(bool _suicide)
> 	}
> 
>     char errormsg[256];
>-    int orig_umask = umask(0); /*old libICE's don't reset the umask() they set */
>+    int orig_umask = umask(077); /*old libICE's don't reset the umask() they set */
>     if (!IceListenForConnections (&numTransports, &listenObjs,
> 				  256, errormsg))
> 	{
>Index: KDE-ICE/Xtranssock.c
>===================================================================
>RCS file: /home/kde/kdelibs/dcop/KDE-ICE/Xtranssock.c,v
>retrieving revision 1.10
>diff -u -p -r1.10 Xtranssock.c
>--- dcop/KDE-ICE/Xtranssock.c	2 Jun 2004 20:28:25 -0000	1.10
>+++ dcop/KDE-ICE/Xtranssock.c	9 Feb 2005 14:04:22 -0000
>@@ -940,6 +940,7 @@ TRANS(SocketUNIXCreateListener) (XtransC
> #endif
> 
>     unlink (sockname.sun_path);
>+    (void) umask (oldUmask);
> 
>     if ((status = TRANS(SocketCreateListener) (ciptr,
> 	(struct sockaddr *) &sockname, namelen)) < 0)
>@@ -947,7 +948,6 @@ TRANS(SocketUNIXCreateListener) (XtransC
> 	PRMSG (1,
>     "SocketUNIXCreateListener: ...SocketCreateListener() failed\n",
> 	    0, 0, 0);
>-	(void) umask (oldUmask);
> 	return status;
>     }
> 
>@@ -965,7 +965,6 @@ TRANS(SocketUNIXCreateListener) (XtransC
>         PRMSG (1,
>         "SocketUNIXCreateListener: Can't allocate space for the addr\n",
> 	    0, 0, 0);
>-	(void) umask (oldUmask);
>         return TRANS_CREATE_LISTENER_FAILED;
>     }
> 
>@@ -973,8 +972,6 @@ TRANS(SocketUNIXCreateListener) (XtransC
>     ciptr->addrlen = namelen;
>     memcpy (ciptr->addr, &sockname, ciptr->addrlen);
> 
>-    (void) umask (oldUmask);
>-
>     return 0;
> }
>

Actions: View | Diff

Attachments on bug 66288: 28734 | 28736