Mercurial > illumos > illumos-gate

changeset 13347:6c866d41744f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
913 dfshares returning failure (1) even when it should return success Reviewed by: Richard Lowe <richlowe@richlowe.net> Reviewed by: Robert Gordon <rbg@openrbg.com> Reviewed by: Garrett D'Amore <garrett@nexenta.com> Approved by: Garrett D'Amore <garrett@nexenta.com>
author Gordon Ross <gwr@nexenta.com>
date Mon, 25 Apr 2011 12:21:08 -0400
parents f3ce1af7c12d
children 4389ac5d32c3
files usr/src/cmd/fs.d/smbclnt/Makefile usr/src/cmd/fs.d/smbclnt/share/Makefile usr/src/cmd/fs.d/smbclnt/share/dfshares.sh usr/src/cmd/fs.d/smbclnt/share/share.sh usr/src/cmd/fs.d/smbclnt/share/unshare.sh usr/src/pkg/manifests/system-file-system-smb.mf
diffstat 6 files changed, 144 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/fs.d/smbclnt/Makefile	Fri Apr 22 00:49:41 2011 -0700
+++ b/usr/src/cmd/fs.d/smbclnt/Makefile	Mon Apr 25 12:21:08 2011 -0400
@@ -30,13 +30,14 @@
 
 include $(SRC)/Makefile.master
 
-SUBDIRS_CATALOG=	smbutil mount umount
+SUBDIRS_CATALOG=	smbutil mount umount share
 SUBDIRS=		$(SUBDIRS_CATALOG) chacl lsacl \
 			smbiod smbiod-svc svc
 
 # for messaging catalog files
 #
-POFILES=        smbutil/smbutil_all.po mount/mount.po umount/umount.po
+POFILES=        smbutil/smbutil_all.po mount/mount.po umount/umount.po \
+		share/share.po share/unshare.po
 POFILE=         smbclnt.po
 
 all:=		TARGET= all
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fs.d/smbclnt/share/Makefile	Mon Apr 25 12:21:08 2011 -0400
@@ -0,0 +1,41 @@
+#
+# 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 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# cmd/fs.d/smbclnt/scripts/Makefile
+
+FSTYPE=		smbfs
+LIBPROG=	dfshares share unshare
+
+include ../../Makefile.fstype
+
+POFILE= 	share.po unshare.po
+CLOBBERFILES+=	$(LIBPROG) $(POFILE)
+
+catalog:	$(POFILE)
+
+lint:
+
+.KEEP_STATE:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fs.d/smbclnt/share/dfshares.sh	Mon Apr 25 12:21:08 2011 -0400
@@ -0,0 +1,33 @@
+#!/usr/bin/sh
+#
+# 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 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# dfshares is a server utility but smbfs is a client
+# filesystem, so dfshares for smbfs will do nothing.
+# This utility is needed because smbfs is included in
+# /etc/dfs/fstypes.
+
+exit 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fs.d/smbclnt/share/share.sh	Mon Apr 25 12:21:08 2011 -0400
@@ -0,0 +1,32 @@
+#!/usr/bin/sh
+#
+# 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 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# This utility is needed because smbfs is included in
+# /etc/dfs/fstypes.
+
+echo `gettext "smbfs share is not supported"` 1>&2
+exit 1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/fs.d/smbclnt/share/unshare.sh	Mon Apr 25 12:21:08 2011 -0400
@@ -0,0 +1,32 @@
+#!/usr/bin/sh
+#
+# 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 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# This utility is needed because smbfs is included in
+# /etc/dfs/fstypes.
+
+echo `gettext "smbfs unshare is not supported"` 1>&2
+exit 1
--- a/usr/src/pkg/manifests/system-file-system-smb.mf	Fri Apr 22 00:49:41 2011 -0700
+++ b/usr/src/pkg/manifests/system-file-system-smb.mf	Mon Apr 25 12:21:08 2011 -0400
@@ -76,9 +76,12 @@
 $(i386_ONLY)file path=usr/kernel/kmdb/smbfs group=sys mode=0555
 file path=usr/lib/$(ARCH64)/libsmbfs.so.1
 file path=usr/lib/fs/smbfs/$(ARCH64)/libshare_smbfs.so.1
+file path=usr/lib/fs/smbfs/dfshares mode=0555
 file path=usr/lib/fs/smbfs/libshare_smbfs.so.1
 file path=usr/lib/fs/smbfs/mount mode=4555
+file path=usr/lib/fs/smbfs/share mode=0555
 file path=usr/lib/fs/smbfs/umount mode=4555
+file path=usr/lib/fs/smbfs/unshare mode=0555
 file path=usr/lib/libsmbfs.so.1
 file path=usr/lib/mdb/kvm/$(ARCH64)/nsmb.so mode=0555
 file path=usr/lib/mdb/kvm/$(ARCH64)/smbfs.so mode=0555