From kde-commits Sun Jul 08 13:07:33 2012 From: =?utf-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Sun, 08 Jul 2012 13:07:33 +0000 To: kde-commits Subject: icecream/daemon Message-Id: <20120708130733.39844AC7A9 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=134175309515296 SVN commit 1304606 by lunakl: avoid iceccd restart bind() failure with the global unix socket too M +1 -0 main.cpp --- trunk/icecream/daemon/main.cpp #1304605:1304606 @@ -507,6 +507,7 @@ myaddr.sun_family = AF_UNIX; if (getuid()==0) { strncpy(myaddr.sun_path, "/var/run/iceccd.socket", sizeof(myaddr.sun_path)-1); + unlink(myaddr.sun_path); } else { strncpy(myaddr.sun_path, getenv("HOME"), sizeof(myaddr.sun_path)-1); strncat(myaddr.sun_path, "/.iceccd.socket", sizeof(myaddr.sun_path)-1-strlen(myaddr.sun_path));