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

Remove a few more namespace violations. Only one remains, which we can't

Browse source 
remove that without breaking binary compatibility.


git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@415 185d5e19-27fe-0310-9dcf-9bff6b9f3609
This commit is contained in:
Dag-Erling Smørgrav 2008-02-14 18:24:25 +00:00
parent 8865782b1d
commit d0bf52fbb1
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/openpam_dispatch.c
View file

@ -42,9 +42,9 @@
#include "openpam_impl.h" #include "openpam_impl.h"
#if !defined(OPENPAM_RELAX_CHECKS) #if !defined(OPENPAM_RELAX_CHECKS)
static void _openpam_check_error_code(int, int); static void openpam_check_error_code(int, int);
#else #else
#define _openpam_check_error_code(a, b) #define openpam_check_error_code(a, b)
#endif /* !defined(OPENPAM_RELAX_CHECKS) */ #endif /* !defined(OPENPAM_RELAX_CHECKS) */
/* /*
@ -107,7 +107,7 @@ openpam_dispatch(pam_handle_t *pamh,
pamh->current = chain; pamh->current = chain;
debug = (openpam_get_option(pamh, "debug") != NULL); debug = (openpam_get_option(pamh, "debug") != NULL);
if (debug) if (debug)
++_openpam_debug; ++openpam_debug;
openpam_log(PAM_LOG_DEBUG, "calling %s() in %s", 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, r = (chain->module->func[primitive])(pamh, flags,
@ -117,7 +117,7 @@ openpam_dispatch(pam_handle_t *pamh,
chain->module->path, _pam_sm_func_name[primitive], chain->module->path, _pam_sm_func_name[primitive],
pam_strerror(pamh, r)); pam_strerror(pamh, r));
if (debug) if (debug)
--_openpam_debug; --openpam_debug;
} }
if (r == PAM_IGNORE) if (r == PAM_IGNORE)
@ -137,7 +137,7 @@ openpam_dispatch(pam_handle_t *pamh,
continue; continue;
} }
_openpam_check_error_code(primitive, r); openpam_check_error_code(primitive, r);
/* /*
* Record the return code from the first module to * Record the return code from the first module to
@ -171,7 +171,7 @@ openpam_dispatch(pam_handle_t *pamh,
#if !defined(OPENPAM_RELAX_CHECKS) #if !defined(OPENPAM_RELAX_CHECKS)
static void static void
_openpam_check_error_code(int primitive, int r) openpam_check_error_code(int primitive, int r)
{ {
/* common error codes */ /* common error codes */
if (r == PAM_SUCCESS || if (r == PAM_SUCCESS ||

2
lib/openpam_impl.h
View file

@ -49,7 +49,7 @@ extern const char *_pam_sm_func_name[PAM_NUM_PRIMITIVES];
extern const char *_pam_err_name[PAM_NUM_ERRORS]; extern const char *_pam_err_name[PAM_NUM_ERRORS];
extern const char *_pam_item_name[PAM_NUM_ITEMS]; extern const char *_pam_item_name[PAM_NUM_ITEMS];
extern int _openpam_debug; extern int openpam_debug;
/* /*
* Control flags * Control flags

10
lib/openpam_log.c
View file

@ -47,9 +47,9 @@
#include "openpam_impl.h" #include "openpam_impl.h"
#ifdef OPENPAM_DEBUG #ifdef OPENPAM_DEBUG
int _openpam_debug = 1; int openpam_debug = 1;
#else #else
int _openpam_debug = 0; int openpam_debug = 0;
#endif #endif
#if !defined(openpam_log) #if !defined(openpam_log)
@ -68,7 +68,7 @@ openpam_log(int level, const char *fmt, ...)
switch (level) { switch (level) {
case PAM_LOG_DEBUG: case PAM_LOG_DEBUG:
if (!_openpam_debug) if (!openpam_debug)
return; return;
priority = LOG_DEBUG; priority = LOG_DEBUG;
break; break;
@ -99,7 +99,7 @@ _openpam_log(int level, const char *func, const char *fmt, ...)
switch (level) { switch (level) {
case PAM_LOG_DEBUG: case PAM_LOG_DEBUG:
if (!_openpam_debug) if (!openpam_debug)
return; return;
priority = LOG_DEBUG; priority = LOG_DEBUG;
break; break;
@ -136,7 +136,7 @@ _openpam_log(int level, const char *func, const char *fmt, ...)
* =PAM_LOG_DEBUG: * =PAM_LOG_DEBUG:
* Debugging messages. * Debugging messages.
* These messages are normally not logged unless the global * These messages are normally not logged unless the global
* integer variable :_openpam_debug is set to a non-zero * integer variable :openpam_debug is set to a non-zero
* value, in which case they are logged with a =syslog * value, in which case they are logged with a =syslog
* priority of =LOG_DEBUG. * priority of =LOG_DEBUG.
* =PAM_LOG_VERBOSE: * =PAM_LOG_VERBOSE:

4
lib/openpam_static.c
View file

@ -43,7 +43,7 @@
#ifdef OPENPAM_STATIC_MODULES #ifdef OPENPAM_STATIC_MODULES
SET_DECLARE(_openpam_static_modules, pam_module_t); SET_DECLARE(openpam_static_modules, pam_module_t);
/* /*
* OpenPAM internal * OpenPAM internal
@ -56,7 +56,7 @@ openpam_static(const char *path)
{ {
pam_module_t **module; pam_module_t **module;
SET_FOREACH(module, _openpam_static_modules) { SET_FOREACH(module, openpam_static_modules) {
if (strcmp((*module)->path, path) == 0) if (strcmp((*module)->path, path) == 0)
return (*module); return (*module);
} }