diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-10-15 13:44:56 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-10-15 13:44:56 +0000 |
| commit | 16d3daed247b1695bbf21679b70086c38d044eb7 (patch) | |
| tree | b6f459dfe48396dbd24f046a2f746892a3d8e630 /usr/src/lib/libsmbfs | |
| parent | 8fe8a39ea9f7811d9c1e2e48a46932561906883f (diff) | |
| parent | a6d101109bfb442cf0db6d8ebb5fb7c32cb16d7e (diff) | |
| download | illumos-joyent-16d3daed247b1695bbf21679b70086c38d044eb7.tar.gz | |
[illumos-gate merge]
commit a6d101109bfb442cf0db6d8ebb5fb7c32cb16d7e
9472 Add smbutil discon command
commit 4226f635096bf9d814aa9fb335518c4855bbe3a3
6375 Add native name demangling support
commit 83b4671e6262c5aa6b4f9fb5a384b1946dfc2e7f
9664 loader: need UEFI32 support
commit e1bf37b1abeb6653a6e35e2bd6924131cced1efe
9884 cw(1) should use -fpic rather than -Kpic
Conflicts:
usr/src/test/util-tests/tests/Makefile
usr/src/cmd/mdb/common/mdb/mdb_demangle.c
Diffstat (limited to 'usr/src/lib/libsmbfs')
| -rw-r--r-- | usr/src/lib/libsmbfs/smb/ctx.c | 7 | ||||
| -rw-r--r-- | usr/src/lib/libsmbfs/smb/findvc.c | 5 | ||||
| -rw-r--r-- | usr/src/lib/libsmbfs/smb/mapfile-vers | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/usr/src/lib/libsmbfs/smb/ctx.c b/usr/src/lib/libsmbfs/smb/ctx.c index e68213b6ef..9455a92344 100644 --- a/usr/src/lib/libsmbfs/smb/ctx.c +++ b/usr/src/lib/libsmbfs/smb/ctx.c @@ -910,7 +910,7 @@ sectype_table[] = { { "ntlm", SMB_AT_NTLM1 }, { "ntlm2", SMB_AT_NTLM2 }, { "krb5", SMB_AT_KRB5 }, - { NULL, 0 }, + { NULL, 0 }, }; int smb_parse_secopts(struct smb_ctx *ctx, const char *arg) @@ -1212,11 +1212,6 @@ smb_ctx_get_ssn(struct smb_ctx *ctx) if ((ctx->ct_flags & SMBCF_RESOLVED) == 0) return (EINVAL); - if (ctx->ct_dev_fd < 0) { - if ((err = smb_ctx_gethandle(ctx))) - return (err); - } - /* * Check whether the driver already has a VC * we can use. If so, we're done! diff --git a/usr/src/lib/libsmbfs/smb/findvc.c b/usr/src/lib/libsmbfs/smb/findvc.c index cfe2cad9e7..63c6cce242 100644 --- a/usr/src/lib/libsmbfs/smb/findvc.c +++ b/usr/src/lib/libsmbfs/smb/findvc.c @@ -96,6 +96,11 @@ smb_ctx_findvc(struct smb_ctx *ctx) if ((ctx->ct_flags & SMBCF_RESOLVED) == 0) return (EINVAL); + if (ctx->ct_dev_fd < 0) { + if ((err = smb_ctx_gethandle(ctx))) + return (err); + } + for (ai = ctx->ct_addrinfo; ai; ai = ai->ai_next) { switch (ai->ai_family) { diff --git a/usr/src/lib/libsmbfs/smb/mapfile-vers b/usr/src/lib/libsmbfs/smb/mapfile-vers index 68b38f46ed..8f0c3905c6 100644 --- a/usr/src/lib/libsmbfs/smb/mapfile-vers +++ b/usr/src/lib/libsmbfs/smb/mapfile-vers @@ -64,6 +64,7 @@ SYMBOL_VERSION SUNWprivate { smb_ctx_alloc; smb_ctx_done; + smb_ctx_findvc; smb_ctx_flags2; smb_ctx_free; smb_ctx_get_ssn; |