Accidentally merged the configdb branch into master. Reverting.

[citadel.git] / citadel / config.h

diff --git a/citadel/config.h b/citadel/config.h
index c07f3ad8e5346e7aedb231dabc830b2faff835e3..eb61711cc44339b857addc0dbafabeab54f200bf 100644 (file)
--- a/citadel/config.h
+++ b/citadel/config.h
@@ -1,22 +1,22 @@
 /*
- * $Id$
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
+ *  This program is open source software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  */
 
 #include "serv_extensions.h"
 #include "citadel_dirs.h"
 
-/* 
- * Global system configuration.  Don't change anything here.  It's all in dtds/config-defs.h now.
- */
-struct config {
-#include "datadefinitions.h"
-#include "dtds/config-defs.h"
-#include "undef_data.h"
-};
-
 
 void get_config(void);
 void put_config(void);
-extern struct config config;
 
+char *CtdlGetSysConfig(char *sysconfname);
+void CtdlPutSysConfig(char *sysconfname, char *sysconfdata);
+void validate_config(void);