summaryrefslogtreecommitdiff
path: root/manifest
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-08-28 12:02:36 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-08-28 12:02:36 +0000
commit8854c9be792aa0a2df2e16e3e0797838559f16c6 (patch)
treeb4d57064a444fe14d44342cd67f4b2e8f2e3f000 /manifest
parentfa1252de73f343f36bf1e6f366902ba96c480aaa (diff)
parentc5806743f70246f7f708e57514b9103a6291d629 (diff)
downloadillumos-joyent-8854c9be792aa0a2df2e16e3e0797838559f16c6.tar.gz
[illumos-gate merge]release-20190829
commit c5806743f70246f7f708e57514b9103a6291d629 11622 clean up rarer mandoc lint warnings commit 6ae02400ec7326832d2e19e92b4174ec778b2b9f 11620 strtod man page typo equence commit 0463c8009260e445fd1885cfaf98e04a586d495b 11618 Use exec_attr instead of suid for smbfs mount and unmount commit efe44a0312f417787c2d6992582ad06b1b98cd8d 11608 add DKIOC ioctl to report drive UNMAP support Conflicts: usr/src/cmd/fs.d/mount.c
Diffstat (limited to 'manifest')
-rw-r--r--manifest5
1 files changed, 3 insertions, 2 deletions
diff --git a/manifest b/manifest
index b08a8aaf12..b4e6354e91 100644
--- a/manifest
+++ b/manifest
@@ -518,6 +518,7 @@ f etc/security/device_policy 0644 root sys
f etc/security/exec_attr 0644 root sys
d etc/security/exec_attr.d 0755 root sys
f etc/security/exec_attr.d/SUNWcs 0644 root sys
+f etc/security/exec_attr.d/SUNWsmbfs 0644 root sys
f etc/security/extra_privs 0644 root sys
f etc/security/kmfpolicy.xml 0644 root bin
d etc/security/lib 0755 root sys
@@ -5899,9 +5900,9 @@ s usr/lib/fs/smbfs/amd64/libshare_smbfs.so=libshare_smbfs.so.1
f usr/lib/fs/smbfs/dfshares 0555 root bin
f usr/lib/fs/smbfs/libshare_smbfs.so.1 0755 root sys
s usr/lib/fs/smbfs/libshare_smbfs.so=libshare_smbfs.so.1
-f usr/lib/fs/smbfs/mount 4555 root bin
+f usr/lib/fs/smbfs/mount 0555 root bin
f usr/lib/fs/smbfs/share 0555 root bin
-f usr/lib/fs/smbfs/umount 4555 root bin
+f usr/lib/fs/smbfs/umount 0555 root bin
f usr/lib/fs/smbfs/unshare 0555 root bin
d usr/lib/fs/tmpfs 0755 root sys
f usr/lib/fs/tmpfs/mount 0555 root bin