Merge remote-tracking branch 'origin/stg-2.409' into ticket37

diff --git a/projects/libs/build b/projects/libs/build
index bc6155057f16e73209c6cd35158268e2cafa9351..4c1fce9bfd129b8fefe8a5b09bb8217e7a4f9b0c 100755 (executable)
--- 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 a2926ed005c65ecf197efa20f4ff2835273352e0..995a9373a541a764239701ab6850c94f23c1e184 100755 (executable)
--- 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 cc2a05603c88666c9d421fbf752a0e95160563f6..0b626afd1f936be27b20a200f9409797c6cb1c9b 100644 (file)
--- 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 cef1da1d9c63055565d2c980da3bf8492f4e4af3..5f8821b0b803a7fd745898ae65cdfc8277e7787e 100755 (executable)
--- 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 e2eb835b6de59dfc4282688cd4754549fc039e94..7ac18e3c5519deeefa85518f263f2d30e948bac8 100755 (executable)
--- 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 1bc23718283273258ff76eaaca402b2592ebb7d9..5fa0f23c6c92830099a9485c5873c4c3fefadae0 100755 (executable)
--- 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 80d17d00d9c72b6461bb9866a4e56e5cd601de55..1fbb8a98d86b21b618c235ee9bcc87463215baa6 100755 (executable)
--- 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