generate_param: generate struct entries if we don't generate access functions.

This shrinks LOADPARM_EXTRA_GLOBALS/LOCALS.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index 2b4cd27ac4ea990be9baa6d8255211c24920d2b9..656b20db837c7e01d4e88ab68581d7b52da08ed2 100644 (file)
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -232,13 +232,9 @@ enum case_handling {CASE_LOWER,CASE_UPPER};
 #define DEFAULT_SMB2_MAX_CREDITS 8192
 
 #define LOADPARM_EXTRA_LOCALS                                          \
-       bool valid;                                                     \
        int usershare;                                                  \
        struct timespec usershare_last_mod;                             \
-       char *copy;                                                     \
        char *szService;                                                \
-       char *include;                                                  \
-       bool available;                                                 \
        struct parmlist_entry *param_opt;                               \
        struct bitmap *copymap;                                         \
        char dummy[3];          /* for alignment */
@@ -247,10 +243,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER};
 
 #define LOADPARM_EXTRA_GLOBALS \
        struct parmlist_entry *param_opt;                               \
-       char *realm_original;                                           \
-       char *idmap_uid;                                                \
-       char *idmap_gid;                                                \
-       char *idmap_backend;
+       char *realm_original;
 
 const char* server_role_str(uint32_t role);
 int lp_find_server_role(int server_role, int security, int domain_logons, int domain_master);

diff --git a/script/generate_param.py b/script/generate_param.py
index ca2b1e977f5661263b3e366dbc706cf6e97d7f0e..7315d868a4f7b6d22fd89ace4bbb4e8beec9953b 100644 (file)
--- a/script/generate_param.py
+++ b/script/generate_param.py
@@ -256,8 +256,6 @@ def make_param_defs(path_in, path_out, scope):
                 continue
             if parameter['synonym'] == "1":
                 continue
-            if parameter['generated'] == "0":
-                continue
 
             if (scope == "GLOBAL" and parameter['context'] != "G" or
                 scope == "LOCAL" and parameter['context'] != "S"):