diff options
| author | Gordon Ross <Gordon.Ross@Sun.COM> | 2010-07-27 17:15:36 -0700 |
|---|---|---|
| committer | Gordon Ross <Gordon.Ross@Sun.COM> | 2010-07-27 17:15:36 -0700 |
| commit | ae3d7f90695ef456a6da4f7bdccd448ebe0b99e1 (patch) | |
| tree | 301931ee79cac0f6bfc269fe70538d9eee256f7f /usr/src/lib/libsmbfs/smb/negprot.c | |
| parent | 9955cef3220047353491339cc68a30a15e92cf98 (diff) | |
| download | illumos-joyent-ae3d7f90695ef456a6da4f7bdccd448ebe0b99e1.tar.gz | |
6955216 Negotiate Protocol fails with latest NetApp server
6962072 Tree connect may fail if addr-to-name lookup fails
6962091 Log messages like: ... smb_maperr32: no direct map for...
6962125 Tree connect failed with latest Isilon server
6972321 improve some error messages
Diffstat (limited to 'usr/src/lib/libsmbfs/smb/negprot.c')
| -rw-r--r-- | usr/src/lib/libsmbfs/smb/negprot.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/usr/src/lib/libsmbfs/smb/negprot.c b/usr/src/lib/libsmbfs/smb/negprot.c index cd6e2866df..9345cd8c47 100644 --- a/usr/src/lib/libsmbfs/smb/negprot.c +++ b/usr/src/lib/libsmbfs/smb/negprot.c @@ -31,8 +31,7 @@ */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. */ /* @@ -111,13 +110,17 @@ smb_negprot(struct smb_ctx *ctx, struct mbdata *oblob) /* * Initialize: vc_hflags and vc_hflags2. * Note: ctx->ct_hflags* are copied into the - * (per request) rqp->rq_hflags* by smb_rq_init, - * so changing them after that call will not - * affect THIS request. + * (per request) rqp->rq_hflags* by smb_rq_init. + * + * Like Windows, set FLAGS2_UNICODE in our first request, + * even though technically we don't yet know whether the + * server supports Unicode. Will clear this flag below + * if we find out it doesn't. Need to do this because + * some servers reject all non-Unicode requests. */ ctx->ct_hflags = SMB_FLAGS_CASELESS; - ctx->ct_hflags2 = (SMB_FLAGS2_ERR_STATUS | - SMB_FLAGS2_KNOWS_LONG_NAMES); + ctx->ct_hflags2 = SMB_FLAGS2_KNOWS_LONG_NAMES | + SMB_FLAGS2_ERR_STATUS | SMB_FLAGS2_UNICODE; /* * Sould we offer extended security? @@ -276,11 +279,12 @@ smb_negprot(struct smb_ctx *ctx, struct mbdata *oblob) } DPRINT("Security signatures: %d", will_sign); - if (sv->sv_caps & SMB_CAP_UNICODE) { + /* See comment above re. FLAGS2_UNICODE */ + if (sv->sv_caps & SMB_CAP_UNICODE) ctx->ct_vcflags |= SMBV_UNICODE; - ctx->ct_hflags2 |= SMB_FLAGS2_UNICODE; + else + ctx->ct_hflags2 &= ~SMB_FLAGS2_UNICODE; - } if ((sv->sv_caps & SMB_CAP_STATUS32) == 0) { /* * They don't do NT error codes. |