[PATCH] make --with-{gpgme,json-audit,libarchive} the default, finish --without-json-audit docs

Andrew Bartlett abartlet at samba.org
Sun May 13 19:09:50 UTC 2018


On Sun, 2018-05-13 at 12:34 +0200, Stefan Metzmacher via samba-
technical wrote:
> Am 10.05.2018 um 04:11 schrieb Andrew Bartlett via samba-technical:
> > Based on a discussion deep in the --with-json-audit thread.
> > 
> > This patch set makes the --with-{gpgme,json-audit,libarchive} options
> > the default.
> > 
> > This means that those wishing to build an AD DC without gpgme need to
> > set --without-gpgme at configure time, rather than this being auto-
> > detected.
> > 
> > Likewise, those not wanting JSON-formatted audit logs to be available
> > need to use --without-json-audit and those wanting a less-full-featured 
> > smbclient can use --without-libarchive.
> > 
> > Naturally all those features are still subject to run-time
> > configuration.
> > 
> > This is consistent with the default of --with-ldap and --with-ads,
> > which has had this behaviour for a number of years.
> > 
> > The rationale is that it makes the documentation easier to follow
> > (avoids saying 'if xxx was detected' which can be difficult for an end
> > user to determine) and ensures that features don't go missing
> > accidentally.  (This can happen due to changes in build environments,
> > particularly when building packages.  We address this by forcing an
> > explicit choice rather than auto-detecting.)
> > 
> > For json-audit, I've taken Rowland's proposed text and added to the
> > smb.conf manpage as per Björn's earlier effort. 
> > 
> > (I do not claim this small step is comprehensive, it just makes us one
> > step closer). 
> > 
> > Finally, I require libarchive for sefltest, avoiding the opportunity
> > for these tests to go missing as others under similar conditionals have
> > done.
> > 
> > The CI results will be here:
> > https://gitlab.com/catalyst-samba/samba/pipelines/21788768
> > 
> > The branch is here:
> > https://gitlab.com/catalyst-samba/samba/commits/abartlet-with-by-default
> > 
> > Please review/push!
> 
> Please change
> DEBUG(0, ("tar mode not compiled. build was --without-libarchive\n"))
> into
> DEBUG(0, ("tar mode not compiled. build used --without-libarchive\n"))

Thanks.  That is much better.

> The indentation of the section starting with
> conf.fatal("GPGME support not found. "
> seems to be wrong, it changed to what we had before
> and the following lines are not all the same...
> 
> The same applies to
> conf.fatal("JSON support not found. " which seem to have 9 leading
> spaces, the following lines seem to be ok if it's reduced to 8.

I'll see what happened there.

> Otherwise it looks good to me.

Thanks metze.  I will clean that up shortly.

Andrew Bartlett

-- 
Andrew Bartlett                       http://samba.org/~abartlet/
Authentication Developer, Samba Team  http://samba.org
Samba Developer, Catalyst IT          http://catalyst.net.nz/services/samba




More information about the samba-technical mailing list