diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-01-24 15:52:15 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-02-20 10:11:17 +1300 |
| commit | 09417890635423a3a0cdae1617595a7af9a96808 (patch) | |
| tree | d23db9d193ec149a5243605aad879fd7ba6773e9 /source3 | |
| parent | 9780113846760dd1cafd11e4091aad28f82639d4 (diff) | |
| download | samba-09417890635423a3a0cdae1617595a7af9a96808.tar.gz samba-09417890635423a3a0cdae1617595a7af9a96808.tar.xz samba-09417890635423a3a0cdae1617595a7af9a96808.zip | |
param: remove generated loadparm ctx table file and include it directly
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Change-Id: I5f1d42e3ae6495accf7a711938cc28c03ab2cd62
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm_ctx.c | 15 | ||||
| -rw-r--r-- | source3/param/wscript_build | 6 |
2 files changed, 14 insertions, 7 deletions
diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c index c85d0772bd..ee999dccfd 100644 --- a/source3/param/loadparm_ctx.c +++ b/source3/param/loadparm_ctx.c @@ -56,7 +56,20 @@ static bool lp_load_for_s4_ctx(const char *filename) return status; } -#include "loadparm_ctx_table.c" +static struct loadparm_s3_helpers s3_fns = +{ + .get_parametric = lp_parm_const_string_service, + .get_parm_struct = lp_get_parameter, + .get_parm_ptr = lp_parm_ptr, + .get_service = lp_service_for_s4_ctx, + .get_servicebynum = lp_servicebynum_for_s4_ctx, + .get_default_loadparm_service = lp_default_loadparm_service, + .get_numservices = lp_numservices, + .load = lp_load_for_s4_ctx, + .set_cmdline = lp_set_cmdline, + .dump = lp_dump, + .dnsdomain = lp_dnsdomain, +}; const struct loadparm_s3_helpers *loadparm_s3_helpers(void) { diff --git a/source3/param/wscript_build b/source3/param/wscript_build index 34a906edcb..2b3efa49ed 100644 --- a/source3/param/wscript_build +++ b/source3/param/wscript_build @@ -14,12 +14,6 @@ bld.SAMBA_GENERATOR('s3_param_proto_h', group='build_source', rule='${PYTHON} ${SRC[0].abspath(env)} --file ${SRC[1].abspath(env)} --output ${TGT} --mode=S3PROTO') -bld.SAMBA_GENERATOR('s3_loadparm_ctx_table_c', - source= '../../script/generate_param.py ../../docs-xml/smbdotconf/parameters.all.xml', - target='loadparm_ctx_table.c', - group='build_source', - rule='${PYTHON} ${SRC[0].abspath(env)} --file ${SRC[1].abspath(env)} --output ${TGT} --mode=S3TABLE') - bld.SAMBA3_PYTHON('pys3param', source='pyparam.c', deps='param', |