changeset 7055:acb6f058a5df onnv_94

6692347 Number of CIFS shares returned when browsing is limited (missing files)
author amw
date Mon, 07 Jul 2008 23:26:48 -0700
parents 29862a7558ef
children de74e0bc38de
files deleted_files/usr/src/uts/common/smbsrv/lmshare_door.h deleted_files/usr/src/uts/common/smbsrv/smb_winpipe.h usr/src/uts/common/smbsrv/lmshare_door.h usr/src/uts/common/smbsrv/smb_winpipe.h
diffstat 4 files changed, 191 insertions(+), 191 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/uts/common/smbsrv/lmshare_door.h	Mon Jul 07 23:26:48 2008 -0700
@@ -0,0 +1,104 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _SMBSRV_LMSHARE_DOOR_H
+#define	_SMBSRV_LMSHARE_DOOR_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <smbsrv/smbinfo.h>
+#include <smbsrv/smb_common_door.h>
+#include <smbsrv/smbinfo.h>
+
+/*
+ * Door interface for CIFS share management.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define	LMSHR_DOOR_NAME		"/var/run/smb_lmshare_door"
+#define	LMSHR_DOOR_VERSION	1
+
+#define	LMSHR_DOOR_COOKIE	((void*)(0xdeadbeef^LMSHR_DOOR_VERSION))
+#define	LMSHR_DOOR_SIZE		(65 * 1024)
+
+/*
+ * Door interface
+ *
+ * Define door operations
+ */
+#define	LMSHR_DOOR_NUM_SHARES		1
+#define	LMSHR_DOOR_DELETE		2
+#define	LMSHR_DOOR_RENAME		3
+#define	LMSHR_DOOR_GETINFO		4
+#define	LMSHR_DOOR_ADD			5
+#define	LMSHR_DOOR_SETINFO		6
+#define	LMSHR_DOOR_EXISTS		7
+#define	LMSHR_DOOR_IS_SPECIAL		8
+#define	LMSHR_DOOR_IS_RESTRICTED	9
+#define	LMSHR_DOOR_IS_ADMIN		10
+#define	LMSHR_DOOR_IS_VALID		11
+#define	LMSHR_DOOR_IS_DIR		12
+#define	LMSHR_DOOR_LIST			13
+#define	LMSHR_DOOR_ENUM			14
+
+/*
+ * Door server status
+ *
+ * LMSHR_DOOR_ERROR is returned by the door server if there is problem
+ * with marshalling/unmarshalling. Otherwise, LMSHR_DOOR_SUCCESS is
+ * returned.
+ *
+ */
+#define	LMSHR_DOOR_SRV_SUCCESS		0
+#define	LMSHR_DOOR_SRV_ERROR		-1
+
+/*
+ * struct door_request {
+ * 	int		req_type;
+ *	<parameters>
+ *	};
+ *
+ * struct door_response {
+ * 	int		door_srv_status;
+ *	<response>
+ *	};
+ */
+
+void smb_dr_get_lmshare(smb_dr_ctx_t *, lmshare_info_t *);
+void smb_dr_put_lmshare(smb_dr_ctx_t *, lmshare_info_t *);
+
+void smb_dr_get_lmshr_list(smb_dr_ctx_t *, lmshare_list_t *);
+void smb_dr_put_lmshr_list(smb_dr_ctx_t *, lmshare_list_t *);
+
+void lmshrd_door_close(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _SMBSRV_LMSHARE_DOOR_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/uts/common/smbsrv/smb_winpipe.h	Mon Jul 07 23:26:48 2008 -0700
@@ -0,0 +1,87 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _SMB_WINPIPE_H_
+#define	_SMB_WINPIPE_H_
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#ifndef _KERNEL
+#include <stddef.h>
+#endif /* _KERNEL */
+
+#include <sys/thread.h>
+#include <sys/door.h>
+#include <sys/disp.h>
+#include <sys/systm.h>
+#include <sys/processor.h>
+#include <sys/socket.h>
+#include <inet/common.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define	SMB_IO_MAX_SIZE 32
+#define	SMB_MAX_PIPENAMELEN 32
+#define	SMB_CTXT_PIPE_SZ 65536
+#define	SMB_WINPIPE_DOOR_DOWN_PATH "/var/run/winpipe_doordown"
+
+#define	SMB_DOWNCALLINFO_MAGIC	0x19121969
+#define	SMB_MLSVC_DOOR_VERSION 1
+
+#define	SMB_RPC_FLUSH_MAGIC 0x123456CC
+#define	SMB_RPC_TRANSACT 1
+#define	SMB_RPC_READ	 2
+#define	SMB_RPC_WRITE	 3
+#define	SMB_RPC_FLUSH	 4
+
+#define	SMB_WINPIPE_MIN_REQ_SIZE	(sizeof (uint64_t) + \
+	(2 * sizeof (uint32_t)) + (2 * sizeof (uint16_t)))
+
+typedef struct {
+	uint64_t md_tid;	/* caller's thread id */
+	uint16_t md_version;	/* version number, start with 1 */
+	uint16_t md_call_type;	/* transact, read, write, flush */
+	uint32_t md_length;	/* max bytes to return */
+	uint64_t md_reserved;
+} mlsvc_door_hdr_t;
+
+typedef struct {
+	uint32_t sp_pipeid;
+	char	 sp_pipename[SMB_MAX_PIPENAMELEN];
+	int32_t  sp_datalen;
+	uint32_t sp_more_data;
+	char	 sp_data[1]; /* any size buffer */
+} smb_pipe_t;
+
+void smb_downcall_service(void *, door_arg_t *, void (**)(void *, void *),
+    void **, int *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _SMB_WINPIPE_H_ */
--- a/usr/src/uts/common/smbsrv/lmshare_door.h	Mon Jul 07 22:47:28 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _SMBSRV_LMSHARE_DOOR_H
-#define	_SMBSRV_LMSHARE_DOOR_H
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <smbsrv/smbinfo.h>
-#include <smbsrv/smb_common_door.h>
-#include <smbsrv/smbinfo.h>
-
-/*
- * Door interface for CIFS share management.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	LMSHR_DOOR_NAME		"/var/run/smb_lmshare_door"
-#define	LMSHR_DOOR_VERSION	1
-
-#define	LMSHR_DOOR_COOKIE	((void*)(0xdeadbeef^LMSHR_DOOR_VERSION))
-#define	LMSHR_DOOR_SIZE		(65 * 1024)
-
-/*
- * Door interface
- *
- * Define door operations
- */
-#define	LMSHR_DOOR_NUM_SHARES		1
-#define	LMSHR_DOOR_DELETE		2
-#define	LMSHR_DOOR_RENAME		3
-#define	LMSHR_DOOR_GETINFO		4
-#define	LMSHR_DOOR_ADD			5
-#define	LMSHR_DOOR_SETINFO		6
-#define	LMSHR_DOOR_EXISTS		7
-#define	LMSHR_DOOR_IS_SPECIAL		8
-#define	LMSHR_DOOR_IS_RESTRICTED	9
-#define	LMSHR_DOOR_IS_ADMIN		10
-#define	LMSHR_DOOR_IS_VALID		11
-#define	LMSHR_DOOR_IS_DIR		12
-#define	LMSHR_DOOR_LIST			13
-#define	LMSHR_DOOR_ENUM			14
-
-/*
- * Door server status
- *
- * LMSHR_DOOR_ERROR is returned by the door server if there is problem
- * with marshalling/unmarshalling. Otherwise, LMSHR_DOOR_SUCCESS is
- * returned.
- *
- */
-#define	LMSHR_DOOR_SRV_SUCCESS		0
-#define	LMSHR_DOOR_SRV_ERROR		-1
-
-/*
- * struct door_request {
- * 	int		req_type;
- *	<parameters>
- *	};
- *
- * struct door_response {
- * 	int		door_srv_status;
- *	<response>
- *	};
- */
-
-void smb_dr_get_lmshare(smb_dr_ctx_t *, lmshare_info_t *);
-void smb_dr_put_lmshare(smb_dr_ctx_t *, lmshare_info_t *);
-
-void smb_dr_get_lmshr_list(smb_dr_ctx_t *, lmshare_list_t *);
-void smb_dr_put_lmshr_list(smb_dr_ctx_t *, lmshare_list_t *);
-
-void lmshrd_door_close(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SMBSRV_LMSHARE_DOOR_H */
--- a/usr/src/uts/common/smbsrv/smb_winpipe.h	Mon Jul 07 22:47:28 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _SMB_WINPIPE_H_
-#define	_SMB_WINPIPE_H_
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#ifndef _KERNEL
-#include <stddef.h>
-#endif /* _KERNEL */
-
-#include <sys/thread.h>
-#include <sys/door.h>
-#include <sys/disp.h>
-#include <sys/systm.h>
-#include <sys/processor.h>
-#include <sys/socket.h>
-#include <inet/common.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	SMB_IO_MAX_SIZE 32
-#define	SMB_MAX_PIPENAMELEN 32
-#define	SMB_CTXT_PIPE_SZ 65536
-#define	SMB_WINPIPE_DOOR_DOWN_PATH "/var/run/winpipe_doordown"
-
-#define	SMB_DOWNCALLINFO_MAGIC	0x19121969
-#define	SMB_MLSVC_DOOR_VERSION 1
-
-#define	SMB_RPC_FLUSH_MAGIC 0x123456CC
-#define	SMB_RPC_TRANSACT 1
-#define	SMB_RPC_READ	 2
-#define	SMB_RPC_WRITE	 3
-#define	SMB_RPC_FLUSH	 4
-
-#define	SMB_WINPIPE_MIN_REQ_SIZE	(sizeof (uint64_t) + \
-	(2 * sizeof (uint32_t)) + (2 * sizeof (uint16_t)))
-
-typedef struct {
-	uint64_t md_tid;	/* caller's thread id */
-	uint16_t md_version;	/* version number, start with 1 */
-	uint16_t md_call_type;	/* transact, read, write, flush */
-	uint32_t md_length;	/* max bytes to return */
-	uint64_t md_reserved;
-} mlsvc_door_hdr_t;
-
-typedef struct {
-	uint32_t sp_pipeid;
-	char	 sp_pipename[SMB_MAX_PIPENAMELEN];
-	int32_t  sp_datalen;
-	uint32_t sp_more_data;
-	char	 sp_data[1]; /* any size buffer */
-} smb_pipe_t;
-
-void smb_downcall_service(void *, door_arg_t *, void (**)(void *, void *),
-    void **, int *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SMB_WINPIPE_H_ */