Merge commit 'winni/master' into develcvs-commit-366

1 files changed, 7 insertions, 1 deletions

diff --git a/live.cpp b/live.cpp
index f18949c..32a69b6 100644
--- a/live.cpp
+++ b/live.cpp
@@ -1,5 +1,5 @@
 /*
- * httpd.c: A plugin for the Video Disk Recorder
+ * live.cpp: A plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
@@ -15,6 +15,7 @@
 #include "thread.h"
 #include "timers.h"
 #include "preload.h"
+#include "users.h"
 
 namespace vdrlive {
 
@@ -25,6 +26,8 @@ const char *Plugin::DESCRIPTION    = LIVESUMMARY;
 
 std::string Plugin::m_configDirectory;
 
+cUsers Users;
+
 Plugin::Plugin(void)
 {
 }
@@ -52,6 +55,9 @@ bool Plugin::Start(void)
 	// preload files into file Cache
 	PreLoadFileCache(m_configDirectory);
 
+	// load users
+	Users.Load(AddDirectory(m_configDirectory.c_str(), "users.conf"), true);
+
 	// XXX error handling
 	m_thread.reset( new ServerThread );
 	m_thread->Start();