summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2003-05-01 17:15:45 +0000
committerdes <des@FreeBSD.org>2003-05-01 17:15:45 +0000
commit97a771b3d82754567fe52a0df58a9a0b36766ec7 (patch)
treebeea85cfd12098376ad949b44376092f934e0a5c /contrib
parent2b455d2859abbe5c716ce41a6b7263c6367e2d27 (diff)
parent08e6577407ea80df290255de9be03f0cde3fc94c (diff)
downloadFreeBSD-src-97a771b3d82754567fe52a0df58a9a0b36766ec7.zip
FreeBSD-src-97a771b3d82754567fe52a0df58a9a0b36766ec7.tar.gz
This commit was generated by cvs2svn to compensate for changes in r114436,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/openpam/lib/openpam_dynamic.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/openpam/lib/openpam_dynamic.c b/contrib/openpam/lib/openpam_dynamic.c
index f169ed8..db5fe48 100644
--- a/contrib/openpam/lib/openpam_dynamic.c
+++ b/contrib/openpam/lib/openpam_dynamic.c
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#6 $
+ * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#7 $
*/
#include <dlfcn.h>
@@ -57,6 +57,7 @@ openpam_dynamic(const char *path)
void *dlh;
int i;
+ dlh = NULL;
if ((module = calloc(1, sizeof *module)) == NULL)
goto buf_err;
@@ -77,7 +78,7 @@ openpam_dynamic(const char *path)
goto buf_err;
module->dlh = dlh;
for (i = 0; i < PAM_NUM_PRIMITIVES; ++i) {
- module->func[i] = dlsym(dlh, _pam_sm_func_name[i]);
+ module->func[i] = (pam_func_t)dlsym(dlh, _pam_sm_func_name[i]);
if (module->func[i] == NULL)
openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s",
path, _pam_sm_func_name[i], dlerror());
@@ -85,7 +86,8 @@ openpam_dynamic(const char *path)
return (module);
buf_err:
openpam_log(PAM_LOG_ERROR, "%m");
- dlclose(dlh);
+ if (dlh != NULL)
+ dlclose(dlh);
free(module);
return (NULL);
}
OpenPOWER on IntegriCloud