diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-10-06 19:34:50 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-11 13:41:34 +1100 |
| commit | b21b012756dbb9e7022280b34d7103a5dcbea6d6 (patch) | |
| tree | da02a819454751095f72dde2235dd05e76c3c966 /source4/libcli | |
| parent | 6bed57788c2341a92e1c4431ea764bf037431254 (diff) | |
| download | samba-b21b012756dbb9e7022280b34d7103a5dcbea6d6.tar.gz samba-b21b012756dbb9e7022280b34d7103a5dcbea6d6.tar.bz2 samba-b21b012756dbb9e7022280b34d7103a5dcbea6d6.zip | |
lib/param move source4 param code to the top level
This is done so that the lpcfg_ functions are available across the whole
build, either with the struct loadparm_context loaded from an smb.conf directly
or as a wrapper around the source3 param code.
This is not the final, merged loadparm, but simply one step to make
it easier to solve other problems while we make our slow progress
on this difficult problem.
Andrew Bartlett
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/raw/libcliraw.h | 2 | ||||
| -rw-r--r-- | source4/libcli/raw/signing.h | 4 | ||||
| -rw-r--r-- | source4/libcli/wscript_build | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h index 773fa878d0..b7b02c668e 100644 --- a/source4/libcli/raw/libcliraw.h +++ b/source4/libcli/raw/libcliraw.h @@ -103,7 +103,7 @@ struct smbcli_options { uint32_t max_xmit; uint16_t max_mux; int request_timeout; - enum smb_signing_state signing; + enum smb_signing_setting signing; }; /* this is the context for the client transport layer */ diff --git a/source4/libcli/raw/signing.h b/source4/libcli/raw/signing.h index 56e977ed7c..933db4df74 100644 --- a/source4/libcli/raw/signing.h +++ b/source4/libcli/raw/signing.h @@ -26,10 +26,6 @@ enum smb_signing_engine_state { SMB_SIGNING_ENGINE_ON }; -enum smb_signing_state { - SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED, - SMB_SIGNING_REQUIRED, SMB_SIGNING_AUTO}; - struct smb_signing_context { enum smb_signing_engine_state signing_state; DATA_BLOB mac_key; diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build index 7718e52e7c..6c9454ba13 100644 --- a/source4/libcli/wscript_build +++ b/source4/libcli/wscript_build @@ -33,7 +33,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMPOSITE', bld.SAMBA_PYTHON('pysmb', source='pysmb.c', deps='LIBCLI_SMB_COMPOSITE LIBCLI_SMB2 tevent-util pyparam_util', - public_deps='cli_composite samba-credentials gensec LIBCLI_RESOLVE tevent', + public_deps='cli_composite samba-credentials gensec LIBCLI_RESOLVE tevent param_options', realname='samba/smb.so' ) |