summaryrefslogtreecommitdiff
path: root/manifest
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2018-07-31 15:13:05 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2018-07-31 15:13:05 +0000
commit7cd3f4b8e082236e604a53fa1ab5dacb8d11c0c5 (patch)
tree2cf3b0977768b7a05a135733c7d58288079ee40c /manifest
parentf72f56d9727aa3ebd6798b5f109dbd3d1670cbe5 (diff)
parente5c421abb8bd517cb6964747b9ce23066e1a1cef (diff)
downloadillumos-joyent-7cd3f4b8e082236e604a53fa1ab5dacb8d11c0c5.tar.gz
[illumos-gate merge]
commit e5c421abb8bd517cb6964747b9ce23066e1a1cef 9266 ixgbe: this statement may fall through commit 8a7aa2a592747bd90d85645126d80688e024a0e2 9673 move internet address manipulation functions to libc commit 7e3488dc6cdcb0c04e1ce167a1a3bfef83b5f2e0 9610 qede: error: left shift of negative value commit d972451485b9ccf8c5c4951e2d24f63da9ac2cc8 9609 qede: error: result of '983040 << 16' requires 37 bits to represent, but 'int' only has 32 bits commit 3df3d01f9da8be5cdd1e81a5d050c24ccc55caa9 9608 qede: error: 'free_buffer_count' may be used uninitialized in this function commit 0d7de619fa7b28e48c8e80fa26d724400f4f47a4 9607 qede: this statement may fall through commit 77b62fe435d195b5a58f123e6c5ec9c9dffdc877 9606 qede: error: this 'for' clause does not guard Conflicts: usr/src/man/man1m/route.1m usr/src/lib/libdladm/Makefile.com
Diffstat (limited to 'manifest')
-rw-r--r--manifest22
1 files changed, 11 insertions, 11 deletions
diff --git a/manifest b/manifest
index 508b2dec79..f95673ca87 100644
--- a/manifest
+++ b/manifest
@@ -13358,6 +13358,17 @@ f usr/share/man/man3c/iconv_open.3c 0444 root bin
f usr/share/man/man3c/imaxabs.3c 0444 root bin
f usr/share/man/man3c/imaxdiv.3c 0444 root bin
f usr/share/man/man3c/index.3c 0444 root bin
+f usr/share/man/man3c/inet.3c 0444 root bin
+s usr/share/man/man3c/inet6.3c=inet.3c
+s usr/share/man/man3c/inet_addr.3c=inet.3c
+s usr/share/man/man3c/inet_aton.3c=inet.3c
+s usr/share/man/man3c/inet_lnaof.3c=inet.3c
+s usr/share/man/man3c/inet_makeaddr.3c=inet.3c
+s usr/share/man/man3c/inet_netof.3c=inet.3c
+s usr/share/man/man3c/inet_network.3c=inet.3c
+s usr/share/man/man3c/inet_ntoa.3c=inet.3c
+s usr/share/man/man3c/inet_ntop.3c=inet.3c
+s usr/share/man/man3c/inet_pton.3c=inet.3c
f usr/share/man/man3c/initgroups.3c 0444 root bin
s usr/share/man/man3c/initstate.3c=random.3c
f usr/share/man/man3c/inotify_init.3c 0444 root bin
@@ -17872,8 +17883,6 @@ s usr/share/man/man3socket/if_freenameindex.3socket=if_nametoindex.3socket
s usr/share/man/man3socket/if_indextoname.3socket=if_nametoindex.3socket
s usr/share/man/man3socket/if_nameindex.3socket=if_nametoindex.3socket
f usr/share/man/man3socket/if_nametoindex.3socket 0444 root bin
-f usr/share/man/man3socket/inet.3socket 0444 root bin
-s usr/share/man/man3socket/inet6.3socket=inet.3socket
f usr/share/man/man3socket/inet6_opt.3socket 0444 root bin
s usr/share/man/man3socket/inet6_opt_append.3socket=inet6_opt.3socket
s usr/share/man/man3socket/inet6_opt_find.3socket=inet6_opt.3socket
@@ -17889,15 +17898,6 @@ s usr/share/man/man3socket/inet6_rth_init.3socket=inet6_rth.3socket
s usr/share/man/man3socket/inet6_rth_reverse.3socket=inet6_rth.3socket
s usr/share/man/man3socket/inet6_rth_segments.3socket=inet6_rth.3socket
s usr/share/man/man3socket/inet6_rth_space.3socket=inet6_rth.3socket
-s usr/share/man/man3socket/inet_addr.3socket=inet.3socket
-s usr/share/man/man3socket/inet_aton.3socket=inet.3socket
-s usr/share/man/man3socket/inet_lnaof.3socket=inet.3socket
-s usr/share/man/man3socket/inet_makeaddr.3socket=inet.3socket
-s usr/share/man/man3socket/inet_netof.3socket=inet.3socket
-s usr/share/man/man3socket/inet_network.3socket=inet.3socket
-s usr/share/man/man3socket/inet_ntoa.3socket=inet.3socket
-s usr/share/man/man3socket/inet_ntop.3socket=inet.3socket
-s usr/share/man/man3socket/inet_pton.3socket=inet.3socket
f usr/share/man/man3socket/listen.3socket 0444 root bin
s usr/share/man/man3socket/ntohl.3socket=byteorder.3socket
s usr/share/man/man3socket/ntohll.3socket=byteorder.3socket