diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-11-02 18:34:27 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-11-03 16:55:12 +0100 |
| commit | 4d8998302c6bb821bfb3a42d40c4c429211d6da8 (patch) | |
| tree | 9b9f0e4f5386158db309258206bf0e6217b60e4e | |
| parent | 22344f3e03e89f6e666c38157c9356cf8a99c08e (diff) | |
| download | samba-4d8998302c6bb821bfb3a42d40c4c429211d6da8.tar.gz samba-4d8998302c6bb821bfb3a42d40c4c429211d6da8.tar.bz2 samba-4d8998302c6bb821bfb3a42d40c4c429211d6da8.zip | |
s3:param: make use of SMB_SIGNING_* constants
metze
| -rw-r--r-- | source3/param/loadparm.c | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 1aec709502..88c855cd8c 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -435,22 +435,24 @@ static const struct enum_list enum_csc_policy[] = { /* SMB signing types. */ static const struct enum_list enum_smb_signing_vals[] = { - {false, "No"}, - {false, "False"}, - {false, "0"}, - {false, "Off"}, - {false, "disabled"}, - {true, "Yes"}, - {true, "True"}, - {true, "1"}, - {true, "On"}, - {true, "enabled"}, - {true, "auto"}, - {Required, "required"}, - {Required, "mandatory"}, - {Required, "force"}, - {Required, "forced"}, - {Required, "enforced"}, + {SMB_SIGNING_DEFAULT, "default"}, + {SMB_SIGNING_OFF, "No"}, + {SMB_SIGNING_OFF, "False"}, + {SMB_SIGNING_OFF, "0"}, + {SMB_SIGNING_OFF, "Off"}, + {SMB_SIGNING_OFF, "disabled"}, + {SMB_SIGNING_IF_REQUIRED, "if_required"}, + {SMB_SIGNING_IF_REQUIRED, "Yes"}, + {SMB_SIGNING_IF_REQUIRED, "True"}, + {SMB_SIGNING_IF_REQUIRED, "1"}, + {SMB_SIGNING_IF_REQUIRED, "On"}, + {SMB_SIGNING_IF_REQUIRED, "enabled"}, + {SMB_SIGNING_IF_REQUIRED, "auto"}, + {SMB_SIGNING_REQUIRED, "required"}, + {SMB_SIGNING_REQUIRED, "mandatory"}, + {SMB_SIGNING_REQUIRED, "force"}, + {SMB_SIGNING_REQUIRED, "forced"}, + {SMB_SIGNING_REQUIRED, "enforced"}, {-1, NULL} }; @@ -4978,8 +4980,8 @@ static void init_globals(bool reinit_globals) Globals.bUseSpnego = true; Globals.bClientUseSpnego = true; - Globals.client_signing = true; - Globals.server_signing = false; + Globals.client_signing = SMB_SIGNING_IF_REQUIRED; + Globals.server_signing = SMB_SIGNING_OFF; Globals.bDeferSharingViolations = true; string_set(&Globals.smb_ports, SMB_PORTS); |