author | Jan Parcel <jan.parcel@oracle.com> |
Wed, 15 Mar 2017 15:37:18 -0700 | |
branch | s11u3-sru |
changeset 7762 | 1bc3a3aa3178 |
permissions | -rw-r--r-- |
7762
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
1 |
This is a Solaris 11 specific patch, which will not go upstream and may |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
2 |
not be needed in Solaris.next |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
3 |
|
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
4 |
Sudo needs to be compiled and linked with OpenLDAP in order to have full |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
5 |
functionality. The name of the OpenLDAP library is usually lldap but in |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
6 |
Solaris 11 that refers to Mozilla ldap. |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
7 |
|
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
8 |
diff -rupN old/configure.ac new/configure.ac |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
9 |
--- old/configure.ac 2017-03-01 18:29:39.533375940 -0800 |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
10 |
+++ new/configure.ac 2017-03-01 18:31:58.413934900 -0800 |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
11 |
@@ -3663,8 +3663,9 @@ if test ${with_ldap-'no'} != "no"; then |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
12 |
]) |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
13 |
# If nothing linked, try -lldap and hope for the best |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
14 |
if test "$found" = "no"; then |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
15 |
- LDAP_LIBS="-lldap" |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
16 |
+ LDAP_LIBS="-lldap-2.4" |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
17 |
fi |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
18 |
+ LDAP_LIBS="-lldap-2.4" |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
19 |
LIBS="${_LIBS} ${LDAP_LIBS}" |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
20 |
dnl check if we need to link with -llber for ber_set_option |
1bc3a3aa3178
25427193 sudo with LDAP and "use_sasl on" broken using LDAP_SASL_QUIET
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
21 |
OLIBS="$LIBS" |