Fixed libconfig upgrade incompatabilities (upgraded to v1.1.2)

2 files changed, 6 insertions, 5 deletions

diff --git a/server/configure.in b/server/configure.in
index 339d266..f32ad30 100644
--- a/server/configure.in
+++ b/server/configure.in
@@ -60,7 +60,7 @@ PKG_CHECK_MODULES(PQXX, libpqxx >= 0.20)
 dnl ======================
 dnl Check for libconfig++
 dnl ======================
-PKG_CHECK_MODULES(CONFIG, libconfig++ >= 1.0.1)
+PKG_CHECK_MODULES(CONFIG, libconfig++ = 1.0.1)
 
 
 dnl ======================
diff --git a/server/src/pracrod.cc b/server/src/pracrod.cc
index c9fa58b..7fce884 100644
--- a/server/src/pracrod.cc
+++ b/server/src/pracrod.cc
@@ -152,6 +152,9 @@ int main(int argc, char *argv[])
     }
   }
 
+  //std::basic_string<_CharT, _Traits, _Alloc>::basic_string(const _CharT*, const _Alloc&) [with _CharT = char, _Traits = std::char_traits<char>, _Alloc = std::allocator<char>]
+  //std::basic_string<_CharT, _Traits, _Alloc>::basic_string(const std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char, _Traits = std::char_traits<char>, _Alloc = std::allocator<char>]
+
   char *cfname = NULL;
   if(!configfile) cfname = ETC"/pracrod.conf";
   else cfname = configfile;
@@ -161,8 +164,7 @@ int main(int argc, char *argv[])
   if(!user) {
     std::string userstr;
     try {
-      userstr = (std::string)Pentominos::config()->lookup("user");
-      user = strdup(userstr.c_str());
+      user = (char*)(const char*)Pentominos::config()->lookup("user");
     } catch( ... ) {
       printf("User not found in config.\n");
     }
@@ -190,8 +192,7 @@ int main(int argc, char *argv[])
   if(!group) {
     std::string groupstr;
     try {
-      groupstr = (std::string)Pentominos::config()->lookup("group");
-      group = strdup(groupstr.c_str());
+      group = (char*)(const char*)Pentominos::config()->lookup("group");
     } catch( ... ) {
       printf("Group not found in config.\n");
     }