diff options
| author | Gordon Ross <gwr@nexenta.com> | 2019-06-21 19:22:54 -0400 |
|---|---|---|
| committer | Gordon Ross <gwr@nexenta.com> | 2019-11-18 11:07:56 -0500 |
| commit | 686670eacbe137c7a9e6c85fef8763f8627a27b5 (patch) | |
| tree | 63dccf1429c09029d41b0a412bf812ec1146f6d0 /usr/src/lib/libsmbfs | |
| parent | 9fe633fd812f2df2354dc88fd3f7f50e94bd8eb3 (diff) | |
| download | illumos-joyent-686670eacbe137c7a9e6c85fef8763f8627a27b5.tar.gz | |
11855 Update SMB client to 3.02
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib/libsmbfs')
| -rw-r--r-- | usr/src/lib/libsmbfs/smb/ctx.c | 8 | ||||
| -rw-r--r-- | usr/src/lib/libsmbfs/smb/rcfile.c | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/usr/src/lib/libsmbfs/smb/ctx.c b/usr/src/lib/libsmbfs/smb/ctx.c index 3aa67fd5f5..64122e3416 100644 --- a/usr/src/lib/libsmbfs/smb/ctx.c +++ b/usr/src/lib/libsmbfs/smb/ctx.c @@ -1411,10 +1411,16 @@ smb_cf_minauth_from_str(char *str) return (-1); } - +/* + * SMB 2.1 is the oldest SMB2 dialect implemented (we skipped SMB 2.002) + * so if we see a_protocol value of just "2" assume they meant 2.1 + */ static struct nv smbver_table[] = { + { "3.02", SMB2_DIALECT_0302 }, + { "3.0", SMB2_DIALECT_0300 }, { "2.1", SMB2_DIALECT_0210 }, + { "2", SMB2_DIALECT_0210 }, { "1", 1 }, { NULL, 0 } }; diff --git a/usr/src/lib/libsmbfs/smb/rcfile.c b/usr/src/lib/libsmbfs/smb/rcfile.c index d7ee2d15af..da96b13c34 100644 --- a/usr/src/lib/libsmbfs/smb/rcfile.c +++ b/usr/src/lib/libsmbfs/smb/rcfile.c @@ -492,8 +492,7 @@ rc_parse(struct rcfile *rcp) if (home_nsmbrc != 0 && ( strcmp(buf, "nbns") == 0 || strcmp(buf, "nbns_enable") == 0 || - strcmp(buf, "nbns_broadcast") == 0 || - strcmp(buf, "signing") == 0)) { + strcmp(buf, "nbns_broadcast") == 0)) { fprintf(stderr, dgettext(TEXT_DOMAIN, "option %s may not be set " "in user .nsmbrc file\n"), buf); |