| author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
| Mon, 11 Mar 2013 10:38:09 -0700 | |
| branch | s11-update |
| changeset 2520 | ceec631e74d1 |
| parent 628 | c3c0c8f3f696 |
| permissions | -rw-r--r-- |
|
628
c3c0c8f3f696
7119845 Samba 3.5.10 can not use the system kerberos keytab.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
521
diff
changeset
|
1 |
7092513 Samba links liblber from openldap but should not do it. |
|
c3c0c8f3f696
7119845 Samba 3.5.10 can not use the system kerberos keytab.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
521
diff
changeset
|
2 |
|
|
c3c0c8f3f696
7119845 Samba 3.5.10 can not use the system kerberos keytab.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
521
diff
changeset
|
3 |
--- a/source3/configure.in-bkp 2011-09-19 09:34:22.632025100 -0700 |
|
c3c0c8f3f696
7119845 Samba 3.5.10 can not use the system kerberos keytab.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
521
diff
changeset
|
4 |
+++ b/source3/configure.in 2011-09-19 09:37:16.235176200 -0700 |
|
521
77763f1ab54d
7092513 Samba links liblber from openldap but should not do it.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff
changeset
|
5 |
@@ -3285,7 +3285,10 @@ |
|
77763f1ab54d
7092513 Samba links liblber from openldap but should not do it.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff
changeset
|
6 |
################################################################## |
|
77763f1ab54d
7092513 Samba links liblber from openldap but should not do it.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff
changeset
|
7 |
# we might need the lber lib on some systems. To avoid link errors |
|
77763f1ab54d
7092513 Samba links liblber from openldap but should not do it.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff
changeset
|
8 |
# this test must be before the libldap test |
|
77763f1ab54d
7092513 Samba links liblber from openldap but should not do it.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff
changeset
|
9 |
- AC_CHECK_LIB_EXT(lber, LDAP_LIBS, ber_scanf) |
|
77763f1ab54d
7092513 Samba links liblber from openldap but should not do it.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff
changeset
|
10 |
+ # The next test should be avoided because libldap60 already have (internal) |
|
77763f1ab54d
7092513 Samba links liblber from openldap but should not do it.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff
changeset
|
11 |
+ # ber_scanf but the liblber from openldap is searched first so liblber |
|
77763f1ab54d
7092513 Samba links liblber from openldap but should not do it.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff
changeset
|
12 |
+ # is added into LDAP_LIBS |
|
77763f1ab54d
7092513 Samba links liblber from openldap but should not do it.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff
changeset
|
13 |
+ #AC_CHECK_LIB_EXT(lber, LDAP_LIBS, ber_scanf) |
|
77763f1ab54d
7092513 Samba links liblber from openldap but should not do it.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff
changeset
|
14 |
|
|
77763f1ab54d
7092513 Samba links liblber from openldap but should not do it.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff
changeset
|
15 |
######################################################## |
|
77763f1ab54d
7092513 Samba links liblber from openldap but should not do it.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff
changeset
|
16 |
# If ber_sockbuf_add_io() is available we can add |