From: Elena Mamontova Date: Mon, 28 Nov 2016 13:49:27 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/stg-2.409' into ticket37 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/e3703f791ff52f6d7a9d6f9e8dca37a506967c2b?hp=03d22bba09feb7ab3ba9a7b4a08bcdc8bc397419 Merge remote-tracking branch 'origin/stg-2.409' into ticket37 --- diff --git a/projects/libs/build b/projects/libs/build index bc615505..4c1fce9b 100755 --- a/projects/libs/build +++ b/projects/libs/build @@ -107,7 +107,6 @@ else if [ "$OS" == "darwin" ] then DEFS="$DEFS -DDARWIN" - LIBICONV="" fi fi fi diff --git a/projects/rscriptd/build b/projects/rscriptd/build index a2926ed0..995a9373 100755 --- a/projects/rscriptd/build +++ b/projects/rscriptd/build @@ -95,7 +95,6 @@ else then DEFS="$DEFS -DDARWIN" LIB_THREAD=-lpthread - LIBICONV="" else LIB_THREAD=-lc_r fi diff --git a/projects/rscriptd/listener.cpp b/projects/rscriptd/listener.cpp index cc2a0560..0b626afd 100644 --- a/projects/rscriptd/listener.cpp +++ b/projects/rscriptd/listener.cpp @@ -396,6 +396,7 @@ while (it != pending.end() && count < 256) { printfd(__FILE__, "Disconnect user '%s'\n", it->login.c_str()); // Disconnect existing user + uit->params = it->params; Disconnect(*uit); users.erase(uit); } diff --git a/projects/sgauth/build b/projects/sgauth/build index cef1da1d..5f8821b0 100755 --- a/projects/sgauth/build +++ b/projects/sgauth/build @@ -97,7 +97,6 @@ else then DEFS="$DEFS -DDARWIN" LIB_THREAD=-lpthread - LIBICONV="" else LIB_THREAD=-lc_r fi diff --git a/projects/sgconf/build b/projects/sgconf/build index e2eb835b..7ac18e3c 100755 --- a/projects/sgconf/build +++ b/projects/sgconf/build @@ -94,7 +94,6 @@ else then DEFS="$DEFS -DDARWIN" LIB_THREAD=-lpthread - LIBICONV="" else LIB_THREAD=-lc_r fi diff --git a/projects/sgconv/build b/projects/sgconv/build index 1bc23718..5fa0f23c 100755 --- a/projects/sgconv/build +++ b/projects/sgconv/build @@ -100,7 +100,6 @@ else then DEFS="$DEFS -DDARWIN" LIB_THREAD=-lpthread - LIBICONV="" else LIB_THREAD=-lc_r fi diff --git a/projects/stargazer/build b/projects/stargazer/build index 80d17d00..1fbb8a98 100755 --- a/projects/stargazer/build +++ b/projects/stargazer/build @@ -132,7 +132,6 @@ else then DEFS="$DEFS -DDARWIN" LIB_THREAD=-lpthread - LIBICONV="" else LIB_THREAD=-lc_r fi