diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-07-14 14:51:18 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2017-09-21 17:14:10 +0000 |
| commit | 1c18e8fbd8db41a9fb39bd3ef7a18ee71ece20da (patch) | |
| tree | dea7afb7c9ac3d5b4f6c26d74d67946db7bab2f5 /usr/src | |
| parent | 5f82aa32fbc5dc2c59bca6ff315f44a4c4c9ea86 (diff) | |
| download | illumos-joyent-1c18e8fbd8db41a9fb39bd3ef7a18ee71ece20da.tar.gz | |
8502 illumos#7955 broke delegated datasets when libshare is not present
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Yuri Pankov <yuripv@gmx.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_mount.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_mount.c b/usr/src/lib/libzfs/common/libzfs_mount.c index 45b095f40a..9fd37825a3 100644 --- a/usr/src/lib/libzfs/common/libzfs_mount.c +++ b/usr/src/lib/libzfs/common/libzfs_mount.c @@ -24,6 +24,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2016 by Delphix. All rights reserved. * Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com> + * Copyright 2017 Joyent, Inc. * Copyright 2017 RackTop Systems. */ @@ -664,8 +665,14 @@ _zfs_init_libshare(void) static int zfs_init_libshare_impl(libzfs_handle_t *zhandle, int service, void *arg) { + /* + * libshare is either not installed or we're in a branded zone. The + * rest of the wrapper functions around the libshare calls already + * handle NULL function pointers, but we don't want the callers of + * zfs_init_libshare() to fail prematurely if libshare is not available. + */ if (_sa_init == NULL) - return (SA_CONFIG_ERR); + return (SA_OK); /* * Attempt to refresh libshare. This is necessary if there was a cache |