6935899 Add AD connectivity diagnostics

PSARC 2010/120 SMB/CIFS Statistics
6893904 The statistics of the CIFS server must be improved
6947373 only calculate pathname for query fileinfo levels which require it
PSARC 2010/097 idmap:  default unresolvable SID mapping to true
6864900 Enable unresolvable SID mapping by default
6923504 Need detailed tracing for idmap mapping requests
6928157 Need detailed tracing for idmap discovery operations
6949333 Panic in smb_pre_open_print_file
6795069 Commonize error codes between CIFS client and server
6941787 Spurious message "DC discovery failed" upon refresh
6941349 Update shortname support to remove name83 format
6941382 smbsrv should use smb_node_getpath functions instead of vnodetopath
6939494 smb_authenticate() doesn't check for smb_user_login() return
6944226 Need to keep the list of shares in smbsrv
6942697 open file lock count is incorrect on MMC
6941227 On addition of SMB local group, add corresponding POSIX group
6948109 Add ability to manage shares in ZFS group via Windows MMC
6948143 Add ability to set additional properties on Autohome shares
6903260 two "ID type" enumerations
6946940 smb_sid_tostr/fromstr input arguments should be const
6949088 CIFS continuously refresh when one of the interfaces won't properly initialize
6946075 Filebench IO errors when signing property enabled on Solaris CIFS Server
6951169 idmap reports "no such file or directory" when looking up krb5.conf, even when not a domain member
6813063 degraded operation message should occur only when appropriate
6644872 idmapd is too whiny in workgroup mode
6813268 idmapd bangs on DNS server when in workgroup mode
6883800 Trusted domain members won't map to a UID when the trust is one-way
6891704 Cross-forest trust discovery may not work in multi-domain forest
6933937 idmapd doesn't map out trusted domains properly when joined to a domain that isn't the forest root.
6923908 smbadm join CLI doesn't always report Kerberos change password failure
6926930 smbsrv libraries should use krb5_get_error_messsage()
6943528 Unable to update Windows 2008 dynamic dns record with cifs hostname > 15 characters.
6953259 Can't map remote-forest users when IDMU is enabled
6953688 Should allow only one standalone DFS namespace in a cluster system
6952292 smb_find_ads_server() deferences string one too many times
6950070 Share is not getting correct access based on host access control list
6950820 Host-based access control list does not work properly with ipv6_enable=true

--HG--
rename : usr/src/lib/libidmap/common/idmap_priv.h => usr/src/cmd/idmap/idmap/namemaps.h
rename : usr/src/lib/smbsrv/libsmb/common/smb_nicmon.c => usr/src/cmd/smbsrv/smbd/smbd_nicmon.c
rename : usr/src/lib/smbsrv/libmlsvc/common/eventlog_syslog.c => usr/src/lib/smbsrv/libmlsvc/common/eventlog_log.c
rename : usr/src/common/smbsrv/smb_status_xlat.c => usr/src/lib/smbsrv/libsmb/common/smb_status_tbl.c
rename : usr/src/uts/common/smbsrv/doserror.h => usr/src/uts/common/smb/doserror.h
rename : usr/src/uts/common/smbsrv/lmerr.h => usr/src/uts/common/smb/lmerr.h
rename : usr/src/uts/common/smbsrv/nterror.h => usr/src/uts/common/smb/nterror.h
rename : usr/src/uts/common/smbsrv/ntstatus.h => usr/src/uts/common/smb/ntstatus.h

1 files changed, 47 insertions, 4 deletions

diff --git a/usr/src/uts/common/smbsrv/smb_kstat.h b/usr/src/uts/common/smbsrv/smb_kstat.h
index d77cc84eea..00258a2298 100644
--- a/usr/src/uts/common/smbsrv/smb_kstat.h
+++ b/usr/src/uts/common/smbsrv/smb_kstat.h
@@ -19,8 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
@@ -29,17 +28,18 @@
 #ifndef _SMBSRV_SMB_KSTAT_H
 #define	_SMBSRV_SMB_KSTAT_H
 
+#include	<smbsrv/smb.h>
+
 #ifdef	__cplusplus
 extern "C" {
 #endif
 
+#define	SMBSRV_KSTAT_PROCESS		"smbd"
 #define	SMBSRV_KSTAT_MODULE		"smbsrv"
 #define	SMBSRV_KSTAT_CLASS		"net"
 #define	SMBSRV_KSTAT_NAME		"smbsrv"
 #define	SMBSRV_KSTAT_NAME_CMDS		"smbsrv_commands"
 #define	SMBSRV_KSTAT_TXRCACHE		"smb_txreq"
-#define	SMBSRV_KSTAT_UNEXPORT_CACHE	"smb_unexport_cache"
-#define	SMBSRV_KSTAT_VFS_CACHE		"smb_vfs_cache"
 #define	SMBSRV_KSTAT_REQUEST_CACHE	"smb_request_cache"
 #define	SMBSRV_KSTAT_SESSION_CACHE	"smb_session_cache"
 #define	SMBSRV_KSTAT_USER_CACHE		"smb_user_cache"
@@ -48,6 +48,49 @@ extern "C" {
 #define	SMBSRV_KSTAT_ODIR_CACHE		"smb_odir_cache"
 #define	SMBSRV_KSTAT_NODE_CACHE		"smb_node_cache"
 #define	SMBSRV_KSTAT_MBC_CACHE		"smb_mbc_cache"
+#define	SMBSRV_KSTAT_STATISTICS		"smbsrv_statistics"
+#define	SMBSRV_KSTAT_UNSUPPORTED	"Unsupported"
+#define	SMBSRV_KSTAT_WORKERS		"smb_workers"
+
+#pragma pack(1)
+
+typedef struct smb_kstat_utilization {
+	hrtime_t	ku_wtime;
+	hrtime_t	ku_wlentime;
+	hrtime_t	ku_rtime;
+	hrtime_t	ku_rlentime;
+} smb_kstat_utilization_t;
+
+typedef struct smb_kstat_req {
+	char		kr_name[KSTAT_STRLEN];
+	uint64_t	kr_sum;
+	uint64_t	kr_txb;
+	uint64_t	kr_rxb;
+	uint64_t	kr_nreq;
+	uint64_t	kr_a_mean;
+	uint64_t	kr_a_stddev;
+	uint64_t	kr_d_mean;
+	uint64_t	kr_d_stddev;
+} smb_kstat_req_t;
+
+typedef struct smbsrv_kstats {
+	hrtime_t		ks_start_time;
+	uint64_t		ks_txb;		/* Bytes transmitted */
+	uint64_t		ks_rxb;		/* Bytes received */
+	uint64_t		ks_nreq;	/* Requests treated */
+	smb_kstat_utilization_t	ks_utilization;
+	smb_kstat_req_t		ks_reqs[SMB_COM_NUM];
+	uint32_t		ks_nbt_sess;	/* NBT sessions */
+	uint32_t		ks_tcp_sess;	/* TCP sessions */
+	uint32_t		ks_users;	/* Users logged in */
+	uint32_t		ks_trees;	/* Trees connected */
+	uint32_t		ks_files;	/* Open files */
+	uint32_t		ks_pipes;	/* Open pipes */
+	uint32_t		ks_maxreqs;	/* Max number of reqs */
+	uint32_t		ks_padding;
+} smbsrv_kstats_t;
+
+#pragma pack()
 
 #ifdef	__cplusplus
 }