git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented sharing datasets via SMB using libshare
[zfs.git]
/
lib
/
libzfs
/
libzfs_import.c
diff --git
a/lib/libzfs/libzfs_import.c
b/lib/libzfs/libzfs_import.c
index
98dc878
..
ad343e8
100644
(file)
--- a/
lib/libzfs/libzfs_import.c
+++ b/
lib/libzfs/libzfs_import.c
@@
-1142,14
+1142,15
@@
zpool_find_import_impl(libzfs_handle_t *hdl, importargs_t *iarg)
if (config != NULL) {
boolean_t matched = B_TRUE;
if (config != NULL) {
boolean_t matched = B_TRUE;
+ char *pname;
- if (iarg->poolname != NULL) {
- char *pname;
+ if ((iarg->poolname != NULL) &&
+ (nvlist_lookup_string(config,
+ ZPOOL_CONFIG_POOL_NAME, &pname) == 0)) {
+
+ if (strcmp(iarg->poolname, pname))
+ matched = B_FALSE;
- matched = nvlist_lookup_string(config,
- ZPOOL_CONFIG_POOL_NAME,
- &pname) == 0 &&
- strcmp(iarg->poolname, pname) == 0;
} else if (iarg->guid != 0) {
uint64_t this_guid;
} else if (iarg->guid != 0) {
uint64_t this_guid;