From cb4f8c5cc097f0232b649f62fb57aca2977f2c35 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Mon, 29 Jun 2009 16:03:35 -0400
Subject: [PATCH] Remove redundant libPath option from proxy provider

The libPath should be constructed from the libName. There is no
benefit to specifying it separately.
---
 server/examples/sssd.conf  |    2 --
 server/man/sssd.conf.5.xml |   12 ------------
 server/providers/proxy.c   |   10 +++++++---
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/server/examples/sssd.conf b/server/examples/sssd.conf
index 1841152..ab8007a 100644
--- a/server/examples/sssd.conf
+++ b/server/examples/sssd.conf
@@ -47,7 +47,6 @@ description = Domains served by SSSD
 ;
 ; provider = proxy
 ; libName = files
-; libPath = libnss_files.so.2
 
 # optionally a file named sssdproxylocal can be place in pam.d configured to
 # check pam_unix only and pam_sss can be used in the normal pam stack
@@ -87,7 +86,6 @@ description = Domains served by SSSD
 ;
 ; provider = proxy
 ; libName = ldap
-; libPath = libnss_ldap.so.2
 ;
 #if a backend is particularly slow you can raise this timeout here
 ; timeout = 60
diff --git a/server/man/sssd.conf.5.xml b/server/man/sssd.conf.5.xml
index 94efe18..833bd71 100644
--- a/server/man/sssd.conf.5.xml
+++ b/server/man/sssd.conf.5.xml
@@ -564,18 +564,6 @@
                         </para>
                     </listitem>
                 </varlistentry>
-
-                <varlistentry>
-                    <term>libPath (string)</term>
-                    <listitem>
-                        <para>
-                            File name (including .so) of NSS library
-                            used. For instance, ldap NSS library is named
-                            libnss_ldap.so, the standard files NSS library
-                            is named libnss_files.so
-                        </para>
-                    </listitem>
-                </varlistentry>
             </variablelist>
         </para>
     </refsect1>
diff --git a/server/providers/proxy.c b/server/providers/proxy.c
index 3252a74..937b1d0 100644
--- a/server/providers/proxy.c
+++ b/server/providers/proxy.c
@@ -1359,14 +1359,18 @@ int sssm_proxy_init(struct be_ctx *bectx,
 
     ret = confdb_get_string(bectx->cdb, ctx, bectx->conf_path,
                            "libName", NULL, &libname);
-    ret = confdb_get_string(bectx->cdb, ctx, bectx->conf_path,
-                           "libPath", NULL, &libpath);
     if (ret != EOK) goto done;
-    if (libpath == NULL || libname == NULL) {
+    if (libname == NULL) {
         ret = ENOENT;
         goto done;
     }
 
+    libpath = talloc_asprintf(ctx, "libnss_%s.so.2", libname);
+    if (!libpath) {
+        ret = ENOMEM;
+        goto done;
+    }
+
     handle = dlopen(libpath, RTLD_NOW);
     if (!handle) {
         DEBUG(0, ("Unable to load %s module with path, error: %s\n",
-- 
1.6.2.5