| author | Norm Jacobs <Norm.Jacobs@Oracle.COM> |
| Tue, 18 Oct 2016 13:46:28 -0500 | |
| changeset 7126 | c0715e78cafb |
| parent 6096 | d24ce417bac1 |
| permissions | -rw-r--r-- |
|
6096
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
1 |
Source: in-house |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
2 |
Up-stream Acceptability: Patch is fixing the Solaris build in consequences |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
3 |
of the "krb5" patch and is Solaris specific only. |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
4 |
It is heavily acceptable by community. |
|
4371
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
5 |
|
|
6096
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
6 |
--- a/source3/winbindd/wscript_build 2016-01-26 03:45:46.000000000 -0800 |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
7 |
+++ samba-4.4.1/source3/winbindd/wscript_build 2016-04-09 17:03:33.350275673 -0700 |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
8 |
@@ -2,13 +2,13 @@ |
|
4371
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
9 |
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
10 |
bld.SAMBA3_LIBRARY('idmap',
|
|
6096
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
11 |
source='idmap.c idmap_util.c', |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
12 |
- deps='samba-util pdb', |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
13 |
+ deps='samba-util pdb krb5', |
|
4371
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
14 |
allow_undefined_symbols=True, |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
15 |
private_library=True) |
|
6096
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
16 |
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
17 |
bld.SAMBA3_SUBSYSTEM('IDMAP_RW',
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
18 |
source='idmap_rw.c', |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
19 |
- deps='samba-util') |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
20 |
+ deps='samba-util krb5') |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
21 |
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
22 |
bld.SAMBA3_SUBSYSTEM('IDMAP_TDB_COMMON',
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
23 |
source='idmap_tdb_common.c', |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
24 |
@@ -53,7 +53,7 @@ |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
25 |
bld.SAMBA3_MODULE('idmap_passdb',
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
26 |
subsystem='idmap', |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
27 |
source='idmap_passdb.c', |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
28 |
- deps='samba-util samba-passdb', |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
29 |
+ deps='samba-util samba-passdb krb5', |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
30 |
init_function='', |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
31 |
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_passdb'),
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
32 |
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_passdb'))
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
33 |
@@ -70,7 +70,7 @@ |
|
4371
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
34 |
bld.SAMBA3_MODULE('idmap_nss',
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
35 |
subsystem='idmap', |
|
6096
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
36 |
source='idmap_nss.c', |
|
4371
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
37 |
- deps='samba-util', |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
38 |
+ deps='samba-util krb5', |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
39 |
init_function='', |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
40 |
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_nss'),
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
41 |
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_nss'))
|
|
6096
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
42 |
@@ -78,7 +78,7 @@ |
|
4371
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
43 |
bld.SAMBA3_MODULE('idmap_tdb',
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
44 |
subsystem='idmap', |
|
6096
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
45 |
source='idmap_tdb.c', |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
46 |
- deps='samba-util tdb IDMAP_TDB_COMMON', |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
47 |
+ deps='samba-util tdb krb5 IDMAP_TDB_COMMON', |
|
4371
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
48 |
init_function='', |
|
6096
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
49 |
allow_undefined_symbols=True, |
|
4371
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
50 |
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb'),
|