summaryrefslogtreecommitdiff
path: root/Linux-PAM/libpam
diff options
context:
space:
mode:
Diffstat (limited to 'Linux-PAM/libpam')
-rw-r--r--Linux-PAM/libpam/Makefile.am7
-rw-r--r--Linux-PAM/libpam/Makefile.in13
-rw-r--r--Linux-PAM/libpam/pam_modutil_getgrgid.c13
-rw-r--r--Linux-PAM/libpam/pam_modutil_getgrnam.c13
-rw-r--r--Linux-PAM/libpam/pam_modutil_getpwnam.c13
-rw-r--r--Linux-PAM/libpam/pam_modutil_getpwuid.c13
-rw-r--r--Linux-PAM/libpam/pam_modutil_getspnam.c13
7 files changed, 13 insertions, 72 deletions
diff --git a/Linux-PAM/libpam/Makefile.am b/Linux-PAM/libpam/Makefile.am
index 57a44935..a0955441 100644
--- a/Linux-PAM/libpam/Makefile.am
+++ b/Linux-PAM/libpam/Makefile.am
@@ -20,10 +20,11 @@ include_HEADERS = include/security/_pam_compat.h \
noinst_HEADERS = pam_prelude.h pam_private.h pam_tokens.h \
pam_modutil_private.h pam_static_modules.h
-libpam_la_LDFLAGS = -no-undefined -version-info 81:8:81 \
- @LIBAUDIT@ $(LIBPRELUDE_LIBS) @LIBDL@
+libpam_la_LDFLAGS = -no-undefined -version-info 81:9:81
+libpam_la_LIBADD = @LIBAUDIT@ $(LIBPRELUDE_LIBS) @LIBDL@
+
if STATIC_MODULES
- libpam_la_LDFLAGS += `ls ../modules/pam_*/*.lo` \
+ libpam_la_LIBADD += `ls ../modules/pam_*/*.lo` \
@LIBDB@ @LIBCRYPT@ @LIBNSL@ @LIBCRACK@ -lutil
endif
if HAVE_VERSIONING
diff --git a/Linux-PAM/libpam/Makefile.in b/Linux-PAM/libpam/Makefile.in
index 3220693b..60e66c0c 100644
--- a/Linux-PAM/libpam/Makefile.in
+++ b/Linux-PAM/libpam/Makefile.in
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
+# Copyright (c) 2005, 2006, 2007 Thorsten Kukuk <kukuk@thkukuk.de>
#
@@ -69,7 +69,9 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
-libpam_la_LIBADD =
+am__DEPENDENCIES_1 =
+@STATIC_MODULES_TRUE@am__DEPENDENCIES_2 = `ls ../modules/pam_*/*.lo`
+libpam_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
am_libpam_la_OBJECTS = pam_account.lo pam_auth.lo pam_data.lo \
pam_delay.lo pam_dispatch.lo pam_end.lo pam_env.lo \
pam_handlers.lo pam_item.lo pam_misc.lo pam_password.lo \
@@ -190,6 +192,7 @@ POSUB = @POSUB@
RANLIB = @RANLIB@
SCONFIGDIR = @SCONFIGDIR@
SECUREDIR = @SECUREDIR@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -272,8 +275,10 @@ include_HEADERS = include/security/_pam_compat.h \
noinst_HEADERS = pam_prelude.h pam_private.h pam_tokens.h \
pam_modutil_private.h pam_static_modules.h
-libpam_la_LDFLAGS = -no-undefined -version-info 81:6:81 @LIBAUDIT@ \
- $(LIBPRELUDE_LIBS) @LIBDL@ $(am__append_2) $(am__append_3)
+libpam_la_LDFLAGS = -no-undefined -version-info 81:9:81 \
+ $(am__append_3)
+libpam_la_LIBADD = @LIBAUDIT@ $(LIBPRELUDE_LIBS) @LIBDL@ \
+ $(am__append_2)
lib_LTLIBRARIES = libpam.la
libpam_la_SOURCES = pam_account.c pam_auth.c pam_data.c pam_delay.c \
pam_dispatch.c pam_end.c pam_env.c pam_handlers.c pam_item.c \
diff --git a/Linux-PAM/libpam/pam_modutil_getgrgid.c b/Linux-PAM/libpam/pam_modutil_getgrgid.c
index ace5c9a6..420068f7 100644
--- a/Linux-PAM/libpam/pam_modutil_getgrgid.c
+++ b/Linux-PAM/libpam/pam_modutil_getgrgid.c
@@ -12,20 +12,9 @@
#include <errno.h>
#include <limits.h>
#include <grp.h>
-#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
-static pthread_mutex_t _pammodutil_mutex = PTHREAD_MUTEX_INITIALIZER;
-static void _pammodutil_lock(void)
-{
- pthread_mutex_lock(&_pammodutil_mutex);
-}
-static void _pammodutil_unlock(void)
-{
- pthread_mutex_unlock(&_pammodutil_mutex);
-}
-
static int intlen(int number)
{
int len = 2;
@@ -95,13 +84,11 @@ pam_modutil_getgrgid(pam_handle_t *pamh, gid_t gid)
for (i = 0; i < INT_MAX; i++) {
sprintf(data_name, "_pammodutil_getgrgid_%ld_%d",
(long) gid, i);
- _pammodutil_lock();
status = PAM_NO_MODULE_DATA;
if (pam_get_data(pamh, data_name, &ignore) != PAM_SUCCESS) {
status = pam_set_data(pamh, data_name,
result, pam_modutil_cleanup);
}
- _pammodutil_unlock();
if (status == PAM_SUCCESS) {
break;
}
diff --git a/Linux-PAM/libpam/pam_modutil_getgrnam.c b/Linux-PAM/libpam/pam_modutil_getgrnam.c
index 85103a1c..908f816d 100644
--- a/Linux-PAM/libpam/pam_modutil_getgrnam.c
+++ b/Linux-PAM/libpam/pam_modutil_getgrnam.c
@@ -12,20 +12,9 @@
#include <errno.h>
#include <limits.h>
#include <grp.h>
-#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
-static pthread_mutex_t _pammodutil_mutex = PTHREAD_MUTEX_INITIALIZER;
-static void _pammodutil_lock(void)
-{
- pthread_mutex_lock(&_pammodutil_mutex);
-}
-static void _pammodutil_unlock(void)
-{
- pthread_mutex_unlock(&_pammodutil_mutex);
-}
-
static int intlen(int number)
{
int len = 2;
@@ -84,13 +73,11 @@ pam_modutil_getgrnam(pam_handle_t *pamh, const char *group)
if (pamh != NULL) {
for (i = 0; i < INT_MAX; i++) {
sprintf(data_name, "_pammodutil_getgrnam_%s_%d", group, i);
- _pammodutil_lock();
status = PAM_NO_MODULE_DATA;
if (pam_get_data(pamh, data_name, &ignore) != PAM_SUCCESS) {
status = pam_set_data(pamh, data_name,
result, pam_modutil_cleanup);
}
- _pammodutil_unlock();
if (status == PAM_SUCCESS) {
break;
}
diff --git a/Linux-PAM/libpam/pam_modutil_getpwnam.c b/Linux-PAM/libpam/pam_modutil_getpwnam.c
index 61aafef0..6bb7d195 100644
--- a/Linux-PAM/libpam/pam_modutil_getpwnam.c
+++ b/Linux-PAM/libpam/pam_modutil_getpwnam.c
@@ -11,21 +11,10 @@
#include <errno.h>
#include <limits.h>
-#include <pthread.h>
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
-static pthread_mutex_t _pammodutil_mutex = PTHREAD_MUTEX_INITIALIZER;
-static void _pammodutil_lock(void)
-{
- pthread_mutex_lock(&_pammodutil_mutex);
-}
-static void _pammodutil_unlock(void)
-{
- pthread_mutex_unlock(&_pammodutil_mutex);
-}
-
static int intlen(int number)
{
int len = 2;
@@ -84,13 +73,11 @@ pam_modutil_getpwnam(pam_handle_t *pamh, const char *user)
if (pamh != NULL) {
for (i = 0; i < INT_MAX; i++) {
sprintf(data_name, "_pammodutil_getpwnam_%s_%d", user, i);
- _pammodutil_lock();
status = PAM_NO_MODULE_DATA;
if (pam_get_data(pamh, data_name, &ignore) != PAM_SUCCESS) {
status = pam_set_data(pamh, data_name,
result, pam_modutil_cleanup);
}
- _pammodutil_unlock();
if (status == PAM_SUCCESS) {
break;
}
diff --git a/Linux-PAM/libpam/pam_modutil_getpwuid.c b/Linux-PAM/libpam/pam_modutil_getpwuid.c
index 01bca564..15fe077c 100644
--- a/Linux-PAM/libpam/pam_modutil_getpwuid.c
+++ b/Linux-PAM/libpam/pam_modutil_getpwuid.c
@@ -11,21 +11,10 @@
#include <errno.h>
#include <limits.h>
-#include <pthread.h>
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
-static pthread_mutex_t _pammodutil_mutex = PTHREAD_MUTEX_INITIALIZER;
-static void _pammodutil_lock(void)
-{
- pthread_mutex_lock(&_pammodutil_mutex);
-}
-static void _pammodutil_unlock(void)
-{
- pthread_mutex_unlock(&_pammodutil_mutex);
-}
-
static int intlen(int number)
{
int len = 2;
@@ -95,13 +84,11 @@ pam_modutil_getpwuid(pam_handle_t *pamh, uid_t uid)
for (i = 0; i < INT_MAX; i++) {
sprintf(data_name, "_pammodutil_getpwuid_%ld_%d",
(long) uid, i);
- _pammodutil_lock();
status = PAM_NO_MODULE_DATA;
if (pam_get_data(pamh, data_name, &ignore) != PAM_SUCCESS) {
status = pam_set_data(pamh, data_name,
result, pam_modutil_cleanup);
}
- _pammodutil_unlock();
if (status == PAM_SUCCESS) {
break;
}
diff --git a/Linux-PAM/libpam/pam_modutil_getspnam.c b/Linux-PAM/libpam/pam_modutil_getspnam.c
index 2433795e..1c926063 100644
--- a/Linux-PAM/libpam/pam_modutil_getspnam.c
+++ b/Linux-PAM/libpam/pam_modutil_getspnam.c
@@ -11,21 +11,10 @@
#include <errno.h>
#include <limits.h>
-#include <pthread.h>
#include <shadow.h>
#include <stdio.h>
#include <stdlib.h>
-static pthread_mutex_t _pammodutil_mutex = PTHREAD_MUTEX_INITIALIZER;
-static void _pammodutil_lock(void)
-{
- pthread_mutex_lock(&_pammodutil_mutex);
-}
-static void _pammodutil_unlock(void)
-{
- pthread_mutex_unlock(&_pammodutil_mutex);
-}
-
static int intlen(int number)
{
int len = 2;
@@ -84,13 +73,11 @@ pam_modutil_getspnam(pam_handle_t *pamh, const char *user)
if (pamh != NULL) {
for (i = 0; i < INT_MAX; i++) {
sprintf(data_name, "_pammodutil_getspnam_%s_%d", user, i);
- _pammodutil_lock();
status = PAM_NO_MODULE_DATA;
if (pam_get_data(pamh, data_name, &ignore) != PAM_SUCCESS) {
status = pam_set_data(pamh, data_name,
result, pam_modutil_cleanup);
}
- _pammodutil_unlock();
if (status == PAM_SUCCESS) {
break;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 05:39:27 +0000