Mercurial > illumos > illumos-gate
changeset 13522:03c15f1e19ad
1720 join domain fails with INVALID_PARAMETER
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Garrett D'Amore <garrett@nexenta.com>
| author | Gordon Ross <gwr@nexenta.com> |
|---|---|
| date | Tue, 15 Nov 2011 12:50:57 -0500 |
| parents | 901a793ed0dd |
| children | 6763769941d2 |
| files | usr/src/lib/libsmbfs/netsmb/smbfs_api.h usr/src/lib/libsmbfs/smb/ntlmssp.c |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/lib/libsmbfs/netsmb/smbfs_api.h Mon Nov 14 19:23:57 2011 -0500 +++ b/usr/src/lib/libsmbfs/netsmb/smbfs_api.h Tue Nov 15 12:50:57 2011 -0500 @@ -90,7 +90,7 @@ #define SMB_AT_NTLM1 4 /* NTLM (v1) */ #define SMB_AT_NTLM2 8 /* NTLMv2 */ #define SMB_AT_KRB5 0x10 /* Kerberos5 (AD) */ -#define SMB_AT_DEFAULT (SMB_AT_KRB5 | SMB_AT_NTLM2 | SMB_AT_NTLM1) +#define SMB_AT_DEFAULT (SMB_AT_KRB5 | SMB_AT_NTLM2) struct smb_ctx; /* anonymous here; real one in smb_lib.h */ typedef struct smb_ctx smb_ctx_t;
--- a/usr/src/lib/libsmbfs/smb/ntlmssp.c Mon Nov 14 19:23:57 2011 -0500 +++ b/usr/src/lib/libsmbfs/smb/ntlmssp.c Tue Nov 15 12:50:57 2011 -0500 @@ -20,6 +20,7 @@ */ /* + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. */ @@ -243,6 +244,11 @@ ctx->ct_hflags2 |= SMB_FLAGS2_SECURITY_SIGNATURE; } + if (ctx->ct_authflags & SMB_AT_NTLM2) + ssp_st->ss_flags |= NTLMSSP_NEGOTIATE_EXTENDED_SESSIONSECURITY; + if (ctx->ct_authflags & SMB_AT_NTLM1) + ssp_st->ss_flags |= NTLMSSP_NEGOTIATE_LM_KEY; + bcopy(ntlmssp_id, &hdr.h_id, ID_SZ); hdr.h_type = 1; /* Type 1 */ hdr.h_flags = ssp_st->ss_flags;