diff options
| author | Renato Botelho <renato@netgate.com> | 2016-10-12 11:41:26 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-10-12 11:41:26 -0300 |
| commit | cb642130dfc50717bb970a104c44aa7690930a38 (patch) | |
| tree | c67f108534217a209198c6b201949ecc73acaba3 /sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c | |
| parent | 5dd7ab172435dc99e1abc1f7d73fd5e720050bbc (diff) | |
| parent | cd04fbc5e631c6b3e80a14eb7044c3be35fba2d2 (diff) | |
| download | FreeBSD-src-cb642130dfc50717bb970a104c44aa7690930a38.zip FreeBSD-src-cb642130dfc50717bb970a104c44aa7690930a38.tar.gz | |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c b/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c index 49540ea..b66fac8 100644 --- a/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c +++ b/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c @@ -22,6 +22,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2010 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com> */ #include <sys/zfs_context.h> @@ -177,8 +178,9 @@ zfs_deleg_verify_nvlist(nvlist_t *nvp) nvpair_name(perm_name)); if (error) return (-1); - } while (perm_name = nvlist_next_nvpair(perms, perm_name)); - } while (who = nvlist_next_nvpair(nvp, who)); + } while ((perm_name = nvlist_next_nvpair(perms, perm_name)) + != NULL); + } while ((who = nvlist_next_nvpair(nvp, who)) != NULL); return (0); } |
