From b42602e9db5ae633a124743adf71de598f5e6d52 Mon Sep 17 00:00:00 2001 From: Alexey Torkhov Date: Jan 08 2009 12:49:17 +0000 Subject: Removing unused patches. --- diff --git a/cyphesis-0.5.15-gcc43.patch b/cyphesis-0.5.15-gcc43.patch deleted file mode 100644 index c688064..0000000 --- a/cyphesis-0.5.15-gcc43.patch +++ /dev/null @@ -1,144 +0,0 @@ ---- cyphesis-0.5.15/tools/cyconvertrules.cpp.orig 2008-02-21 16:11:18.000000000 -0800 -+++ cyphesis-0.5.15/tools/cyconvertrules.cpp 2008-02-21 16:11:27.000000000 -0800 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - using Atlas::Message::Element; - using Atlas::Message::MapType; ---- cyphesis-0.5.15/tools/cyconfig.cpp.orig 2008-02-21 16:10:54.000000000 -0800 -+++ cyphesis-0.5.15/tools/cyconfig.cpp 2008-02-21 16:11:06.000000000 -0800 -@@ -34,6 +34,8 @@ - #include - - #include -+#include -+#include - - static int install(int argc, char ** argv) - { ---- cyphesis-0.5.15/tools/cycmd.cpp.orig 2008-02-21 16:07:53.000000000 -0800 -+++ cyphesis-0.5.15/tools/cycmd.cpp 2008-02-21 16:08:10.000000000 -0800 -@@ -70,6 +70,8 @@ - - #include - #include -+#include -+#include - - #include - ---- cyphesis-0.5.15/modules/DateTime.cpp.orig 2008-02-10 17:10:55.000000000 -0800 -+++ cyphesis-0.5.15/modules/DateTime.cpp 2008-02-10 17:11:09.000000000 -0800 -@@ -20,6 +20,7 @@ - #include "DateTime.h" - - #include -+#include - - // date_pat=re.compile("^|[-:]|\s+"); - ---- cyphesis-0.5.15/server/CommServer.cpp.orig 2008-02-21 16:04:17.000000000 -0800 -+++ cyphesis-0.5.15/server/CommServer.cpp 2008-02-21 16:04:26.000000000 -0800 -@@ -36,6 +36,7 @@ - #include - - #include -+#include - - extern "C" { - #ifdef HAVE_EPOLL_CREATE ---- cyphesis-0.5.15/server/CommListener.cpp.orig 2008-02-21 15:59:46.000000000 -0800 -+++ cyphesis-0.5.15/server/CommListener.cpp 2008-02-21 16:00:07.000000000 -0800 -@@ -43,6 +43,7 @@ - #include - - #include -+#include - - static const bool debug_flag = false; - ---- cyphesis-0.5.15/tests/Containertest.cpp.orig 2008-02-21 16:16:12.000000000 -0800 -+++ cyphesis-0.5.15/tests/Containertest.cpp 2008-02-21 16:16:19.000000000 -0800 -@@ -22,6 +22,7 @@ - #include - - #include -+#include - - int main() - { ---- cyphesis-0.5.15/tests/PropertyExerciser.cpp.orig 2008-02-21 16:39:03.000000000 -0800 -+++ cyphesis-0.5.15/tests/PropertyExerciser.cpp 2008-02-21 16:39:09.000000000 -0800 -@@ -26,6 +26,7 @@ - #include - - #include -+#include - - #include - ---- cyphesis-0.5.15/common/Database.cpp.orig 2008-02-10 16:11:37.000000000 -0800 -+++ cyphesis-0.5.15/common/Database.cpp 2008-02-10 16:22:51.000000000 -0800 -@@ -33,6 +33,8 @@ - - #include - #include -+#include -+#include - - #include - ---- cyphesis-0.5.15/common/log.cpp.orig 2008-02-10 16:12:42.000000000 -0800 -+++ cyphesis-0.5.15/common/log.cpp 2008-02-10 16:12:56.000000000 -0800 -@@ -27,6 +27,7 @@ - - #include - #include -+#include - - extern "C" { - #ifdef HAVE_SYSLOG_H ---- cyphesis-0.5.15/common/types.h.orig 2008-02-10 16:57:06.000000000 -0800 -+++ cyphesis-0.5.15/common/types.h 2008-02-10 16:41:16.000000000 -0800 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - class BaseEntity; - class Entity; ---- cyphesis-0.5.15/common/globals.cpp.orig 2008-02-10 16:23:25.000000000 -0800 -+++ cyphesis-0.5.15/common/globals.cpp 2008-02-10 16:23:34.000000000 -0800 -@@ -37,6 +37,7 @@ - #include - - #include -+#include - - const char * CYPHESIS = "cyphesis"; - const char * CLIENT = "client"; ---- cyphesis-0.5.15/common/id.cpp.orig 2008-02-10 16:04:31.000000000 -0800 -+++ cyphesis-0.5.15/common/id.cpp 2008-02-10 16:34:16.000000000 -0800 -@@ -22,6 +22,8 @@ - #include "common/compose.hpp" - - #include -+#include -+#include - - long integerId(const std::string & id) - { ---- cyphesis-0.5.15/rulesets/Container.h.orig 2008-02-10 17:18:48.000000000 -0800 -+++ cyphesis-0.5.15/rulesets/Container.h 2008-02-10 17:19:19.000000000 -0800 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - class Entity; - diff --git a/cyphesis-0.5.15-init.patch b/cyphesis-0.5.15-init.patch deleted file mode 100644 index cf339d4..0000000 --- a/cyphesis-0.5.15-init.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- cyphesis-0.5.15/cyphesis.init.orig 2008-04-09 11:02:46.000000000 -0700 -+++ cyphesis-0.5.15/cyphesis.init 2008-04-09 11:03:07.000000000 -0700 -@@ -24,28 +24,28 @@ - # Start the daemon. - - # Make sure postgres superuser exists -- if ! su $POSTGRESUSER -c true >/dev/null 2>&1; then -+ if ! runuser $POSTGRESUSER -c true >/dev/null 2>&1; then - echo - echo $"Could not check for running PostgreSQL database." - return 1 - fi - - # Make sure postgres is running -- if ! su $POSTGRESUSER -c "psql -c \"\" template1" >/dev/null 2>&1; then -+ if ! runuser $POSTGRESUSER -c "psql -c \"\" template1" >/dev/null 2>&1; then - echo $"PostgreSQL server is not running." - return 1 - fi - - # Make sure the user we are going to run as exists -- if ! su $CYPHESISUSER -c true >/dev/null 2>&1; then -+ if ! runuser $CYPHESISUSER -c true >/dev/null 2>&1; then - echo $"Cannot find user $CYPHESISUSER to run cyphesis service." - return 1 - fi - - # Make sure the user has a postgres account -- if ! su $CYPHESISUSER -c "psql -c \"\" template1" >/dev/null 2>&1; then -+ if ! runuser $CYPHESISUSER -c "psql -c \"\" template1" >/dev/null 2>&1; then - echo -n $"Creating PostgreSQL account: " -- su $POSTGRESUSER -c "createuser -A -d -q -R $CYPHESISUSER" >/dev/null 2>&1 -+ runuser $POSTGRESUSER -c "createuser -A -d -q -R $CYPHESISUSER" >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - echo_success -@@ -58,10 +58,10 @@ - fi - - # Make sure the database exists -- if ! su $CYPHESISUSER -c "psql -c \"\" cyphesis" >/dev/null 2>&1; then -+ if ! runuser $CYPHESISUSER -c "psql -c \"\" cyphesis" >/dev/null 2>&1; then - # Create the database - echo -n $"Creating PostgreSQL database: " -- su $CYPHESISUSER -c "createdb -q cyphesis" >/dev/null 2>&1 -+ runuser $CYPHESISUSER -c "createdb -q cyphesis" >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - echo_success -@@ -73,7 +73,7 @@ - echo - # Populate it with rules - echo -n $"Loading database with rules: " -- su $CYPHESISUSER -c "cyloadrules" >/dev/null 2>&1 -+ runuser $CYPHESISUSER -c "cyloadrules" >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - echo_success -@@ -88,7 +88,7 @@ - echo -n $"Starting cyphesis: " - - # Run the server, in self daemonising mode -- su $CYPHESISUSER -c "/usr/bin/cyphesis --cyphesis:daemon=true" >/dev/null 2>&1 -+ runuser $CYPHESISUSER -c "/usr/bin/cyphesis --cyphesis:daemon=true" >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - echo_success -@@ -96,8 +96,24 @@ - else - echo_failure - echo -+ return $RETVAL - fi - echo -+ -+ if [ "$POPULATE_WORLD" == "1" ] ; then -+ echo -n $"Populating cyphesis world: " -+ -+ # Populate the world with game data -+ runuser $CYPHESISUSER -c "/usr/bin/cyclient" >/dev/null 2>&1 -+ RETVAL=$? -+ if [ $RETVAL -eq 0 ]; then -+ echo_success -+ else -+ echo_failure -+ fi -+ echo -+ fi -+ - return $RETVAL - } - -@@ -107,7 +123,10 @@ - killproc cyphesis - RETVAL=$? - echo -- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/cyphesis -+ if [ $RETVAL -eq 0 ] ; then -+ rm -f /var/lock/subsys/cyphesis -+ fi -+ - return $RETVAL - } - diff --git a/cyphesis-0.5.15-sockpath.patch b/cyphesis-0.5.15-sockpath.patch deleted file mode 100644 index 6317cd7..0000000 --- a/cyphesis-0.5.15-sockpath.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- cyphesis-0.5.15/server/CommUnixListener.cpp.orig 2008-04-09 09:42:04.000000000 -0700 -+++ cyphesis-0.5.15/server/CommUnixListener.cpp 2008-04-09 09:43:16.000000000 -0700 -@@ -91,7 +91,11 @@ - /// will never be called in an instance of cyphesis already exists. - int CommUnixListener::setup(const std::string & name) - { -- m_path = var_directory + "/tmp/" + name; -+ if (name[0] != '/') { -+ m_path = var_directory + "/tmp/" + name; -+ } else { -+ m_path = name; -+ } - - m_unixListener.open(m_path); - m_bound = m_unixListener.is_open(); ---- cyphesis-0.5.15/client/ClientConnection.cpp.orig 2008-04-09 09:41:19.000000000 -0700 -+++ cyphesis-0.5.15/client/ClientConnection.cpp 2008-04-09 12:57:43.000000000 -0700 -@@ -142,7 +142,11 @@ - debug(std::cout << "Attempting local connect." << std::endl << std::flush;); - std::string socket; - if (sockname == "") { -- socket = var_directory + "/tmp/" + client_socket_name; -+ if (client_socket_name[0] != '/') { -+ socket = var_directory + "/tmp/" + client_socket_name; -+ } else { -+ socket = client_socket_name; -+ } - } else if (sockname[0] != '/') { - socket = var_directory + "/tmp/" + sockname; - } else { diff --git a/cyphesis-0.5.16-destdir.patch b/cyphesis-0.5.16-destdir.patch deleted file mode 100644 index 1d70b1f..0000000 --- a/cyphesis-0.5.16-destdir.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- cyphesis-0.5.16/rulesets/Makefile.in.orig 2008-07-23 19:56:34.000000000 -0700 -+++ cyphesis-0.5.16/rulesets/Makefile.in 2008-07-23 19:56:56.000000000 -0700 -@@ -466,12 +466,12 @@ - @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - install-dist_moduleDATA: $(dist_module_DATA) - @$(NORMAL_INSTALL) -- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" -+ test -z "$(moduledir)" || $(MKDIR_P) "$(moduledir)" - @list='$(dist_module_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(dist_moduleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ -- $(dist_moduleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(moduledir)/$$f"; \ -+ echo " $(dist_moduleDATA_INSTALL) '$$d$$p' '$(moduledir)/$$f'"; \ -+ $(dist_moduleDATA_INSTALL) "$$d$$p" "$(moduledir)/$$f"; \ - done - - uninstall-dist_moduleDATA: diff --git a/cyphesis-0.5.17-gcrypt-init-fix.patch b/cyphesis-0.5.17-gcrypt-init-fix.patch deleted file mode 100644 index ca9bb4d..0000000 --- a/cyphesis-0.5.17-gcrypt-init-fix.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -u -d -p -r1.36 system.cpp ---- common/system.cpp 1 Nov 2008 02:38:32 -0000 1.36 -+++ common/system.cpp 3 Nov 2008 16:55:02 -0000 -@@ -76,6 +76,13 @@ const std::string get_hostname() - #endif // HAVE_UNAME - } - -+unsigned int security_init() -+{ -+ gcry_check_version(0); -+ -+ return 0; -+} -+ - unsigned int security_check() - { - #ifdef HAVE_GETUID -@@ -97,7 +104,6 @@ static int security_new_key(const std::s - return -1; - } - -- gcry_check_version(0); - gcry_control( GCRYCTL_INIT_SECMEM, 16384, 0 ); - - gcry_sexp_t key_parameters, key; -diff -u -d -p -r1.14 system.h ---- common/system.h 12 Aug 2008 20:40:14 -0000 1.14 -+++ common/system.h 3 Nov 2008 16:55:02 -0000 -@@ -40,6 +40,7 @@ - #include - - const std::string get_hostname(); -+unsigned int security_init(); - unsigned int security_check(); - unsigned int security_setup(); - void reduce_priority(int); -diff -u -d -p -r1.164 server.cpp ---- server/server.cpp 27 Oct 2008 00:53:29 -0000 1.164 -+++ server/server.cpp 3 Nov 2008 16:55:02 -0000 -@@ -61,6 +61,11 @@ static const bool debug_flag = false; - - int main(int argc, char ** argv) - { -+ if (security_init() != 0) { -+ log(CRITICAL, "Security initialisation Error. Exiting."); -+ return EXIT_SECURITY_ERROR; -+ } -+ - if (security_check() != SECURITY_OKAY) { - log(CRITICAL, "Security Error. Exiting."); - return EXIT_SECURITY_ERROR; -diff -u -d -p -r1.7 systemtest.cpp ---- tests/systemtest.cpp 23 Apr 2007 11:22:15 -0000 1.7 -+++ tests/systemtest.cpp 3 Nov 2008 16:55:02 -0000 -@@ -40,7 +40,13 @@ int main() - std::string hostname = get_hostname(); - assert(!hostname.empty()); - -- assert(security_check() == SECURITY_OKAY); -+ int res; -+ -+ res = security_init(); -+ assert(res == 0); -+ -+ res = security_check(); -+ assert(res == SECURITY_OKAY); - - reduce_priority(1); - -diff -u -d -p -r1.38 cypasswd.cpp ---- tools/cypasswd.cpp 14 Nov 2007 22:40:18 -0000 1.38 -+++ tools/cypasswd.cpp 3 Nov 2008 16:55:02 -0000 -@@ -33,6 +33,7 @@ - #include "common/accountbase.h" - #include "common/globals.h" - #include "common/log.h" -+#include "common/system.h" - - #include - #include -@@ -128,6 +129,11 @@ int main(int argc, char ** argv) - return 1; - } - -+ if (security_init() != 0) { -+ log(CRITICAL, "Security initialisation Error. Exiting."); -+ return EXIT_SECURITY_ERROR; -+ } -+ - AccountBase db; - - if (db.init() != 0) { diff --git a/cyphesis-0.5.17-init.patch b/cyphesis-0.5.17-init.patch deleted file mode 100644 index 99b2582..0000000 --- a/cyphesis-0.5.17-init.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff -ur cyphesis-0.5.17.old/cyphesis.init cyphesis-0.5.17/cyphesis.init ---- cyphesis-0.5.17.old/cyphesis.init 2006-09-27 01:33:12.000000000 +0400 -+++ cyphesis-0.5.17/cyphesis.init 2008-11-08 00:03:57.000000000 +0300 -@@ -18,34 +18,36 @@ - CYPHESISUSER=cyphesis - fi - -+CYPHESISPARAMS="--cyphesis:daemon=true --cyphesis:unixport=/var/run/cyphesis/cyphesis.sock" -+ - POSTGRESUSER=postgres - - start() { - # Start the daemon. - - # Make sure postgres superuser exists -- if ! su $POSTGRESUSER -c true >/dev/null 2>&1; then -+ if ! runuser $POSTGRESUSER -c true >/dev/null 2>&1; then - echo - echo $"Could not check for running PostgreSQL database." - return 1 - fi - - # Make sure postgres is running -- if ! su $POSTGRESUSER -c "psql -c \"\" template1" >/dev/null 2>&1; then -+ if ! runuser $POSTGRESUSER -c "psql -c \"\" template1" >/dev/null 2>&1; then - echo $"PostgreSQL server is not running." - return 1 - fi - - # Make sure the user we are going to run as exists -- if ! su $CYPHESISUSER -c true >/dev/null 2>&1; then -+ if ! runuser $CYPHESISUSER -c true >/dev/null 2>&1; then - echo $"Cannot find user $CYPHESISUSER to run cyphesis service." - return 1 - fi - - # Make sure the user has a postgres account -- if ! su $CYPHESISUSER -c "psql -c \"\" template1" >/dev/null 2>&1; then -+ if ! runuser $CYPHESISUSER -c "psql -c \"\" template1" >/dev/null 2>&1; then - echo -n $"Creating PostgreSQL account: " -- su $POSTGRESUSER -c "createuser -A -d -q -R $CYPHESISUSER" >/dev/null 2>&1 -+ runuser $POSTGRESUSER -c "createuser -A -d -q -R $CYPHESISUSER" >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - echo_success -@@ -58,10 +60,10 @@ - fi - - # Make sure the database exists -- if ! su $CYPHESISUSER -c "psql -c \"\" cyphesis" >/dev/null 2>&1; then -+ if ! runuser $CYPHESISUSER -c "psql -c \"\" cyphesis" >/dev/null 2>&1; then - # Create the database - echo -n $"Creating PostgreSQL database: " -- su $CYPHESISUSER -c "createdb -q cyphesis" >/dev/null 2>&1 -+ runuser $CYPHESISUSER -c "createdb -q cyphesis" >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - echo_success -@@ -73,7 +75,7 @@ - echo - # Populate it with rules - echo -n $"Loading database with rules: " -- su $CYPHESISUSER -c "cyloadrules" >/dev/null 2>&1 -+ runuser $CYPHESISUSER -c "cyloadrules" >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - echo_success -@@ -88,7 +90,7 @@ - echo -n $"Starting cyphesis: " - - # Run the server, in self daemonising mode -- su $CYPHESISUSER -c "/usr/bin/cyphesis --cyphesis:daemon=true" >/dev/null 2>&1 -+ runuser $CYPHESISUSER -c "/usr/bin/cyphesis $CYPHESISPARAMS" >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - echo_success -@@ -96,8 +98,24 @@ - else - echo_failure - echo -+ return $RETVAL - fi - echo -+ -+ if [ "$POPULATE_WORLD" == "1" ] ; then -+ echo -n $"Populating cyphesis world: " -+ -+ # Populate the world with game data -+ runuser $CYPHESISUSER -c "/usr/bin/cyclient" >/dev/null 2>&1 -+ RETVAL=$? -+ if [ $RETVAL -eq 0 ]; then -+ echo_success -+ else -+ echo_failure -+ fi -+ echo -+ fi -+ - return $RETVAL - } - -@@ -107,7 +125,10 @@ - killproc cyphesis - RETVAL=$? - echo -- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/cyphesis -+ if [ $RETVAL -eq 0 ] ; then -+ rm -f /var/lock/subsys/cyphesis -+ fi -+ - return $RETVAL - } - diff --git a/cyphesis-0.5.17-sockpath.patch b/cyphesis-0.5.17-sockpath.patch deleted file mode 100644 index 6884704..0000000 --- a/cyphesis-0.5.17-sockpath.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -urp cyphesis-0.5.17.old/client/ClientConnection.cpp cyphesis-0.5.17/client/ClientConnection.cpp ---- cyphesis-0.5.17.old/client/ClientConnection.cpp 2008-01-13 04:32:54.000000000 +0300 -+++ cyphesis-0.5.17/client/ClientConnection.cpp 2008-11-04 11:32:05.000000000 +0300 -@@ -142,7 +142,7 @@ int ClientConnection::connectLocal(const - debug(std::cout << "Attempting local connect." << std::endl << std::flush;); - std::string socket; - if (sockname == "") { -- socket = var_directory + "/tmp/" + client_socket_name; -+ socket = client_socket_name; - } else if (sockname[0] != '/') { - socket = var_directory + "/tmp/" + sockname; - } else { -diff -urp cyphesis-0.5.17.old/common/globals.cpp cyphesis-0.5.17/common/globals.cpp ---- cyphesis-0.5.17.old/common/globals.cpp 2008-04-28 21:26:09.000000000 +0400 -+++ cyphesis-0.5.17/common/globals.cpp 2008-11-04 11:31:11.000000000 +0300 -@@ -339,10 +339,18 @@ void readInstanceConfiguration(const std - client_socket_name = String::compose("cyphesis_%1.sock", section); - } - -+ if (client_socket_name[0] != '/') { -+ client_socket_name = var_directory + "/tmp/" + client_socket_name; -+ } -+ - readConfigItem("slave", "tcpport", slave_port_num); - - readConfigItem("slave", "unixport", slave_socket_name); - -+ if (slave_socket_name[0] != '/') { -+ slave_socket_name = var_directory + "/tmp/" + slave_socket_name; -+ } -+ - readConfigItem("game", "player_vs_player", pvp_flag); - - readConfigItem("game", "player_vs_player_offline", pvp_offl_flag); -diff -urp cyphesis-0.5.17.old/server/CommUnixListener.cpp cyphesis-0.5.17/server/CommUnixListener.cpp ---- cyphesis-0.5.17.old/server/CommUnixListener.cpp 2007-05-29 04:39:18.000000000 +0400 -+++ cyphesis-0.5.17/server/CommUnixListener.cpp 2008-11-04 11:26:20.000000000 +0300 -@@ -91,7 +91,7 @@ void CommUnixListener::dispatch() - /// will never be called in an instance of cyphesis already exists. - int CommUnixListener::setup(const std::string & name) - { -- m_path = var_directory + "/tmp/" + name; -+ m_path = name; - - m_unixListener.open(m_path); - m_bound = m_unixListener.is_open(); -diff -urp cyphesis-0.5.17.old/tools/cyaddrules.cpp cyphesis-0.5.17/tools/cyaddrules.cpp ---- cyphesis-0.5.17.old/tools/cyaddrules.cpp 2007-11-15 01:40:18.000000000 +0300 -+++ cyphesis-0.5.17/tools/cyaddrules.cpp 2008-11-04 11:33:16.000000000 +0300 -@@ -166,11 +166,11 @@ int main(int argc, char ** argv) - passwd.clear(); - - if (server.empty()) { -- std::string localSocket = var_directory + "/tmp/"; -+ std::string localSocket; - if (useslave != 0) { -- localSocket += slave_socket_name; -+ localSocket = slave_socket_name; - } else { -- localSocket += client_socket_name; -+ localSocket = client_socket_name; - } - - if (bridge.connect_unix(localSocket) != 0) { -diff -urp cyphesis-0.5.17.old/tools/cycmd.cpp cyphesis-0.5.17/tools/cycmd.cpp ---- cyphesis-0.5.17.old/tools/cycmd.cpp 2008-09-15 22:16:03.000000000 +0400 -+++ cyphesis-0.5.17/tools/cycmd.cpp 2008-11-04 11:33:05.000000000 +0300 -@@ -1299,11 +1299,11 @@ int main(int argc, char ** argv) - } - - if (server.empty()) { -- std::string localSocket = var_directory + "/tmp/"; -+ std::string localSocket; - if (useslave != 0) { -- localSocket += slave_socket_name; -+ localSocket = slave_socket_name; - } else { -- localSocket += client_socket_name; -+ localSocket = client_socket_name; - } - - std::cout << "Attempting local connection" << std::endl << std::flush;