diff options
| author | Matt Barden <matt.barden@nexenta.com> | 2017-04-18 08:42:45 -0400 |
|---|---|---|
| committer | Gordon Ross <gwr@nexenta.com> | 2019-08-10 10:04:10 -0400 |
| commit | 3e2c0c0978d26f8b8020b49760008c6bb6e59221 (patch) | |
| tree | 248bc80c9af58bb9dcdfaf775cffadfa78e6e3d5 /usr/src/cmd/smbsrv | |
| parent | 11eb14c0b4910a2d5a319fe0b5bf5c633fbfbfa6 (diff) | |
| download | illumos-joyent-3e2c0c0978d26f8b8020b49760008c6bb6e59221.tar.gz | |
11023 SMB server min_protocol setting
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Approved by: Garrett D'Amore <garrett@damore.org>
Diffstat (limited to 'usr/src/cmd/smbsrv')
| -rwxr-xr-x | usr/src/cmd/smbsrv/fksmbd/Run.sh | 4 | ||||
| -rw-r--r-- | usr/src/cmd/smbsrv/fksmbd/fksmbd_kmod.c | 24 | ||||
| -rw-r--r-- | usr/src/cmd/smbsrv/smbd/server.xml | 2 |
3 files changed, 12 insertions, 18 deletions
diff --git a/usr/src/cmd/smbsrv/fksmbd/Run.sh b/usr/src/cmd/smbsrv/fksmbd/Run.sh index 8d94211d99..fb76e791e6 100755 --- a/usr/src/cmd/smbsrv/fksmbd/Run.sh +++ b/usr/src/cmd/smbsrv/fksmbd/Run.sh @@ -12,7 +12,7 @@ # # -# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# Copyright 2017 Nexenta Systems, Inc. All rights reserved. # # Helper program to run fksmbd (user-space smbd for debugging) @@ -56,7 +56,7 @@ LD_LIBRARY_PATH=$ROOT/usr/lib/smbsrv:$ROOT/usr/lib:$ROOT/lib export LD_LIBRARY_PATH # Enable everything, for debugging -export SMB_MAX_PROTOCOL=3 +export SMB_MAX_PROTOCOL=300 export SMB_SIGNING=require # normally runs with cwd=/ but this is more careful diff --git a/usr/src/cmd/smbsrv/fksmbd/fksmbd_kmod.c b/usr/src/cmd/smbsrv/fksmbd/fksmbd_kmod.c index 2bebe761f4..02e80358ca 100644 --- a/usr/src/cmd/smbsrv/fksmbd/fksmbd_kmod.c +++ b/usr/src/cmd/smbsrv/fksmbd/fksmbd_kmod.c @@ -10,7 +10,7 @@ */ /* - * Copyright 2015 Nexenta Systems, Inc. All rights reserved. + * Copyright 2017 Nexenta Systems, Inc. All rights reserved. */ /* @@ -70,22 +70,14 @@ fksmbd_adjust_config(smb_ioc_header_t *ioc_hdr) ioc->maxconnections, ioc->maxworkers); if ((s = getenv("SMB_MAX_PROTOCOL")) != NULL) { - switch (s[0]) { - case '1': - ioc->max_protocol = SMB_VERS_1; - break; - case '2': - ioc->max_protocol = SMB_VERS_2_1; - break; - case '3': - ioc->max_protocol = SMB_VERS_3_0; - break; - default: - smbd_report("env SMB_MAX_PROTOCOL invalid"); - break; - } + ioc->max_protocol = strtol(s, NULL, 16); + smbd_report("max_protocol=0x%x", ioc->max_protocol); + } + + if ((s = getenv("SMB_MIN_PROTOCOL")) != NULL) { + ioc->min_protocol = strtol(s, NULL, 16); + smbd_report("min_protocol=0x%x", ioc->min_protocol); } - smbd_report("max_protocol=0x%x", ioc->max_protocol); if ((s = getenv("SMB_SIGNING")) != NULL) { ioc->signing_enable = 0; diff --git a/usr/src/cmd/smbsrv/smbd/server.xml b/usr/src/cmd/smbsrv/smbd/server.xml index d6c445f137..ac93f2f70e 100644 --- a/usr/src/cmd/smbsrv/smbd/server.xml +++ b/usr/src/cmd/smbsrv/smbd/server.xml @@ -229,6 +229,8 @@ file. value='true' override='true'/> <propval name='max_protocol' type='astring' value='' override='true'/> + <propval name='min_protocol' type='astring' + value='' override='true'/> <propval name='encrypt' type='astring' value='disabled' override='true'/> <propval name='initial_credits' type='integer' |