Print this page
NEX-18380 Catch up with illumos SMB fix 9769
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Rick McNeal <rick.mcneal@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
9769 SMB domain logon fails with I18N user name
9774 libmlrpc changes in 1575 missed some things
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Approved by: Robert Mustacchi <rm@joyent.com>
NEX-2225 Unable to join NexentaStor to 2008 AD
NEX-1810 extended security Kerberos (inbound)
NEX-1638 Updated DC Locator
Includes work by: matt.barden@nexenta.com, kevin.crowe@nexenta.com
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/cmd/smbsrv/dtrace/smbd-all.d
+++ new/usr/src/cmd/smbsrv/dtrace/smbd-all.d
1 1 #!/usr/sbin/dtrace -s
2 2 /*
3 3 * This file and its contents are supplied under the terms of the
|
↓ open down ↓ |
3 lines elided |
↑ open up ↑ |
4 4 * Common Development and Distribution License ("CDDL"), version 1.0.
5 5 * You may only use this file in accordance with the terms of version
6 6 * 1.0 of the CDDL.
7 7 *
8 8 * A full copy of the text of the CDDL should have accompanied this
9 9 * source. A copy of the CDDL is also available via the Internet at
10 10 * http://www.illumos.org/license/CDDL.
11 11 */
12 12
13 13 /*
14 - * Copyright 2014 Nexenta Systems, Inc. All rights reserved.
14 + * Copyright 2018 Nexenta Systems, Inc. All rights reserved.
15 15 */
16 16
17 17 /*
18 18 * User-level dtrace for smbd. Watch everything it does.
19 19 * Usage: dtrace -s smbd-all.d -p `pgrep smbd`
20 20 */
21 21
22 22 #pragma D option flowindent
23 23
24 24 self int trace;
25 25 self int mask;
26 26
27 27 /*
28 28 * Trace everything in smbd
29 29 */
30 30 pid$target:*smbd::entry,
31 31 pid$target:libmlsvc.so.1::entry,
32 -pid$target:libmlrpc.so.1::entry,
32 +pid$target:libmlrpc.so.2::entry,
33 33 pid$target:libsmbns.so.1::entry,
34 34 pid$target:libsmb.so.1::entry,
35 35 pid$target:libads.so.1::entry
36 36 {
37 37 self->trace++;
38 38 }
39 39
40 40 /*
41 41 * If traced and not masked, print entry/return
42 42 */
43 43 pid$target:*smbd::entry,
44 44 pid$target:libmlsvc.so.1::entry,
45 -pid$target:libmlrpc.so.1::entry,
45 +pid$target:libmlrpc.so.2::entry,
46 46 pid$target:libsmbns.so.1::entry,
47 47 pid$target:libsmb.so.1::entry,
48 48 pid$target:libads.so.1::entry
49 49 /self->trace > 0 && self->mask == 0/
50 50 {
51 51 printf("\t0x%x", arg0);
52 52 printf("\t0x%x", arg1);
53 53 printf("\t0x%x", arg2);
54 54 printf("\t0x%x", arg3);
55 55 printf("\t0x%x", arg4);
56 56 printf("\t0x%x", arg5);
57 57 }
58 58
59 59 /*
60 60 * Mask (don't print) all function calls below these functions.
61 61 * These make many boring, repetitive function calls like
62 62 * smb_mbtowc, smb_msgbuf_has_space, ...
63 63 *
64 64 * Also, libmlrpc has rather deep call stacks, particularly under
65 65 * ndr_encode_decode_common(), so this stops traces below there.
66 66 * Remove that from the mask actions to see the details.
67 67 */
68 68 pid$target::ht_findfirst:entry,
69 69 pid$target::ht_findnext:entry,
70 70 pid$target::ndr_encode_decode_common:entry,
71 71 pid$target::smb_msgbuf_decode:entry,
72 72 pid$target::smb_msgbuf_encode:entry,
73 73 pid$target::smb_strlwr:entry,
74 74 pid$target::smb_strupr:entry,
75 75 pid$target::smb_wcequiv_strlen:entry
76 76 {
77 77 self->mask++;
78 78 }
79 79
80 80 /*
81 81 * Get some of the smbd debug messages, etc.
82 82 */
83 83 pid$target:libsmb.so.1:smb_trace:entry
84 84 /self->trace > 0 && self->mask == 0/
85 85 {
86 86 printf("%s", copyinstr(arg0));
87 87 }
88 88
89 89 pid$target:libsmb.so.1:smb_syslog:entry
90 90 /self->trace > 0 && self->mask == 0/
91 91 {
92 92 printf("%s", copyinstr(arg1));
93 93 }
94 94
95 95 pid$target:libc_hwcap1.so.1:syslog:entry
96 96 /self->trace > 0 && self->mask == 0/
97 97 {
98 98 printf("%s", copyinstr(arg1));
99 99 }
100 100
101 101 /*
102 102 * Now inverses of above, unwind order.
103 103 */
104 104
105 105 pid$target::ht_findfirst:return,
106 106 pid$target::ht_findnext:return,
107 107 pid$target::ndr_encode_decode_common:return,
108 108 pid$target::smb_msgbuf_decode:return,
|
↓ open down ↓ |
53 lines elided |
↑ open up ↑ |
109 109 pid$target::smb_msgbuf_encode:return,
110 110 pid$target::smb_strlwr:return,
111 111 pid$target::smb_strupr:return,
112 112 pid$target::smb_wcequiv_strlen:return
113 113 {
114 114 self->mask--;
115 115 }
116 116
117 117 pid$target:*smbd::return,
118 118 pid$target:libmlsvc.so.1::return,
119 -pid$target:libmlrpc.so.1::return,
119 +pid$target:libmlrpc.so.2::return,
120 120 pid$target:libsmbns.so.1::return,
121 121 pid$target:libsmb.so.1::return,
122 122 pid$target:libads.so.1::return
123 123 /self->trace > 0 && self->mask == 0/
124 124 {
125 125 printf("\t0x%x", arg1);
126 126 }
127 127
128 128 pid$target:*smbd::return,
129 129 pid$target:libmlsvc.so.1::return,
130 -pid$target:libmlrpc.so.1::return,
130 +pid$target:libmlrpc.so.2::return,
131 131 pid$target:libsmbns.so.1::return,
132 132 pid$target:libsmb.so.1::return,
133 133 pid$target:libads.so.1::return
134 134 {
135 135 self->trace--;
136 136 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX