Mercurial > illumos > illumos-gate
changeset 13383:47508b8cd2eb
1075 smbsrv missing /dev/* link
1076 smbsrv install and packaging cleanup
1088 smbclient devlink.tab and devfsadm cleanup
Reviewed by: Garrett D'Amore <garrett@nexenta.com>
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Approved by: Garrett D'Amore <garrett@nexenta.com>
| author | Gordon Ross <gwr@nexenta.com> |
|---|---|
| date | Fri, 03 Jun 2011 11:40:03 -0400 |
| parents | d84aa76f7cd2 |
| children | 0224f53de4de |
| files | exception_lists/packaging usr/src/cmd/devfsadm/misc_link.c usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile usr/src/cmd/mdb/intel/ia32/smbsrv/Makefile usr/src/cmd/mdb/sparc/v9/smbsrv/Makefile usr/src/cmd/smbsrv/smbd/smbd_main.c usr/src/lib/smbsrv/libsmb/common/smb_kmod.c usr/src/pkg/manifests/service-file-system-smb.mf usr/src/pkg/manifests/system-file-system-smb.mf usr/src/uts/intel/smbsrv/Makefile usr/src/uts/sparc/smbsrv/Makefile |
| diffstat | 11 files changed, 64 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/exception_lists/packaging Thu May 19 15:50:33 2011 -0400 +++ b/exception_lists/packaging Fri Jun 03 11:40:03 2011 -0400 @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2011 Nexenta Systems, Inc. All rights reserved. # # @@ -753,6 +754,22 @@ # usr/lib/smbsrv/dtrace # +# Private/Internal (lint) libraries of smbsrv. Do not ship. +# +usr/lib/reparse/llib-lreparse_smb +usr/lib/reparse/llib-lreparse_smb.ln +usr/lib/smbsrv/llib-lmlrpc +usr/lib/smbsrv/llib-lmlrpc.ln +usr/lib/smbsrv/llib-lmlsvc +usr/lib/smbsrv/llib-lmlsvc.ln +usr/lib/smbsrv/llib-lsmb +usr/lib/smbsrv/llib-lsmb.ln +usr/lib/smbsrv/llib-lsmbns +usr/lib/smbsrv/llib-lsmbns.ln +usr/lib/smbsrv/llib-lsmbrdr +usr/lib/smbsrv/llib-lsmbrdr.ln +# +# # Private/Internal 64-bit libraries of smbsrv. Do not ship. # usr/lib/smbsrv/amd64 i386
--- a/usr/src/cmd/devfsadm/misc_link.c Thu May 19 15:50:33 2011 -0400 +++ b/usr/src/cmd/devfsadm/misc_link.c Fri Jun 03 11:40:03 2011 -0400 @@ -20,6 +20,7 @@ */ /* * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. */ #include <regex.h> @@ -176,7 +177,7 @@ TYPE_EXACT | DRV_EXACT, ILEVEL_0, minor_name, }, { "pseudo", "ddi_pseudo", "nsmb", - TYPE_EXACT | DRV_RE, ILEVEL_1, minor_name, + TYPE_EXACT | DRV_EXACT, ILEVEL_1, minor_name, }, { "pseudo", "ddi_pseudo", "mem_cache", TYPE_EXACT | DRV_RE, ILEVEL_1, minor_name, @@ -184,6 +185,9 @@ { "pseudo", "ddi_pseudo", "fm", TYPE_EXACT | DRV_RE, ILEVEL_1, minor_name, }, + { "pseudo", "ddi_pseudo", "smbsrv", + TYPE_EXACT | DRV_EXACT, ILEVEL_1, minor_name, + }, { "pseudo", "ddi_pseudo", "tpm", TYPE_EXACT | DRV_EXACT, ILEVEL_0, minor_name },
--- a/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile Thu May 19 15:50:33 2011 -0400 +++ b/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile Fri Jun 03 11:40:03 2011 -0400 @@ -21,8 +21,8 @@ # # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright 2011 Nexenta Systems, Inc. All rights reserved. # -#ident "%Z%%M% %I% %E% SMI" MODULE = smbsrv.so MDBTGT = kvm @@ -32,4 +32,10 @@ include ../../../../Makefile.cmd include ../../../../Makefile.cmd.64 include ../../Makefile.amd64 + +ROOTKMOD = $(ROOT)/usr/kernel/kmdb$(MACHMODDIR) + include ../../../Makefile.module + +$(ROOTKMOD): + $(INS.dir)
--- a/usr/src/cmd/mdb/intel/ia32/smbsrv/Makefile Thu May 19 15:50:33 2011 -0400 +++ b/usr/src/cmd/mdb/intel/ia32/smbsrv/Makefile Fri Jun 03 11:40:03 2011 -0400 @@ -21,8 +21,8 @@ # # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright 2011 Nexenta Systems, Inc. All rights reserved. # -#ident "%Z%%M% %I% %E% SMI" MODULE = smbsrv.so MDBTGT = kvm @@ -31,4 +31,10 @@ include ../../../../Makefile.cmd include ../../Makefile.ia32 + +ROOTKMOD = $(ROOT)/usr/kernel/kmdb + include ../../../Makefile.module + +$(ROOTKMOD): + $(INS.dir)
--- a/usr/src/cmd/mdb/sparc/v9/smbsrv/Makefile Thu May 19 15:50:33 2011 -0400 +++ b/usr/src/cmd/mdb/sparc/v9/smbsrv/Makefile Fri Jun 03 11:40:03 2011 -0400 @@ -21,8 +21,8 @@ # # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright 2011 Nexenta Systems, Inc. All rights reserved. # -#ident "%Z%%M% %I% %E% SMI" MODULE = smbsrv.so MDBTGT = kvm @@ -32,4 +32,10 @@ include ../../../../Makefile.cmd include ../../../../Makefile.cmd.64 include ../../Makefile.sparcv9 + +ROOTKMOD = $(ROOT)/usr/kernel/kmdb$(MACHMODDIR) + include ../../../Makefile.module + +$(ROOTKMOD): + $(INS.dir)
--- a/usr/src/cmd/smbsrv/smbd/smbd_main.c Thu May 19 15:50:33 2011 -0400 +++ b/usr/src/cmd/smbsrv/smbd/smbd_main.c Fri Jun 03 11:40:03 2011 -0400 @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. */ #include <sys/types.h> @@ -60,7 +61,6 @@ #define SMBD_ONLINE_WAIT_INTERVAL 10 #define SMBD_REFRESH_INTERVAL 10 -#define DRV_DEVICE_PATH "/devices/pseudo/smbsrv@0:smbsrv" #define SMB_DBDIR "/var/smb" static int smbd_daemonize_init(void);
--- a/usr/src/lib/smbsrv/libsmb/common/smb_kmod.c Thu May 19 15:50:33 2011 -0400 +++ b/usr/src/lib/smbsrv/libsmb/common/smb_kmod.c Fri Jun 03 11:40:03 2011 -0400 @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. */ #include <sys/types.h> @@ -41,7 +42,7 @@ #include <smbsrv/smb_ioctl.h> #include <smbsrv/libsmb.h> -#define SMBDRV_DEVICE_PATH "/devices/pseudo/smbsrv@0:smbsrv" +#define SMBDRV_DEVICE_PATH "/dev/smbsrv" #define SMB_IOC_DATA_SIZE (256 * 1024) static int smb_kmod_ioctl(int, smb_ioc_header_t *, uint32_t);
--- a/usr/src/pkg/manifests/service-file-system-smb.mf Thu May 19 15:50:33 2011 -0400 +++ b/usr/src/pkg/manifests/service-file-system-smb.mf Fri Jun 03 11:40:03 2011 -0400 @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2011 Nexenta Systems, Inc. All rights reserved. # set name=pkg.fmri value=pkg:/service/file-system/smb@$(PKGVERS) @@ -29,11 +30,6 @@ set name=info.classification \ value="org.opensolaris.category.2008:System/File System" set name=variant.arch value=$(ARCH) -dir path=kernel group=sys -dir path=kernel/drv group=sys -dir path=kernel/drv/$(ARCH64) group=sys -dir path=kernel/kmdb group=sys -dir path=kernel/kmdb/$(ARCH64) group=sys dir path=lib dir path=lib/svc dir path=lib/svc/manifest group=sys @@ -41,6 +37,11 @@ dir path=lib/svc/manifest/network/smb group=sys dir path=lib/svc/method dir path=usr group=sys +dir path=usr/kernel group=sys +dir path=usr/kernel/drv group=sys +dir path=usr/kernel/drv/$(ARCH64) group=sys +dir path=usr/kernel/kmdb group=sys +dir path=usr/kernel/kmdb/$(ARCH64) group=sys dir path=usr/lib dir path=usr/lib/fs group=sys dir path=usr/lib/fs/smb group=sys @@ -64,20 +65,18 @@ dir path=var/smb/cvol/windows/system32/vss group=sys dir path=var/svc group=sys driver name=smbsrv perms="* 0640 root sys" -file path=kernel/drv/$(ARCH64)/smbsrv group=sys -$(i386_ONLY)file path=kernel/drv/smbsrv group=sys -file path=kernel/drv/smbsrv.conf group=sys -file path=kernel/kmdb/$(ARCH64)/smbsrv group=sys mode=0555 -$(i386_ONLY)file path=kernel/kmdb/smbsrv group=sys mode=0555 file path=lib/svc/manifest/network/smb/server.xml group=sys mode=0444 file path=lib/svc/method/svc-smbd mode=0555 +file path=usr/kernel/drv/$(ARCH64)/smbsrv group=sys +$(i386_ONLY)file path=usr/kernel/drv/smbsrv group=sys +file path=usr/kernel/drv/smbsrv.conf group=sys +file path=usr/kernel/kmdb/$(ARCH64)/smbsrv group=sys mode=0555 +$(i386_ONLY)file path=usr/kernel/kmdb/smbsrv group=sys mode=0555 file path=usr/lib/fs/smb/$(ARCH64)/libshare_smb.so.1 file path=usr/lib/fs/smb/libshare_smb.so.1 file path=usr/lib/mdb/kvm/$(ARCH64)/smbsrv.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/smbsrv.so group=sys mode=0555 file path=usr/lib/reparse/libreparse_smb.so.1 -file path=usr/lib/reparse/llib-lreparse_smb -file path=usr/lib/reparse/llib-lreparse_smb.ln file path=usr/lib/security/pam_smb_passwd.so.1 file path=usr/lib/smbsrv/libmlrpc.so.1 file path=usr/lib/smbsrv/libmlsvc.so.1 @@ -85,16 +84,6 @@ file path=usr/lib/smbsrv/libsmbns.so.1 file path=usr/lib/smbsrv/libsmbrdr.so.1 file path=usr/lib/smbsrv/libsqlite.so.1 -file path=usr/lib/smbsrv/llib-lmlrpc -file path=usr/lib/smbsrv/llib-lmlrpc.ln -file path=usr/lib/smbsrv/llib-lmlsvc -file path=usr/lib/smbsrv/llib-lmlsvc.ln -file path=usr/lib/smbsrv/llib-lsmb -file path=usr/lib/smbsrv/llib-lsmb.ln -file path=usr/lib/smbsrv/llib-lsmbns -file path=usr/lib/smbsrv/llib-lsmbns.ln -file path=usr/lib/smbsrv/llib-lsmbrdr -file path=usr/lib/smbsrv/llib-lsmbrdr.ln file path=usr/lib/smbsrv/smbd mode=0555 file path=usr/sbin/smbadm mode=0555 file path=usr/sbin/smbstat mode=0555
--- a/usr/src/pkg/manifests/system-file-system-smb.mf Thu May 19 15:50:33 2011 -0400 +++ b/usr/src/pkg/manifests/system-file-system-smb.mf Fri Jun 03 11:40:03 2011 -0400 @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2011 Nexenta Systems, Inc. All rights reserved. # set name=pkg.fmri value=pkg:/system/file-system/smb@$(PKGVERS) @@ -61,7 +62,7 @@ dir path=usr/share/man/man4 dir path=usr/share/man/man5 dir path=usr/share/man/man7fs -driver name=nsmb devlink=type=ddi_pseudo;name=nsmb\t\D perms="* 0666 root sys" +driver name=nsmb perms="* 0666 root sys" file path=lib/svc/manifest/network/smb/client.xml group=sys mode=0444 file path=lib/svc/method/smb-client mode=0555 file path=usr/bin/smbutil mode=0555
--- a/usr/src/uts/intel/smbsrv/Makefile Thu May 19 15:50:33 2011 -0400 +++ b/usr/src/uts/intel/smbsrv/Makefile Fri Jun 03 11:40:03 2011 -0400 @@ -21,12 +21,12 @@ # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright 2011 Nexenta Systems, Inc. All rights reserved. + # # This makefile drives the production of the cifs server file system # kernel module. # -# intel implementation architecture dependent -# # # Path to the base of the uts directory tree (usually /usr/src/uts). @@ -39,7 +39,7 @@ MODULE = smbsrv OBJECTS = $(SMBSRV_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SMBSRV_OBJS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) +ROOTMODULE = $(USR_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/fs/smbsrv #
--- a/usr/src/uts/sparc/smbsrv/Makefile Thu May 19 15:50:33 2011 -0400 +++ b/usr/src/uts/sparc/smbsrv/Makefile Fri Jun 03 11:40:03 2011 -0400 @@ -21,6 +21,7 @@ # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright 2011 Nexenta Systems, Inc. All rights reserved. # # This makefile drives the production of the cifs server file system @@ -38,7 +39,7 @@ MODULE = smbsrv OBJECTS = $(SMBSRV_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SMBSRV_OBJS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) +ROOTMODULE = $(USR_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/fs/smbsrv #