Print this page
NEX-4083 Upstream changes from illumos 5917 and 5995
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Kevin Crowe <kevin.crowe@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
NEX-3610 CLONE NEX-3591 SMB3 signing
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Dan Fields <dan.fields@nexenta.com>
NEX-2188 Browsing top level share produces RPC error 1728
NEX-1810 extended security Kerberos (inbound) (lint, protocmp)
NEX-1810 extended security Kerberos (inbound)
NEX-1638 Updated DC Locator
Includes work by: matt.barden@nexenta.com, kevin.crowe@nexenta.com
NEX-816 smbadm dumps core during first join attempt
SMB-70 Hang during boot after SMB-50
SMB-56 extended security NTLMSSP, inbound
SMB-39 Use AF_UNIX pipes for RPC
SMB-50 User-mode SMB server
Includes work by these authors:
Thomas Keiser <thomas.keiser@nexenta.com>
Albert Lee <trisk@nexenta.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/cmd/smbsrv/fksmbd/Makefile
+++ new/usr/src/cmd/smbsrv/fksmbd/Makefile
1 1 #
2 2 # CDDL HEADER START
3 3 #
4 4 # The contents of this file are subject to the terms of the
5 5 # Common Development and Distribution License (the "License").
6 6 # You may not use this file except in compliance with the License.
7 7 #
8 8 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 # or http://www.opensolaris.org/os/licensing.
10 10 # See the License for the specific language governing permissions
11 11 # and limitations under the License.
12 12 #
|
↓ open down ↓ |
12 lines elided |
↑ open up ↑ |
13 13 # When distributing Covered Code, include this CDDL HEADER in each
14 14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 # If applicable, add the following below this CDDL HEADER, with the
16 16 # fields enclosed by brackets "[]" replaced with your own identifying
17 17 # information: Portions Copyright [yyyy] [name of copyright owner]
18 18 #
19 19 # CDDL HEADER END
20 20 #
21 21 #
22 22 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
23 -# Copyright 2014 Nexenta Systems, Inc. All rights reserved.
23 +# Copyright 2015 Nexenta Systems, Inc. All rights reserved.
24 24 #
25 25
26 26
27 27 PROG= fksmbd
28 28 OBJS_SMBD= \
29 29 smbd_authsvc.o \
30 30 smbd_doorsvc.o \
31 31 smbd_join.o \
32 32 smbd_krb5lookup.o \
33 33 smbd_krb5ssp.o \
34 34 smbd_logon.o \
35 35 smbd_main.o \
36 36 smbd_nicmon.o \
37 37 smbd_ntlmssp.o \
38 38 smbd_pipesvc.o \
39 39 smbd_share_doorsvc.o \
40 40 smbd_spool.o \
41 41 smbd_vss.o \
42 42
43 43
44 44 OBJS_LOCAL = \
45 45 fksmbd_door.o \
46 46 fksmbd_kmod.o \
47 47 fksmbd_ksock.o \
48 48 fksmbd_log.o \
49 49 fksmbd_shr.o
50 50
51 51 OBJS= ${OBJS_SMBD} ${OBJS_LOCAL}
52 52 SRCS= ${OBJS_SMBD:%.o=../smbd/%.c} \
53 53 ${OBJS_LOCAL:.o=.c}
54 54
55 55 include ../../Makefile.cmd
56 56 include ../../Makefile.ctf
57 57
58 58 # Note: need our sys includes _before_ ENVCPPFLAGS, proto etc.
59 59 CPPFLAGS.first += -I../../../lib/smbsrv/libfksmbsrv/common
60 60
61 61 INCS += -I../smbd
62 62 INCS += -I../../../uts/common
63 63 INCS += -I../../../uts/common/smbsrv
64 64 INCS += -I../../../common/smbsrv
65 65
66 66 # Should not have to do this, but the Kerberos includes are a mess.
67 67 INCS += -I $(ROOT)/usr/include/kerberosv5
68 68
69 69 CSTD= $(CSTD_GNU99)
70 70 C99LMODE= -Xc99=%all
71 71
72 72 CFLAGS += $(CCVERBOSE)
|
↓ open down ↓ |
39 lines elided |
↑ open up ↑ |
73 73 CFLAGS64 += $(CCVERBOSE)
74 74 CPPFLAGS += -D_REENTRANT
75 75 CPPFLAGS += -Dsyslog=smb_syslog
76 76 CPPFLAGS += -D_LARGEFILE64_SOURCE=1
77 77 CPPFLAGS += -DFKSMBD
78 78 # Always debug here
79 79 CPPFLAGS += -DDEBUG
80 80 CPPFLAGS += $(INCS)
81 81
82 82 LDFLAGS += $(ZNOLAZYLOAD)
83 -LDFLAGS += -R/usr/lib/smbsrv
83 +LDFLAGS += '-R$$ORIGIN' '-R$$ORIGIN/..'
84 84 LDLIBS += -L$(ROOT)/usr/lib/smbsrv
85 85 LDLIBS += -lfksmbsrv -lfakekernel
86 86 # prefer to keep libs ordered by dependence
87 87 LDLIBS += -lmlsvc -lmlrpc -lsmbns -lsmb -lsmbfs -lgss
88 88 LDLIBS += -lzfs -lbsm -lscf -lcmdutils -lsocket -lnsl -lumem
89 89 $(PROG) := LDLIBS += -lkrb5
90 90
91 91 LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
92 92 LINTFLAGS += -xerroff=E_NAME_USED_NOT_DEF2
93 93 LINTFLAGS += -xerroff=E_INCONS_ARG_DECL2
94 94 LINTFLAGS += -xerroff=E_INCONS_VAL_TYPE_DECL2
95 95
96 96 ROOTSMBDDIR = $(ROOTLIB)/smbsrv
97 97 ROOTSMBDFILE = $(PROG:%=$(ROOTSMBDDIR)/%)
98 98
99 99 .KEEP_STATE:
100 100
101 101 all: $(PROG)
102 102
103 103 $(PROG): $(OBJS)
104 104 $(LINK.c) -o $(PROG) $(OBJS) $(LDLIBS)
105 105 $(POST_PROCESS)
106 106
107 107 clean:
108 108 -$(RM) $(OBJS)
109 109
110 110 lint: lint_SRCS
111 111
112 112 include ../../Makefile.targ
113 113
114 114 install: all $(ROOTSMBDFILE)
115 115
116 116 %.o: ../smbd/%.c
117 117 $(COMPILE.c) $<
118 118 $(POST_PROCESS_O)
119 119
120 120 $(ROOTSMBDDIR)/%: %
121 121 $(INS.file)
|
↓ open down ↓ |
28 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX