[PATCH] Merging loadparm further

Garming Sam garming at catalyst.net.nz
Thu Jul 24 20:33:41 MDT 2014


Hi there,

I've run these patches through the usual tests and made sure each patch 
passes the main tests we identified. It also passes the full autobuild 
with the winbindd patches in my other mail.

This set of patches actually makes some good progress in merging the two 
codebases. I managed to remove a reasonable chunk of code.

  lib/param/loadparm.c         | 239 ++++++++++++++++++++++++++----------
  lib/param/loadparm.h         |   1 -
  lib/param/s3_param.h         |   5 -
  source3/param/loadparm.c     | 414 
+++++++++-----------------------------------------------------
  source3/param/loadparm_ctx.c |   5 -
  5 files changed, 235 insertions(+), 429 deletions(-)


Changes from now on should hopefully be quite a bit easier than it was 
back when I started.

In particular, performing a 'do_parameter' is now equivalent and setting 
defaults could be done from the same code.

A review would be appreciated.



Cheers,


Garming Sam
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-param-simplify-lp_do_parameter-to-use-lpcfg-function.patch
Type: text/x-patch
Size: 3614 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-param-Use-the-correct-flag-locations-with-lpcfg_parm.patch
Type: text/x-patch
Size: 1107 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-param-use-lpcfg_do_section-instead-of-lp_do_section.patch
Type: text/x-patch
Size: 3074 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0004-param-add-lp_ctx-as-a-parameter-to-init_globals.patch
Type: text/x-patch
Size: 1823 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0003.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0005-param-remove-unnecessary-uses-of-lp_string_set.patch
Type: text/x-patch
Size: 4836 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0004.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0006-param-add-extra-condition-in-lpcfg_service_ok.patch
Type: text/x-patch
Size: 1164 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0005.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0007-param-use-lpcfg_service_ok-in-s3-loadparm.patch
Type: text/x-patch
Size: 2496 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0006.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0008-param-remove-unused-service_ok-function.patch
Type: text/x-patch
Size: 2535 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0007.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0009-lib-param-fix-comment-in-lpcfg_service_ok.patch
Type: text/x-patch
Size: 981 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0008.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0010-lib-param-make-is_default-more-generic.patch
Type: text/x-patch
Size: 1110 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0009.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0011-param-remove-is_default-method-in-s3.patch
Type: text/x-patch
Size: 3107 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0010.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0012-lib-param-allow-dump_globals-to-check-the-actual-def.patch
Type: text/x-patch
Size: 1316 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0011.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0013-lib-param-rename-dump_globals.patch
Type: text/x-patch
Size: 1210 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0012.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0014-param-use-lpcfg_dump_globals-in-s3-loadparm.patch
Type: text/x-patch
Size: 1773 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0013.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0015-param-remove-unused-dump_globals.patch
Type: text/x-patch
Size: 2024 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0014.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0016-param-make-is_default-method-static-again.patch
Type: text/x-patch
Size: 992 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0015.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0017-lib-param-add-missing-talloc_free-in-lpcfg_file_list.patch
Type: text/x-patch
Size: 909 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0016.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0018-lib-param-add-the-necessary-new-line-for-the-debug-m.patch
Type: text/x-patch
Size: 1005 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0017.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0019-param-change-init_printer_values-to-take-an-lp-ctx.patch
Type: text/x-patch
Size: 4249 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0018.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0020-param-move-init_printer_values-to-lib-param.patch
Type: text/x-patch
Size: 10192 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0019.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0021-remove-init-printer-values-from-helpers.patch
Type: text/x-patch
Size: 3191 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0020.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0022-param-Ensure-that-the-service-pointers-are-not-used-.patch
Type: text/x-patch
Size: 978 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0021.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0023-param-move-all-lp-context-setup-to-a-single-function.patch
Type: text/x-patch
Size: 3931 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0022.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0024-param-remove-lp_get_parameter.patch
Type: text/x-patch
Size: 3092 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0023.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0025-lib-param-remove-unnecessary-lp_do_parameter-call.patch
Type: text/x-patch
Size: 1693 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0024.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0026-param-remove-unused-lp_do_parameter-in-s3-helpers.patch
Type: text/x-patch
Size: 950 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0025.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0027-param-get-rid-of-unnecessary-get_default_loadparm_se.patch
Type: text/x-patch
Size: 2029 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0026.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0028-param-Add-errors-for-when-an-s3-context-is-used-inco.patch
Type: text/x-patch
Size: 1324 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20140725/49641252/attachment-0027.bin>


More information about the samba-technical mailing list