summaryrefslogtreecommitdiffstats
path: root/cddl/contrib/opensolaris/lib/libuutil
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2012-09-12 18:05:43 +0000
committermm <mm@FreeBSD.org>2012-09-12 18:05:43 +0000
commit063b8917f2cb6a041f16c02ed902756ef7313642 (patch)
tree29d3d13cef9251473e8e836ba753f5ce34bccd5a /cddl/contrib/opensolaris/lib/libuutil
parented3f0cd13dfb75dc788c906aa7ff44ade3f88e0e (diff)
downloadFreeBSD-src-063b8917f2cb6a041f16c02ed902756ef7313642.zip
FreeBSD-src-063b8917f2cb6a041f16c02ed902756ef7313642.tar.gz
Merge recent zfs vendor changes, sync code and adjust userland DEBUG.
Illumos issued covered: 1884 Empty "used" field for zfs *space commands 3006 VERIFY[S,U,P] and ASSERT[S,U,P] frequently check if first argument is zero 3028 zfs {group,user}space -n prints (null) instead of numeric GID/UID 3048 zfs {user,group}space [-s|-S] is broken 3049 zfs {user,group}space -t doesn't really filter the results 3060 zfs {user,group}space -H output isn't tab-delimited 3061 zfs {user,group}space -o doesn't use specified fields order 3064 usr/src/cmd/zpool/zpool_main.c misspells "successful" 3093 zfs {user,group}space's -i is noop 3098 zfs userspace/groupspace fail without saying why when run as non-root References: https://www.illumos.org/issues/ + [issue_id] Obtained from: illumos (vendor/illumos, vendor/illumos-sys) MFC after: 2 weeks
Diffstat (limited to 'cddl/contrib/opensolaris/lib/libuutil')
-rw-r--r--cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c b/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c
index 507d4eb..b673834 100644
--- a/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c
+++ b/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c
@@ -25,6 +25,8 @@
#include "libuutil_common.h"
+#define HAVE_ASSFAIL 1
+
#include <assert.h>
#include <errno.h>
#include <libintl.h>
OpenPOWER on IntegriCloud