diff options
| author | Michael Adam <obnox@samba.org> | 2015-06-30 14:16:19 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2015-07-07 14:05:27 +0200 |
| commit | 204cbe3645c59b43175beeadad792b4a00e80da3 (patch) | |
| tree | f470ffd4fbe0a5d20f145a03d218eae127f0ce86 /lib | |
| parent | 8fec35994c8b880c681f14291194763759e1c24d (diff) | |
| download | samba-204cbe3645c59b43175beeadad792b4a00e80da3.tar.gz | |
Introduce setting "desired" for 'smb encrypt' and 'client/server signing'
This should trigger the behaviour where the server requires
signing when the client supports it, but does not reject
clients that don't support it.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11372
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/param/loadparm.c | 1 | ||||
| -rw-r--r-- | lib/param/param_table.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index bb215b26992..0e114288e22 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -3207,6 +3207,7 @@ bool lpcfg_server_signing_allowed(struct loadparm_context *lp_ctx, bool *mandato case SMB_SIGNING_REQUIRED: *mandatory = true; break; + case SMB_SIGNING_DESIRED: case SMB_SIGNING_IF_REQUIRED: break; case SMB_SIGNING_DEFAULT: diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 287839fb7d3..ff310381213 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -115,6 +115,7 @@ static const struct enum_list enum_smb_signing_vals[] = { {SMB_SIGNING_IF_REQUIRED, "On"}, {SMB_SIGNING_IF_REQUIRED, "enabled"}, {SMB_SIGNING_IF_REQUIRED, "auto"}, + {SMB_SIGNING_DESIRED, "desired"}, {SMB_SIGNING_REQUIRED, "required"}, {SMB_SIGNING_REQUIRED, "mandatory"}, {SMB_SIGNING_REQUIRED, "force"}, |