diff options
-rw-r--r-- | src/daemon.hpp | 2 | ||||
-rw-r--r-- | src/options.cpp | 4 | ||||
-rw-r--r-- | src/options.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/daemon.hpp b/src/daemon.hpp index d66549b..11d7d40 100644 --- a/src/daemon.hpp +++ b/src/daemon.hpp @@ -63,7 +63,7 @@ void daemonize() close(fd); fd = open("/dev/null",O_RDWR); // stdin if(fd == -1) - cLog.msg(Log::PRIO_WARNING) << "can't open stdin"; + cLog.msg(Log::PRIO_WARNING) << "can't open stdin (chroot and no link to /dev/null?)"; else { if(dup(fd) == -1) // stdout cLog.msg(Log::PRIO_WARNING) << "can't open stdout"; diff --git a/src/options.cpp b/src/options.cpp index 9c3c9ea..868c0bb 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -663,13 +663,13 @@ Options& Options::setAuthAlgo(std::string a) return *this; } -u_int16_t Options::getMux() +mux_t Options::getMux() { Lock lock(mutex); return mux_; } -Options& Options::setMux(u_int16_t m) +Options& Options::setMux(mux_t m) { Lock lock(mutex); mux_ = m; diff --git a/src/options.h b/src/options.h index 11c1a93..56518db 100644 --- a/src/options.h +++ b/src/options.h @@ -113,8 +113,8 @@ public: std::string getAuthAlgo(); Options& setAuthAlgo(std::string a); ConnectToList getConnectTo(); - Options& setMux(u_int16_t m); - u_int16_t getMux(); + Options& setMux(mux_t m); + mux_t getMux(); Options& setKey(std::string k); Buffer getKey(); Options& setSalt(std::string s); @@ -167,7 +167,7 @@ private: std::string cipher_; std::string kd_prf_; std::string auth_algo_; - u_int16_t mux_; + mux_t mux_; Buffer key_; Buffer salt_; RouteList routes_; |