6747532 ns_lookup_bypid spams syslog with too many messages

6888836 Not listing all files in a directory of a CIFS share in Windows XP
6812570 Trans2 is missing pass-through levels: FILE_RENAME_INFORMATION (and others)
6888827 Add Unicode codepage support
6865488 libadutils: leak in ldap_lookup_domains_in_forest()
6888708 idmapd crashing periodically.  Need cores analyzed.
6891342 invalid, redundant SQL in rule WHERE expressions
6891767 minor cleanups in idmap
6892544 Panic occurred at smb_node_ref+0x7f(ffffffd612297310)

--HG--
rename : usr/src/uts/common/smbsrv/cifs.h => usr/src/uts/common/smbsrv/smb.h

1 files changed, 4 insertions, 5 deletions

diff --git a/usr/src/uts/common/fs/smbsrv/smb_negotiate.c b/usr/src/uts/common/fs/smbsrv/smb_negotiate.c
index acca9991c9..17975468cc 100644
--- a/usr/src/uts/common/fs/smbsrv/smb_negotiate.c
+++ b/usr/src/uts/common/fs/smbsrv/smb_negotiate.c
@@ -175,7 +175,7 @@
  * Connectionless clients must set Sid to 0 in the SMB request header.
  *
  * Capabilities allows the server to tell the client what it supports.
- * The bit definitions defined in cifs.h. Bit 0x2000 used to be set in
+ * The bit definitions defined in smb.h. Bit 0x2000 used to be set in
  * the negotiate response capabilities but it caused problems with
  * Windows 2000. It is probably not valid, it doesn't appear in the
  * CIFS spec.
@@ -191,9 +191,8 @@
 #include <sys/socket.h>
 #include <sys/random.h>
 #include <netinet/in.h>
-#include <smbsrv/smb_incl.h>
+#include <smbsrv/smb_kproto.h>
 #include <smbsrv/smbinfo.h>
-#include <smbsrv/smb_i18n.h>
 
 /*
  * Maximum buffer size for DOS: chosen to be the same as NT.
@@ -400,8 +399,8 @@ smb_com_negotiate(smb_request_t *sr)
 		 * skc_nbdomain is not expected to be aligned.
 		 * Use temporary buffer to avoid alignment padding
 		 */
-		buflen = mts_wcequiv_strlen(sr->sr_cfg->skc_nbdomain) +
-		    sizeof (mts_wchar_t);
+		buflen = smb_wcequiv_strlen(sr->sr_cfg->skc_nbdomain) +
+		    sizeof (smb_wchar_t);
 		tmpbuf = kmem_zalloc(buflen, KM_SLEEP);
 		smb_msgbuf_init(&mb, (uint8_t *)tmpbuf, buflen,
 		    SMB_MSGBUF_UNICODE);