summaryrefslogtreecommitdiff
path: root/libpam
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2007-08-30 04:00:39 +0000
committerSteve Langasek <vorlon@debian.org>2007-08-30 04:00:39 +0000
commit34df708209a4f7c47dd86f8e7a1c5cdcf1054b6f (patch)
tree3e59cb7b44b79ee8cdfb46753e1e10a2640677e2 /libpam
parent5abc6729b8abec8c6c978428b0421ae6d1e03fb0 (diff)
Relevant BUGIDs:
Purpose of commit: portability, cleanup Commit summary: --------------- 2007-08-29 Steve Langasek <vorlon@debian.org> * libpam/pam_modutil_getgrgid.c, libpam/pam_modutil_getgrnam.c, libpam/pam_modutil_getpwnam.c, libpam/pam_modutil_getpwuid.c, libpam/pam_modutil_getspnam.c: don't use pthread mutexes in libpam unnecessarily; this avoids linking problems on non-Linux platforms.
Diffstat (limited to 'libpam')
-rw-r--r--libpam/pam_modutil_getgrgid.c13
-rw-r--r--libpam/pam_modutil_getgrnam.c13
-rw-r--r--libpam/pam_modutil_getpwnam.c13
-rw-r--r--libpam/pam_modutil_getpwuid.c13
-rw-r--r--libpam/pam_modutil_getspnam.c13
5 files changed, 0 insertions, 65 deletions
diff --git a/libpam/pam_modutil_getgrgid.c b/libpam/pam_modutil_getgrgid.c
index 07503a38..03d03daa 100644
--- a/libpam/pam_modutil_getgrgid.c
+++ b/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/libpam/pam_modutil_getgrnam.c b/libpam/pam_modutil_getgrnam.c
index 11df353f..c224db7b 100644
--- a/libpam/pam_modutil_getgrnam.c
+++ b/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/libpam/pam_modutil_getpwnam.c b/libpam/pam_modutil_getpwnam.c
index 026e61a7..a9dcd6c3 100644
--- a/libpam/pam_modutil_getpwnam.c
+++ b/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/libpam/pam_modutil_getpwuid.c b/libpam/pam_modutil_getpwuid.c
index 732771d2..bf364a3e 100644
--- a/libpam/pam_modutil_getpwuid.c
+++ b/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/libpam/pam_modutil_getspnam.c b/libpam/pam_modutil_getspnam.c
index 7fc696e2..6eaf5d4c 100644
--- a/libpam/pam_modutil_getspnam.c
+++ b/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;
}