prepare for using program_options; sanitize namespaces a bit

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6220a8cc7d4c60333fe433876d3636bca65c2714..de9fb111f7880e8cb4f0b6001080cd3e219f3d38 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.6) 
 project(Dyn-NSupdate)
 
 cmake_minimum_required(VERSION 2.6) 
 project(Dyn-NSupdate)
 

-FIND_PACKAGE( Boost 1.40 COMPONENTS regex REQUIRED )
+FIND_PACKAGE( Boost 1.40 COMPONENTS regex program_options REQUIRED )

 INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
 
 set(DYNNSUPDATE_CONFIG_FILE "/var/lib/bind/dyn-nsupdate.conf" CACHE FILEPATH "Choose the file dyn-nsupdate reads its configuration from (for security reasons, this is hard-coded in the binary)")
 INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
 
 set(DYNNSUPDATE_CONFIG_FILE "/var/lib/bind/dyn-nsupdate.conf" CACHE FILEPATH "Choose the file dyn-nsupdate reads its configuration from (for security reasons, this is hard-coded in the binary)")

diff --git a/dyn-nsupdate.cpp b/dyn-nsupdate.cpp
index f2243bde4ba63a35270a0d9c1e2618ffecf3d3f6..b0bf8852c7ddec7d02b452c1a097f5373283630c 100644 (file)
--- a/dyn-nsupdate.cpp
+++ b/dyn-nsupdate.cpp
@@ -31,13 +31,14 @@
 #include <sys/wait.h>
 
 #include <boost/regex.hpp>
 #include <sys/wait.h>
 
 #include <boost/regex.hpp>

+#include <boost/program_options.hpp>

 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/ini_parser.hpp>
 #include <boost/iostreams/device/file_descriptor.hpp>
 #include <boost/iostreams/stream.hpp>
 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/ini_parser.hpp>
 #include <boost/iostreams/device/file_descriptor.hpp>
 #include <boost/iostreams/stream.hpp>
 

-using namespace boost;
-typedef property_tree::ptree::path_type path;
+namespace pt = boost::property_tree;
+namespace po = boost::program_options;

 
 static void write(int fd, const char *str)
 {
 
 static void write(int fd, const char *str)
 {


@@ -51,9 +52,9 @@ static void write(int fd, const char *str)
 
 int main(int argc, const char ** argv)
 {
 
 int main(int argc, const char ** argv)
 {

-       static const regex regex_ip("\\d{1,3}.\\d{1,3}.\\d{1,3}.\\d{1,3}");
-       static const regex regex_password("[a-zA-Z0-9.:;,_-]+");
-       static const regex regex_domain("[a-zA-Z0-9.]+");
+       static const boost::regex regex_ip("\\d{1,3}.\\d{1,3}.\\d{1,3}.\\d{1,3}");
+       static const boost::regex regex_password("[a-zA-Z0-9.:;,_-]+");
+       static const boost::regex regex_domain("[a-zA-Z0-9.]+");

        
        
        if (argc != 4) {
        
        
        if (argc != 4) {


@@ -81,13 +82,13 @@ int main(int argc, const char ** argv)
        }
        
        /* read configuration */
        }
        
        /* read configuration */

-       property_tree::ptree config;
-       property_tree::ini_parser::read_ini(CONFIG_FILE, config);
+       pt::ptree config;
+       pt::ini_parser::read_ini(CONFIG_FILE, config);

        std::string nsupdate = config.get<std::string>("nsupdate");
        unsigned server_port = config.get<unsigned>("port", 53);
        
        /* Given the domain, check whether the password matches */
        std::string nsupdate = config.get<std::string>("nsupdate");
        unsigned server_port = config.get<unsigned>("port", 53);
        
        /* Given the domain, check whether the password matches */

-       optional<std::string> correct_password = config.get_optional<std::string>(path(domain+"/password", '/'));
+       boost::optional<std::string> correct_password = config.get_optional<std::string>(pt::ptree::path_type(domain+"/password", '/'));

        if (!correct_password || *correct_password != password) {
                std::cerr << "Password incorrect." << std::endl;
                exit(1);
        if (!correct_password || *correct_password != password) {
                std::cerr << "Password incorrect." << std::endl;
                exit(1);