| author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
| Mon, 16 May 2016 06:32:39 -0700 | |
| changeset 6096 | d24ce417bac1 |
| parent 5222 | 8298df727253 |
| 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 names of "ldap" and "lber" libs |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
3 |
which are "hard-wired" to "libldap.so" and "liblber.so" in upstream. |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
4 |
Patch will be promoted to 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/wscript 2016-03-22 02:00:33.000000000 -0700 |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
7 |
+++ samba-4.4.0/source3/wscript 2016-03-23 12:43:02.236160369 -0700 |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
8 |
@@ -36,6 +36,16 @@ |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
9 |
"--with-shared-modules"), |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
10 |
action="store", dest='shared_modules', default=None) |
|
4371
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
11 |
|
|
6096
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
12 |
+ |
|
4371
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
13 |
+ opt.add_option('--with-libldap',
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
14 |
+ help=("Name of the libldap for -l<libname> format."),
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
15 |
+ action="store", dest='libldap_name', default='ldap') |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
16 |
+ |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
17 |
+ # mozldap has lber-calls part of the libldap so it should be also set on ldap60 to avoid link of lber from OpenLDAP |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
18 |
+ opt.add_option('--with-liblber',
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
19 |
+ help=("Name of the liblber for -l<libname> format."),
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
20 |
+ action="store", dest='liblber_name', default='lber') |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
21 |
+ |
|
6096
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
22 |
opt.SAMBA3_ADD_OPTION('winbind')
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
23 |
opt.SAMBA3_ADD_OPTION('ads')
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
24 |
opt.SAMBA3_ADD_OPTION('ldap')
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
25 |
@@ -664,7 +673,7 @@ |
|
4371
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
26 |
if Options.options.with_ldap: |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
27 |
conf.CHECK_HEADERS('ldap.h lber.h ldap_pvt.h')
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
28 |
conf.CHECK_TYPE('ber_tag_t', 'unsigned int', headers='ldap.h lber.h')
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
29 |
- conf.CHECK_FUNCS_IN('ber_scanf ber_sockbuf_add_io', 'lber')
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
30 |
+ conf.CHECK_FUNCS_IN('ber_scanf ber_sockbuf_add_io', Options.options.liblber_name )
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
31 |
conf.CHECK_VARIABLE('LDAP_OPT_SOCKBUF', headers='ldap.h')
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
32 |
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
33 |
# if we LBER_OPT_LOG_PRINT_FN we can intercept ldap logging and print it out |
|
6096
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
34 |
@@ -672,8 +681,8 @@ |
|
4371
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
35 |
conf.CHECK_VARIABLE('LBER_OPT_LOG_PRINT_FN',
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
36 |
define='HAVE_LBER_LOG_PRINT_FN', headers='lber.h') |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
37 |
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
38 |
- conf.CHECK_FUNCS_IN('ldap_init ldap_init_fd ldap_initialize ldap_set_rebind_proc', 'ldap')
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
39 |
- conf.CHECK_FUNCS_IN('ldap_add_result_entry', 'ldap')
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
40 |
+ conf.CHECK_FUNCS_IN('ldap_init ldap_init_fd ldap_initialize ldap_set_rebind_proc', Options.options.libldap_name )
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
41 |
+ conf.CHECK_FUNCS_IN('ldap_add_result_entry', Options.options.libldap_name )
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
42 |
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
43 |
# Check if ldap_set_rebind_proc() takes three arguments |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
44 |
if conf.CHECK_CODE('ldap_set_rebind_proc(0, 0, 0)',
|
|
6096
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
45 |
@@ -694,6 +703,25 @@ |
|
4371
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
46 |
if conf.CONFIG_SET('HAVE_BER_SOCKBUF_ADD_IO') and \
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
47 |
conf.CONFIG_SET('HAVE_LDAP_OPT_SOCKBUF'):
|
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
48 |
conf.DEFINE('HAVE_LDAP_SASL_WRAPPING', '1')
|
|
6096
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
49 |
+ # fix the conf.TARGET_TYPE and conf.LIB_... items |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
50 |
+ if 'ldap' != Options.options.libldap_name: |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
51 |
+ conf.SET_TARGET_TYPE('ldap', 'SYSLIB')
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
52 |
+ #conf.SET_TARGET_TYPE(Options.options.libldap_name, 'EMPTY') |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
53 |
+ conf.define('HAVE_LIBLDAP', 1)
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
54 |
+ conf.undefine('HAVE_LIB%s' % Options.options.libldap_name.upper().replace('-','_'))
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
55 |
+ conf.define('LIB_LDAP', Options.options.libldap_name)
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
56 |
+ conf.undefine('LIB_%s' % Options.options.libldap_name.upper().replace('-','_'))
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
57 |
+ #conf.define('LIB_ldap', [ Options.options.libldap_name ] )
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
58 |
+ #conf.undefine('LIB_%s' % Options.options.libldap_name.replace('-','_'))
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
59 |
+ if 'lber' != Options.options.liblber_name: |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
60 |
+ conf.SET_TARGET_TYPE('lber', 'SYSLIB')
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
61 |
+ #conf.SET_TARGET_TYPE(Options.options.liblber_name, 'EMPTY') |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
62 |
+ conf.define('HAVE_LIBLBER', 1)
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
63 |
+ conf.undefine('HAVE_LIB%s' % Options.options.liblber_name.upper().replace('-','_'))
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
64 |
+ conf.define('LIB_LBER', Options.options.liblber_name)
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
65 |
+ conf.undefine('LIB_%s' % Options.options.liblber_name.upper().replace('-','_'))
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
66 |
+ #conf.define('LIB_lber', [ Options.options.liblber_name ] )
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
67 |
+ #conf.undefine('LIB_%s' % Options.options.liblber_name.replace('-','_'))
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
68 |
else: |
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
69 |
conf.fatal("LDAP support not found. "
|
|
d24ce417bac1
23004781 Update Samba to version 4.4.2
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
5222
diff
changeset
|
70 |
"Try installing libldap2-dev or openldap-devel. " |