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