diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-03 17:22:12 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-01-03 12:33:36 -0600 |
| commit | dcc282590b34537fc1ead61c3300172528273b44 (patch) | |
| tree | 9890dda1e9f3001c23828caf1e8da1afbc3feb45 /source4/param | |
| parent | dc8ccffed40ed5a5978961c632a9e28331a0fd4f (diff) | |
| download | samba-dcc282590b34537fc1ead61c3300172528273b44.tar.gz samba-dcc282590b34537fc1ead61c3300172528273b44.tar.bz2 samba-dcc282590b34537fc1ead61c3300172528273b44.zip | |
r26654: libcli/smb_composite: Rather than specifying each of the gazillion options for SMB individually, just specify the smbcli_options struct.
(This used to be commit 8a97886e24a4b969aa91409c06f423b71a45f6eb)
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 16 | ||||
| -rw-r--r-- | source4/param/param.h | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 66bb44dc3c..2b7b9dd7da 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -63,6 +63,7 @@ #include "lib/util/dlinklist.h" #include "param/param.h" #include "param/loadparm.h" +#include "libcli/raw/libcliraw.h" #define standard_sub_basic talloc_strdup @@ -2605,3 +2606,18 @@ _PUBLIC_ void reload_charcnv(struct loadparm_context *lp_ctx) talloc_free(lp_ctx->iconv_convenience); lp_ctx->iconv_convenience = smb_iconv_convenience_init_lp(lp_ctx, lp_ctx); } + +void lp_smbcli_options(struct loadparm_context *lp_ctx, + struct smbcli_options *options) +{ + options->max_xmit = lp_max_xmit(lp_ctx); + options->max_mux = lp_maxmux(lp_ctx); + options->use_spnego = lp_nt_status_support(lp_ctx) && lp_use_spnego(lp_ctx); + options->signing = lp_client_signing(lp_ctx); + options->request_timeout = SMB_REQUEST_TIMEOUT; + options->ntstatus_support = lp_nt_status_support(lp_ctx); + options->max_protocol = lp_cli_maxprotocol(lp_ctx); + options->unicode = lp_unicode(lp_ctx); + options->use_oplocks = false; + options->use_level2_oplocks = false; +} diff --git a/source4/param/param.h b/source4/param/param.h index 210b21d9a0..098a73deec 100644 --- a/source4/param/param.h +++ b/source4/param/param.h @@ -59,6 +59,7 @@ enum announce_as {/* Types of machine we can announce as. */ struct loadparm_context; struct loadparm_service; +struct smbcli_options; #include "param/proto.h" |