]>
Commit | Line | Data |
---|---|---|
e5fd101c PS |
1 | autofs-5.0.4 - libxml2 workaround fix |
2 | ||
3 | From: Ian Kent <raven@themaw.net> | |
4 | ||
5 | Add a check for libxml2.so.2 for the libxml2 workaround in case libxml2.so | |
6 | is not present. | |
7 | --- | |
8 | ||
9 | CHANGELOG | 1 + | |
10 | daemon/automount.c | 2 ++ | |
11 | 2 files changed, 3 insertions(+), 0 deletions(-) | |
12 | ||
13 | ||
14 | diff --git a/CHANGELOG b/CHANGELOG | |
15 | index 1cb56fe..b8ad22e 100644 | |
16 | --- a/CHANGELOG | |
17 | +++ b/CHANGELOG | |
18 | @@ -21,6 +21,7 @@ | |
19 | - update to provide ipv6 name and address support. | |
20 | - update to provide ipv6 address parsing. | |
21 | - easy alloca replacements fix. | |
22 | +- add check for alternate libxml2 library for libxml2 tsd workaround. | |
23 | ||
24 | 4/11/2008 autofs-5.0.4 | |
25 | ----------------------- | |
26 | diff --git a/daemon/automount.c b/daemon/automount.c | |
27 | index 1ec686b..a664277 100644 | |
28 | --- a/daemon/automount.c | |
29 | +++ b/daemon/automount.c | |
30 | @@ -2058,6 +2058,8 @@ int main(int argc, char *argv[]) | |
31 | ||
32 | #ifdef LIBXML2_WORKAROUND | |
33 | void *dh_xml2 = dlopen("libxml2.so", RTLD_NOW); | |
34 | + if (!dh_xml2) | |
35 | + dh_xml2 = dlopen("libxml2.so.2", RTLD_NOW); | |
36 | #endif | |
37 | #ifdef TIRPC_WORKAROUND | |
38 | void *dh_tirpc = dlopen("libitirpc.so", RTLD_NOW); |