OpenPAM/OpenPAM
OpenPAM
/
OpenPAM
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix namespace violations in some symbols which have external linkage but 

are not part of the API.


git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@460 185d5e19-27fe-0310-9dcf-9bff6b9f3609
This commit is contained in:
Dag-Erling Smørgrav 2011-11-02 13:56:03 +00:00
parent 8799ff11b9
commit 0eae3f21c1
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/openpam_configure.c
View File

@ -49,14 +49,14 @@
#include "openpam_impl.h"
const char *_pam_facility_name[PAM_NUM_FACILITIES] = {
const char *pam_facility_name[PAM_NUM_FACILITIES] = {
[PAM_ACCOUNT] = "account",
[PAM_AUTH] = "auth",
[PAM_PASSWORD] = "password",
[PAM_SESSION] = "session",
};
const char *_pam_control_flag_name[PAM_NUM_CONTROL_FLAGS] = {
const char *pam_control_flag_name[PAM_NUM_CONTROL_FLAGS] = {
[PAM_BINDING] = "binding",
[PAM_OPTIONAL] = "optional",
[PAM_REQUIRED] = "required",
@ -165,7 +165,7 @@ openpam_read_chain(pam_handle_t *pamh,
/* match facility name */
for (fclt = 0; fclt < PAM_NUM_FACILITIES; ++fclt)
if (match_word(p, _pam_facility_name[fclt]))
if (match_word(p, pam_facility_name[fclt]))
break;
if (fclt == PAM_NUM_FACILITIES) {
openpam_log(PAM_LOG_NOTICE,
@ -203,7 +203,7 @@ openpam_read_chain(pam_handle_t *pamh,
/* control flag */
for (ctlf = 0; ctlf < PAM_NUM_CONTROL_FLAGS; ++ctlf)
if (match_word(p, _pam_control_flag_name[ctlf]))
if (match_word(p, pam_control_flag_name[ctlf]))
break;
if (ctlf == PAM_NUM_CONTROL_FLAGS) {
openpam_log(PAM_LOG_ERROR,

12
lib/openpam_dispatch.c
View File

@ -74,9 +74,9 @@ openpam_dispatch(pam_handle_t *pamh,
if (pamh->current != NULL) {
openpam_log(PAM_LOG_ERROR,
"%s() called while %s::%s() is in progress",
_pam_func_name[primitive],
pam_func_name[primitive],
pamh->current->module->path,
_pam_sm_func_name[pamh->primitive]);
pam_sm_func_name[pamh->primitive]);
RETURNC(PAM_ABORT);
}
@ -104,7 +104,7 @@ openpam_dispatch(pam_handle_t *pamh,
for (err = fail = 0; chain != NULL; chain = chain->next) {
if (chain->module->func[primitive] == NULL) {
openpam_log(PAM_LOG_ERROR, "%s: no %s()",
chain->module->path, _pam_sm_func_name[primitive]);
chain->module->path, pam_sm_func_name[primitive]);
continue;
} else {
pamh->primitive = primitive;
@ -113,12 +113,12 @@ openpam_dispatch(pam_handle_t *pamh,
if (debug)
++openpam_debug;
openpam_log(PAM_LOG_DEBUG, "calling %s() in %s",
_pam_sm_func_name[primitive], chain->module->path);
pam_sm_func_name[primitive], chain->module->path);
r = (chain->module->func[primitive])(pamh, flags,
chain->optc, (const char **)chain->optv);
pamh->current = NULL;
openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s",
chain->module->path, _pam_sm_func_name[primitive],
chain->module->path, pam_sm_func_name[primitive],
pam_strerror(pamh, r));
if (debug)
--openpam_debug;
@ -227,7 +227,7 @@ openpam_check_error_code(int primitive, int r)
}
openpam_log(PAM_LOG_ERROR, "%s(): unexpected return value %d",
_pam_sm_func_name[primitive], r);
pam_sm_func_name[primitive], r);
}
#endif /* !defined(OPENPAM_RELAX_CHECKS) */

4
lib/openpam_dynamic.c
View File

@ -97,10 +97,10 @@ openpam_dynamic(const char *path)
dlmodule = dlsym(dlh, "_pam_module");
for (i = 0; i < PAM_NUM_PRIMITIVES; ++i) {
module->func[i] = dlmodule ? dlmodule->func[i] :
(pam_func_t)dlsym(dlh, _pam_sm_func_name[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());
path, pam_sm_func_name[i], dlerror());
}
return (module);
buf_err:

12
lib/openpam_impl.h
View File

@ -40,10 +40,10 @@
#include <security/openpam.h>
extern const char *_pam_func_name[PAM_NUM_PRIMITIVES];
extern const char *_pam_sm_func_name[PAM_NUM_PRIMITIVES];
extern const char *_pam_err_name[PAM_NUM_ERRORS];
extern const char *_pam_item_name[PAM_NUM_ITEMS];
extern const char *pam_func_name[PAM_NUM_PRIMITIVES];
extern const char *pam_sm_func_name[PAM_NUM_PRIMITIVES];
extern const char *pam_err_name[PAM_NUM_ERRORS];
extern const char *pam_item_name[PAM_NUM_ITEMS];
extern int openpam_debug;
@ -136,7 +136,7 @@ pam_module_t *openpam_dynamic(const char *);
#define ENTERI(i) do { \
int _i = (i); \
if (_i > 0 && _i < PAM_NUM_ITEMS) \
openpam_log(PAM_LOG_DEBUG, "entering: %s", _pam_item_name[_i]); \
openpam_log(PAM_LOG_DEBUG, "entering: %s", pam_item_name[_i]); \
else \
openpam_log(PAM_LOG_DEBUG, "entering: %d", _i); \
} while (0)
@ -155,7 +155,7 @@ pam_module_t *openpam_dynamic(const char *);
#define RETURNC(c) do { \
int _c = (c); \
if (_c >= 0 && _c < PAM_NUM_ERRORS) \
openpam_log(PAM_LOG_DEBUG, "returning %s", _pam_err_name[_c]); \
openpam_log(PAM_LOG_DEBUG, "returning %s", pam_err_name[_c]); \
else \
openpam_log(PAM_LOG_DEBUG, "returning %d!", _c); \
return (_c); \

4
lib/openpam_load.c
View File

@ -47,7 +47,7 @@
#include "openpam_impl.h"
const char *_pam_func_name[PAM_NUM_PRIMITIVES] = {
const char *pam_func_name[PAM_NUM_PRIMITIVES] = {
"pam_authenticate",
"pam_setcred",
"pam_acct_mgmt",
@ -56,7 +56,7 @@ const char *_pam_func_name[PAM_NUM_PRIMITIVES] = {
"pam_chauthtok"
};
const char *_pam_sm_func_name[PAM_NUM_PRIMITIVES] = {
const char *pam_sm_func_name[PAM_NUM_PRIMITIVES] = {
"pam_sm_authenticate",
"pam_sm_setcred",
"pam_sm_acct_mgmt",

2
lib/pam_get_item.c
View File

@ -45,7 +45,7 @@
#include "openpam_impl.h"
const char *_pam_item_name[PAM_NUM_ITEMS] = {
const char *pam_item_name[PAM_NUM_ITEMS] = {
"(NO ITEM)",
"PAM_SERVICE",
"PAM_USER",

2
lib/pam_strerror.c
View File

@ -45,7 +45,7 @@
#include "openpam_impl.h"
const char *_pam_err_name[PAM_NUM_ERRORS] = {
const char *pam_err_name[PAM_NUM_ERRORS] = {
"PAM_SUCCESS",
"PAM_OPEN_ERR",
"PAM_SYMBOL_ERR",