Jeremy is going to hate me ...

These are some hacks on SWAT. Maybe users will actually be able to
work out how to use it now.

Unfortunately these changes required some editing in loadparm.c and
smb.h which will make Jeremys merge job harder. Sorry!
(This used to be commit 674c88a6bf4c8009769a482c53f105efdc54bbc8)

2 files changed, 36 insertions, 2 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 47ef5812ca..06b2d4ec78 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -29,6 +29,7 @@ char *urlquote(char *s);
 char *quotequotes(char *s);
 void quote_spaces(char *buf);
 void cgi_setup(char *rootdir);
+char *cgi_baseurl(void);
 
 /*The following definitions come from  charcnv.c  */
 
@@ -382,9 +383,9 @@ BOOL lp_add_home(char *pszHomename, int iDefaultService, char *pszHomedir);
 int lp_add_service(char *pszService, int iDefaultService);
 BOOL lp_add_printer(char *pszPrintername, int iDefaultService);
 BOOL lp_file_list_changed(void);
+void *lp_local_ptr(int snum, void *ptr);
 BOOL lp_do_parameter(int snum, char *pszParmName, char *pszParmValue);
-int lp_next_parameter(int snum, int *i, char *label, 
-			   char *value, int allparameters);
+struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters);
 BOOL lp_snum_ok(int iService);
 BOOL lp_loaded(void);
 void lp_killunused(BOOL (*snumused)(int ));
diff --git a/source3/include/smb.h b/source3/include/smb.h
index f7a134d797..ccb3b0424a 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1643,6 +1643,39 @@ struct connection_options {
   uint16 serverzone;
 };
 
+/* the following are used by loadparm for option lists */
+typedef enum
+{
+  P_BOOL,P_BOOLREV,P_CHAR,P_INTEGER,P_OCTAL,
+  P_STRING,P_USTRING,P_GSTRING,P_UGSTRING,P_ENUM
+} parm_type;
+
+typedef enum
+{
+  P_LOCAL,P_GLOBAL,P_NONE
+} parm_class;
+
+struct enum_list {
+	int value;
+	char *name;
+};
+
+struct parm_struct
+{
+	char *label;
+	parm_type type;
+	parm_class class;
+	void *ptr;
+	BOOL (*special)();
+	struct enum_list *enum_list;
+	unsigned flags;
+};
+
+
+#define FLAG_BASIC 1
+#define FLAG_HIDE  2
+#define FLAG_PRINT 4
+
 #ifndef LOCKING_VERSION
 #define LOCKING_VERSION 4
 #endif /* LOCKING_VERSION */