summaryrefslogtreecommitdiff
path: root/source4/param/loadparm.h
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-08 23:32:33 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:48:55 +0100
commit75ac6cd318ae58aacc77785ba93af50bfe354b63 (patch)
tree9202758c0e48b8e9dd461ce3d7509c3bd7ef146f /source4/param/loadparm.h
parent5c6eacdb04cd18d96dc6313c2a6f934925967e79 (diff)
downloadsamba-75ac6cd318ae58aacc77785ba93af50bfe354b63.tar.gz
samba-75ac6cd318ae58aacc77785ba93af50bfe354b63.tar.bz2
samba-75ac6cd318ae58aacc77785ba93af50bfe354b63.zip
r26351: Fix handling of flags when there are multiple loadparm contexts around.
(This used to be commit c6da76b6142015588854b7a04becbc56679fa51d)
Diffstat (limited to 'source4/param/loadparm.h')
-rw-r--r--source4/param/loadparm.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/source4/param/loadparm.h b/source4/param/loadparm.h
index c4489d6d7f..842e1ce437 100644
--- a/source4/param/loadparm.h
+++ b/source4/param/loadparm.h
@@ -50,7 +50,6 @@ struct parm_struct {
int offset;
bool (*special)(struct loadparm_context *, const char *, char **);
const struct enum_list *enum_list;
- unsigned int flags;
union {
int bvalue;
int ivalue;
@@ -60,17 +59,8 @@ struct parm_struct {
} def;
};
-#define FLAG_BASIC 0x0001 /* fundamental options */
-#define FLAG_SHARE 0x0002 /* file sharing options */
-#define FLAG_PRINT 0x0004 /* printing options */
-#define FLAG_GLOBAL 0x0008 /* local options that should be globally settable in SWAT */
-#define FLAG_WIZARD 0x0010 /* Parameters that the wizard will operate on */
-#define FLAG_ADVANCED 0x0020 /* Parameters that the wizard will operate on */
-#define FLAG_DEVELOPER 0x0040 /* Parameters that the wizard will operate on */
-#define FLAG_DEPRECATED 0x1000 /* options that should no longer be used */
-#define FLAG_HIDE 0x2000 /* options that should be hidden in SWAT */
-#define FLAG_DEFAULT 0x4000 /* this option was a default */
-#define FLAG_CMDLINE 0x8000 /* this option was set from the command line */
+#define FLAG_DEFAULT 0x0001 /* this option was a default */
+#define FLAG_CMDLINE 0x0002 /* this option was set from the command line */
#ifndef PRINTERS_NAME
#define PRINTERS_NAME "printers"