diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-01-30 19:02:24 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-01-30 19:02:24 +0000 |
| commit | 6a6a9544b1d7f61e3adb8fd02f81c8ea4bfd7579 (patch) | |
| tree | 3148f3aeee9b297c9fb639856888e9aa8fc17775 /usr/src/cmd/lofiadm | |
| parent | 206425abd9c556b7b39c7249a80ea9b61335c97f (diff) | |
| parent | 6e096e64ab50f0e0567b99c4306fe9f3dead76e6 (diff) | |
| download | illumos-joyent-6a6a9544b1d7f61e3adb8fd02f81c8ea4bfd7579.tar.gz | |
[illumos-gate merge]
commit 6e096e64ab50f0e0567b99c4306fe9f3dead76e6
3015 lofiadm should use libz.so.1, not libz.so
commit 8e268185036f404515ce8bc575423ac390136e3f
4548 update prototypes to 2014
commit 6055fc7a0767fd5991c8054028ffc6d2673ecbf6
4547 e1000g common code doesn't account for LockMAC
commit a43ba7366ce6d85c95e198401ce96efc992c6aeb
4511 Update timezone info db to 2013i
Conflicts:
usr/src/uts/common/io/e1000g/e1000g_main.c (typos)
usr/src/cmd/zic/README.illumos (typos, packaging)
Diffstat (limited to 'usr/src/cmd/lofiadm')
| -rw-r--r-- | usr/src/cmd/lofiadm/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/cmd/lofiadm/main.c b/usr/src/cmd/lofiadm/main.c index d93edd1ea9..0c32b69323 100644 --- a/usr/src/cmd/lofiadm/main.c +++ b/usr/src/cmd/lofiadm/main.c @@ -24,6 +24,7 @@ * Copyright 2012 Joyent, Inc. All rights reserved. * * Copyright 2013 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2014 Gary Mills */ /* @@ -168,7 +169,7 @@ gzip_compress(void *src, size_t srclen, void *dst, size_t *dstlen, int level) /* * The first time we are called, attempt to dlopen() - * libz.so and get a pointer to the compress2() function + * libz.so.1 and get a pointer to the compress2() function */ if (compress2p == NULL) { if ((libz_hdl = openlib(LIBZ)) == NULL) |