diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-05-20 11:25:38 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-05-20 11:25:38 +0000 |
| commit | 3661b8884914640088b61ea4b966f0a5ef30e4f8 (patch) | |
| tree | 1b68d07bfb13c4aa43a7c670150f72e09623f51d /usr/src/cmd/mdb/intel/amd64 | |
| parent | 3b107e17f43f4696be2ecd53fc2587a9dfcddd10 (diff) | |
| parent | ac2bf314e776a9dcb4faf4d3f88408ed942f0fae (diff) | |
| download | illumos-joyent-3661b8884914640088b61ea4b966f0a5ef30e4f8.tar.gz | |
[illumos-gate merge]
commit ac2bf314e776a9dcb4faf4d3f88408ed942f0fae
10971 SMB2 kstats don't correctly count compound requests
commit 2a19195a95e51d8bfa4d94abf117f9ace761ad08
10970 SMB v1 response incorrect when signature verification fails
commit 41bd85101cd90603ab3220d835461fe851a81fed
10969 SMB server listener stops after a SYN-ACK flood
commit 9c856e866360bf6877f0e47fdfef22bd8e33cf14
10968 Kernel panic in smb_session_delete
commit 58ccc3dc6cf31bbb97afd9f13137fe67844f1c95
10967 Deleting directory over SMB2 fails after visiting in explorer
commit 3cc23d49ba5cd4f88efdb1edefd25a61de55f098
10966 mdb cannot show smbsrv sessions
commit d8adf402a2fbabff65f152e6ce83daf074fffb33
10965 SMB: mdb "::smbreq -v" prints findstack errors
commit 460505369f30f9bc79709c517401bf7ff6d97651
10964 mdb smbsrv SEGV with IPv6 clients
commit bd49ed4555a9b0a9c4989b5985c9fba26da21457
10963 smbsrv mdb module should lookup enum values
commit 764c8bd85562491d470a20cc0353ca8b79069361
10962 Want a way to extract SMB packets from a crash dump
commit 2b8c497c035368b077a9b9afc6244d162a5c9972
10961 want mdb "shares" walker for smbsrv
commit 87ca5dca670d2ebc3089fba0461232c7235b6c4b
10960 SMB2 message sizes cause lock contention in page_create_va
commit e3c4f75e6cff378e04fbbc3b01e48cc1ac546194
10959 intended nbmand locking functionality is confused
commit f4a94a44949883c640dbee4b784ad36ee3986666
10958 CIFS hang with threads stuck in door calls to idmapd
commit c01771d05ccf6c5a8c5e2f14671618dd62daefb8
7530 Non-admin users unable to mount SMB shares
commit e57593366c52a8295bb6c66f8c3b4fbc81dbe427
11044 libmlrpc changes in 1575 missed things in fksmbd
commit 54026d5ae0b8cbf8da5c14341d51f7a3cab03758
10903 Enable compile warnings re. parentheses in smbsrv
commit a9cc46cf4c50667eb8eaf3af6c3bc4a74677b725
10953 Need mitigations for MDS
commit 9907d578e7659d3b5a95811eccd1310078a43a81
11041 missing zfs tests in runfiles
Conflicts:
usr/src/uts/intel/sys/x86_archext.h
usr/src/uts/i86pc/os/cpuid.c
usr/src/uts/i86pc/os/ht.c (deleted in HEAD)
Diffstat (limited to 'usr/src/cmd/mdb/intel/amd64')
| -rw-r--r-- | usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile b/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile index 672b40b332..e22390b335 100644 --- a/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/libfksmbsrv/Makefile @@ -23,13 +23,13 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# Copyright 2013 Nexenta Systems, Inc. All rights reserved. +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. # MODULE = libfksmbsrv.so MDBTGT = proc -MODSRCS = smbsrv.c list.c +MODSRCS = smbsrv.c smbsrv_pcap.c list.c include ../../../../Makefile.cmd include ../../../../Makefile.cmd.64 diff --git a/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile b/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile index 90a7c02643..80ee93484c 100644 --- a/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/smbsrv/Makefile @@ -22,13 +22,19 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# Copyright 2013 Nexenta Systems, Inc. All rights reserved. +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. # MODULE = smbsrv.so MDBTGT = kvm -MODSRCS = smbsrv.c +# +# This signals that $(KMODSRCS) != $(MODSRCS). Dump to a pcap file +# is not available in kmdb, so don't bother compiling that code. +KMOD_SOURCES_DIFFERENT=$(POUND_SIGN) + +KMODSRCS = smbsrv.c +MODSRCS = smbsrv.c smbsrv_pcap.c include ../../../../Makefile.cmd include ../../../../Makefile.cmd.64 |