d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable fake resolving of SMB RIDs by using nulldomain and UID_NOBODY

Browse Source 
- fixes panics when Solaris/OpenSolaris pools that contain files
uploaded with the SMB protocol are accessed

Enable seting/unsetting the sharesmb property (dummy action)
- allows users who import pools from Solaris/Opensolaris to unset
the sharesmb property and get rid of annoying messages

PR:		kern/145778, kern/148709
Approved by:	pjd, delphij (mentor)
MFC after:	7 weeks
This commit is contained in:
Martin Matuska 2010-07-22 23:30:24 +00:00
parent 6fc08f19a6
commit 2bacd082bd
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
View File

@ -1265,7 +1265,6 @@ zfs_prop_set(zfs_handle_t *zhp, const char *propname, const char *propval)
case ZFS_PROP_XATTR:
case ZFS_PROP_VSCAN:
case ZFS_PROP_NBMAND:
case ZFS_PROP_SHARESMB:
(void) snprintf(errbuf, sizeof (errbuf),
"property '%s' not supported on FreeBSD", propname);
ret = zfs_error(hdl, EZFS_PERM, errbuf);

26
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c
View File

@ -410,7 +410,7 @@ zfs_fuid_map_id(zfsvfs_t *zfsvfs, uint64_t fuid,
domain = zfs_fuid_find_by_idx(zfsvfs, index);
ASSERT(domain != NULL);
#ifdef TODO
#ifdef sun
if (type == ZFS_OWNER || type == ZFS_ACE_USER) {
(void) kidmap_getuidbysid(crgetzone(cr), domain,
FUID_RID(fuid), &id);
@ -418,9 +418,9 @@ zfs_fuid_map_id(zfsvfs_t *zfsvfs, uint64_t fuid,
(void) kidmap_getgidbysid(crgetzone(cr), domain,
FUID_RID(fuid), &id);
}
#else
panic(__func__);
#endif
#else /* sun */
id = UID_NOBODY;
#endif /* sun */
return (id);
}
@ -514,21 +514,21 @@ zfs_fuid_create_cred(zfsvfs_t *zfsvfs, zfs_fuid_type_t type,
if (!zfsvfs->z_use_fuids || !IS_EPHEMERAL(id))
return ((uint64_t)id);
#ifdef TODO
#ifdef sun
ksid = crgetsid(cr, (type == ZFS_OWNER) ? KSID_OWNER : KSID_GROUP);
VERIFY(ksid != NULL);
rid = ksid_getrid(ksid);
domain = ksid_getdomain(ksid);
#else /* sun */
rid = UID_NOBODY;
domain = nulldomain;
#endif /* sun */
idx = zfs_fuid_find_by_domain(zfsvfs, domain, &kdomain, B_TRUE);
zfs_fuid_node_add(fuidp, kdomain, rid, idx, id, type);
return (FUID_ENCODE(idx, rid));
#else
panic(__func__);
#endif
}
/*
@ -597,7 +597,7 @@ zfs_fuid_create(zfsvfs_t *zfsvfs, uint64_t id, cred_t *cr,
};
domain = fuidp->z_domain_table[idx -1];
} else {
#ifdef TODO
#ifdef sun
if (type == ZFS_OWNER || type == ZFS_ACE_USER)
status = kidmap_getsidbyuid(crgetzone(cr), id,
&domain, &rid);
@ -606,6 +606,7 @@ zfs_fuid_create(zfsvfs_t *zfsvfs, uint64_t id, cred_t *cr,
&domain, &rid);
if (status != 0) {
#endif /* sun */
/*
* When returning nobody we will need to
* make a dummy fuid table entry for logging
@ -613,10 +614,9 @@ zfs_fuid_create(zfsvfs_t *zfsvfs, uint64_t id, cred_t *cr,
*/
rid = UID_NOBODY;
domain = nulldomain;
#ifdef sun
}
#else
panic(__func__);
#endif
#endif /* sun */
}
idx = zfs_fuid_find_by_domain(zfsvfs, domain, &kdomain, B_TRUE);