Attachment #28736 for bug #66288

View | Details | Raw Unified | Return to bug 66288
Collapse All | Expand All

Lines 952-958 DCOPServer::DCOPServer(bool _suicide) Link Here

(-)dcop/dcopserver.cpp (-1 / +1 lines)
952	}	952	}
953		953
954	char errormsg[256];	954	char errormsg[256];
955	int orig_umask = umask(0); /old libICE's don't reset the umask() they set /	955	int orig_umask = umask(077); /old libICE's don't reset the umask() they set /
956	if (!IceListenForConnections (&numTransports, &listenObjs,	956	if (!IceListenForConnections (&numTransports, &listenObjs,
957	256, errormsg))	957	256, errormsg))
958	{	958	{




#endif

    unlink (sockname.sun_path);
    (void) umask (oldUmask);

    if ((status = TRANS(SocketCreateListener) (ciptr,
	(struct sockaddr *) &sockname, namelen)) < 0)

	PRMSG (1,
    "SocketUNIXCreateListener: ...SocketCreateListener() failed\n",
	    0, 0, 0);
	(void) umask (oldUmask);
	return status;
    }


        PRMSG (1,
        "SocketUNIXCreateListener: Can't allocate space for the addr\n",
	    0, 0, 0);
	(void) umask (oldUmask);
        return TRANS_CREATE_LISTENER_FAILED;
    }


    ciptr->addrlen = namelen;
    memcpy (ciptr->addr, &sockname, ciptr->addrlen);

    (void) umask (oldUmask);

    return 0;
}


Return to bug 66288

Lines 940-945 TRANS(SocketUNIXCreateListener) (XtransC Link Here

(-)dcop/KDE-ICE/Xtranssock.c (-4 / +1 lines)
940	#endif	940	#endif
941		941
942	unlink (sockname.sun_path);	942	unlink (sockname.sun_path);
		943	(void) umask (oldUmask);
943		944
944	if ((status = TRANS(SocketCreateListener) (ciptr,	945	if ((status = TRANS(SocketCreateListener) (ciptr,
945	(struct sockaddr *) &sockname, namelen)) < 0)	946	(struct sockaddr *) &sockname, namelen)) < 0)
Lines 947-953 TRANS(SocketUNIXCreateListener) (XtransC Link Here
947	PRMSG (1,	948	PRMSG (1,
948	"SocketUNIXCreateListener: ...SocketCreateListener() failed\n",	949	"SocketUNIXCreateListener: ...SocketCreateListener() failed\n",
949	0, 0, 0);	950	0, 0, 0);
950	(void) umask (oldUmask);
951	return status;	951	return status;
952	}	952	}
953		953
Lines 965-971 TRANS(SocketUNIXCreateListener) (XtransC Link Here
965	PRMSG (1,	965	PRMSG (1,
966	"SocketUNIXCreateListener: Can't allocate space for the addr\n",	966	"SocketUNIXCreateListener: Can't allocate space for the addr\n",
967	0, 0, 0);	967	0, 0, 0);
968	(void) umask (oldUmask);
969	return TRANS_CREATE_LISTENER_FAILED;	968	return TRANS_CREATE_LISTENER_FAILED;
970	}	969	}
971		970
Lines 973-980 TRANS(SocketUNIXCreateListener) (XtransC Link Here
973	ciptr->addrlen = namelen;	972	ciptr->addrlen = namelen;
974	memcpy (ciptr->addr, &sockname, ciptr->addrlen);	973	memcpy (ciptr->addr, &sockname, ciptr->addrlen);
975		974
976	(void) umask (oldUmask);
977
978	return 0;	975	return 0;
979	}	976	}
980		977