Print this page
11083 support NFS server in zone
Portions contributed by: Dan Kruchinin <dan.kruchinin@nexenta.com>
Portions contributed by: Stepan Zastupov <stepan.zastupov@gmail.com>
Portions contributed by: Joyce McIntosh <joyce.mcintosh@nexenta.com>
Portions contributed by: Mike Zeller <mike@mikezeller.net>
Portions contributed by: Dan McDonald <danmcd@joyent.com>
Portions contributed by: Gordon Ross <gordon.w.ross@gmail.com>
Portions contributed by: Vitaliy Gusev <gusev.vitaliy@gmail.com>
Reviewed by: Rick McNeal <rick.mcneal@nexenta.com>
Reviewed by: Rob Gittins <rob.gittins@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Jason King <jbk@joyent.com>
Reviewed by: C Fraire <cfraire@me.com>
Change-Id: I22f289d357503f9b48a0bc2482cc4328a6d43d16

*** 20,30 **** --- 20,34 ---- */ /* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + */ + + /* * Copyright 2012 Milan Jurik. All rights reserved. + * Copyright 2018 Nexenta Systems, Inc. * Copyright 2019, Joyent, Inc. */ #include <sys/types.h> #include <sys/stat.h>
*** 2165,2182 **** static void show_group(sa_group_t group, int verbose, int properties, char *proto, char *subgroup) { - sa_share_t share; char *groupname; char *zfs = NULL; int iszfs = 0; char *sharepath; groupname = sa_get_group_attr(group, "name"); if (groupname != NULL) { if (proto != NULL && !has_protocol(group, proto)) { sa_free_attr_string(groupname); return; } /* --- 2169,2187 ---- static void show_group(sa_group_t group, int verbose, int properties, char *proto, char *subgroup) { char *groupname; char *zfs = NULL; int iszfs = 0; char *sharepath; groupname = sa_get_group_attr(group, "name"); if (groupname != NULL) { + sa_share_t share; + if (proto != NULL && !has_protocol(group, proto)) { sa_free_attr_string(groupname); return; } /*
*** 2189,2199 **** zfs = sa_get_group_attr(group, "zfs"); if (zfs != NULL) { iszfs = 1; sa_free_attr_string(zfs); } ! share = sa_get_share(group, NULL); if (subgroup == NULL) (void) printf("%s", groupname); else (void) printf(" %s/%s", subgroup, groupname); if (properties) --- 2194,2204 ---- zfs = sa_get_group_attr(group, "zfs"); if (zfs != NULL) { iszfs = 1; sa_free_attr_string(zfs); } ! if (subgroup == NULL) (void) printf("%s", groupname); else (void) printf(" %s/%s", subgroup, groupname); if (properties)