Imported Upstream version 0.3.2

[anytun.git] / src / daemon.hpp

diff --git a/src/daemon.hpp b/src/daemon.hpp
index b62da17..04834ca 100644 (file)
--- a/src/daemon.hpp
+++ b/src/daemon.hpp
@@ -11,14 +11,15 @@
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2008 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, 
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
  *
  *  Anytun is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
  *
  *  Anytun is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,8 +30,8 @@
  *  along with anytun.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _DAEMON_HPP
-#define _DAEMON_HPP
+#ifndef ANYTUN_daemon_hpp_INCLUDED
+#define ANYTUN_daemon_hpp_INCLUDED
 #ifndef NO_DAEMON
 
 #include <poll.h>
@@ -97,7 +98,7 @@ private:
 void do_chroot(std::string const& chrootdir)
 {
   if (getuid() != 0)
-    AnytunError::throwErr() << "this programm has to be run as root in order to run in a chroot";
+    AnytunError::throwErr() << "this program has to be run as root in order to run in a chroot";
 
   if(chroot(chrootdir.c_str()))
     AnytunError::throwErr() << "can't chroot to " << chrootdir;
@@ -162,4 +163,3 @@ void daemonize()
 }
 #endif
 #endif
-