diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-11-02 17:30:34 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-11-03 16:55:11 +0100 |
| commit | 44d7774a1816da7ce02dadc98535fd67a10905ca (patch) | |
| tree | 3f09b9a5dbedcd45defafd46506805cc52b63b8f | |
| parent | f293438abdfb2f84df6a8c0b6f4bf1c02063e97b (diff) | |
| download | samba-44d7774a1816da7ce02dadc98535fd67a10905ca.tar.gz | |
s3:param: the behavior of "client/server signing = auto" is the same as "true"
So remove the special case for 'Auto'.
metze
| -rw-r--r-- | source3/libsmb/clientgen.c | 1 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 4 | ||||
| -rw-r--r-- | source3/smbd/signing.c | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 683e60aba16..064be65f82e 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -250,7 +250,6 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx, default: case true: case Undefined: - case Auto: allow_smb_signing = true; desire_smb_signing = false; mandatory_signing = false; diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 407ef68d4ca..1aec7095028 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -445,7 +445,7 @@ static const struct enum_list enum_smb_signing_vals[] = { {true, "1"}, {true, "On"}, {true, "enabled"}, - {Auto, "auto"}, + {true, "auto"}, {Required, "required"}, {Required, "mandatory"}, {Required, "force"}, @@ -4978,7 +4978,7 @@ static void init_globals(bool reinit_globals) Globals.bUseSpnego = true; Globals.bClientUseSpnego = true; - Globals.client_signing = Auto; + Globals.client_signing = true; Globals.server_signing = false; Globals.bDeferSharingViolations = true; diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c index 8e08ae96916..9d2e0221331 100644 --- a/source3/smbd/signing.c +++ b/source3/smbd/signing.c @@ -164,8 +164,6 @@ bool srv_init_signing(struct smbd_server_connection *conn) case Required: mandatory = true; break; - case Auto: - break; case True: break; case False: |