|
1 # |
|
2 # Make this build with a newer erlang by |
|
3 # forcing SSL40, which it was using with the old erlang |
|
4 # removing LDAP password modify support |
|
5 # supply the 64-bit CFLAGS so we don't get ELF mismatches. |
|
6 # This can be removed when we upgrade to a newer ejabberd. |
|
7 # |
|
8 --- ejabberd-2.1.13/src/acinclude.m4.orig Tue May 19 13:24:30 2015 |
|
9 +++ ejabberd-2.1.13/src/acinclude.m4 Tue May 19 13:25:19 2015 |
|
10 @@ -185,7 +185,7 @@ |
|
11 # Second line |
|
12 ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1` |
|
13 # Third line |
|
14 - ERLANG_SSLVER=`cat conftest.out | head -n 3 | tail -n 1` |
|
15 + ERLANG_SSLVER="-DSSL40" |
|
16 # End line |
|
17 ERLANG_DIR=`cat conftest.out | tail -n 1` |
|
18 |
|
19 --- ejabberd-2.1.13/src/eldap/ELDAPv3.asn.orig Tue Jun 25 03:46:12 2013 |
|
20 +++ ejabberd-2.1.13/src/eldap/ELDAPv3.asn Tue May 19 18:22:31 2015 |
|
21 @@ -286,7 +286,7 @@ |
|
22 responseName [10] LDAPOID OPTIONAL, |
|
23 response [11] OCTET STRING OPTIONAL } |
|
24 |
|
25 -passwdModifyOID LDAPOID ::= "1.3.6.1.4.1.4203.1.11.1" |
|
26 +-- passwdModifyOID LDAPOID ::= "1.3.6.1.4.1.4203.1.11.1" |
|
27 |
|
28 PasswdModifyRequestValue ::= SEQUENCE { |
|
29 userIdentity [0] OCTET STRING OPTIONAL, |
|
30 |
|
31 --- ejabberd-2.1.13/src/eldap/eldap.erl Tue Jun 25 03:46:12 2013 |
|
32 +++ ejabberd-2.1.13/src/eldap/eldap.erl.new Tue May 19 18:29:14 2015 |
|
33 @@ -734,15 +734,15 @@ |
|
34 deleteoldrdn = DelOldRDN, |
|
35 newSuperior = NewSup}}; |
|
36 |
|
37 -gen_req({modify_passwd, DN, Passwd}) -> |
|
38 - {ok, ReqVal} = asn1rt:encode( |
|
39 - 'ELDAPv3', 'PasswdModifyRequestValue', |
|
40 - #'PasswdModifyRequestValue'{ |
|
41 - userIdentity = DN, |
|
42 - newPasswd = Passwd}), |
|
43 - {extendedReq, |
|
44 - #'ExtendedRequest'{requestName = ?passwdModifyOID, |
|
45 - requestValue = list_to_binary(ReqVal)}}; |
|
46 +%% gen_req({modify_passwd, DN, Passwd}) -> |
|
47 +%% {ok, ReqVal} = asn1rt:encode( |
|
48 +%% 'ELDAPv3', 'PasswdModifyRequestValue', |
|
49 +%% #'PasswdModifyRequestValue'{ |
|
50 +%% userIdentity = DN, |
|
51 +%% newPasswd = Passwd}), |
|
52 +%% {extendedReq, |
|
53 +%% #'ExtendedRequest'{requestName = ?passwdModifyOID, |
|
54 +%% requestValue = list_to_binary(ReqVal)}}; |
|
55 |
|
56 gen_req({bind, RootDN, Passwd}) -> |
|
57 {bindRequest, |