diff options
Diffstat (limited to 'server/providers/proxy.c')
| -rw-r--r-- | server/providers/proxy.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/server/providers/proxy.c b/server/providers/proxy.c index 04d4a58a8..f44ad858a 100644 --- a/server/providers/proxy.c +++ b/server/providers/proxy.c @@ -235,6 +235,7 @@ int sssm_proxy_init(struct be_ctx *bectx, struct be_mod_ops **ops, void **pvt_da return ENOMEM; } +<<<<<<< HEAD:server/providers/proxy.c ret = confdb_get_string(bectx->cdb, ctx, bectx->conf_path, "libName", NULL, &libname); ret = confdb_get_string(bectx->cdb, ctx, bectx->conf_path, @@ -246,6 +247,9 @@ int sssm_proxy_init(struct be_ctx *bectx, struct be_mod_ops **ops, void **pvt_da } handle = dlopen(libpath, RTLD_NOW); +======= + handle = dlopen("/usr/lib/libnss_ldap.so.2", RTLD_NOW); +>>>>>>> 72efac5... get_policies:server/providers/ldap_provider.c if (!handle) { DEBUG(0, ("Unable to load %s module with path, error: %s\n", libpath, dlerror())); |