s3:param: the behavior of "client/server signing = auto" is the same as "true"
authorStefan Metzmacher <metze@samba.org>
Wed, 2 Nov 2011 16:30:34 +0000 (17:30 +0100)
committerStefan Metzmacher <metze@samba.org>
Thu, 3 Nov 2011 15:55:11 +0000 (16:55 +0100)
So remove the special case for 'Auto'.

metze

source3/libsmb/clientgen.c
source3/param/loadparm.c
source3/smbd/signing.c

index 683e60aba16f1c29774e849baa79e914af3a1eb6..064be65f82ef2b5ebf865796ef8dc93e9c48afd1 100644 (file)
@@ -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;
index 407ef68d4cacea679587ed5d7c41d1effa9b8926..1aec7095028e4864ab77d4c39552024726f88bab 100644 (file)
@@ -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;
index 8e08ae969160f2126c01d96a71af36cdaf644ce1..9d2e022133132898f4e89948eb3c13a8528f6fe4 100644 (file)
@@ -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: