diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-10-29 11:49:37 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-10-29 11:49:37 +0000 |
| commit | b0ea40cffdde2c3b302cd3bb6b0d467ef2633810 (patch) | |
| tree | f10e864a0be30479226ddef0f044233b1111bd5e /usr/src/lib/libshare/nfs/libshare_nfs.c | |
| parent | d51baec4be65a2e4853e69b2ef4e83fcad5cdaa2 (diff) | |
| parent | 07b64d17ebeb1cc3f2777494d108511275630d14 (diff) | |
| download | illumos-joyent-b0ea40cffdde2c3b302cd3bb6b0d467ef2633810.tar.gz | |
[illumos-gate merge]
commit 07b64d17ebeb1cc3f2777494d108511275630d14
6376 segmentation fault when sharing with 'sec=none,root=*' options
commit 4eab410fb63816fe2c0ad0fd18b4c948613f6616
6369 remove SVM tests from ZFS test suite
Diffstat (limited to 'usr/src/lib/libshare/nfs/libshare_nfs.c')
| -rw-r--r-- | usr/src/lib/libshare/nfs/libshare_nfs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/lib/libshare/nfs/libshare_nfs.c b/usr/src/lib/libshare/nfs/libshare_nfs.c index f749770677..a02237dd71 100644 --- a/usr/src/lib/libshare/nfs/libshare_nfs.c +++ b/usr/src/lib/libshare/nfs/libshare_nfs.c @@ -1095,6 +1095,7 @@ get_rootnames(seconfig_t *sec, char *list, int *count) if (a == NULL) { (void) printf(dgettext(TEXT_DOMAIN, "get_rootnames: no memory\n")); + *count = 0; } else { for (i = 0; i < c; i++) { host = strtok(list, ":"); @@ -1103,6 +1104,7 @@ get_rootnames(seconfig_t *sec, char *list, int *count) free(a[--i]); free(a); a = NULL; + *count = 0; break; } list = NULL; |