Use the correct error code in some of the places where we have long used
the wrong one. git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@927 185d5e19-27fe-0310-9dcf-9bff6b9f3609
This commit is contained in:
parent
e7f32a97b0
commit
3ebfd11150
4 changed files with 14 additions and 7 deletions
|
@ -107,7 +107,7 @@ openpam_dispatch(pam_handle_t *pamh,
|
|||
if (chain->module->func[primitive] == NULL) {
|
||||
openpam_log(PAM_LOG_ERROR, "%s: no %s()",
|
||||
chain->module->path, pam_sm_func_name[primitive]);
|
||||
r = PAM_SYSTEM_ERR;
|
||||
r = PAM_SYMBOL_ERR;
|
||||
} else {
|
||||
pamh->primitive = primitive;
|
||||
pamh->current = chain;
|
||||
|
|
|
@ -60,6 +60,8 @@ pam_end(pam_handle_t *pamh,
|
|||
int i;
|
||||
|
||||
ENTER();
|
||||
if (pamh == NULL)
|
||||
RETURNC(PAM_BAD_HANDLE);
|
||||
|
||||
/* clear module data */
|
||||
while ((dp = pamh->module_data) != NULL) {
|
||||
|
@ -89,6 +91,12 @@ pam_end(pam_handle_t *pamh,
|
|||
RETURNC(PAM_SUCCESS);
|
||||
}
|
||||
|
||||
/*
|
||||
* Error codes:
|
||||
*
|
||||
* PAM_BAD_HANDLE
|
||||
*/
|
||||
|
||||
/**
|
||||
* The =pam_end function terminates a PAM transaction and destroys the
|
||||
* corresponding PAM context, releasing all resources allocated to it.
|
||||
|
|
|
@ -76,14 +76,14 @@ pam_get_item(const pam_handle_t *pamh,
|
|||
*item = pamh->item[item_type];
|
||||
RETURNC(PAM_SUCCESS);
|
||||
default:
|
||||
RETURNC(PAM_SYMBOL_ERR);
|
||||
RETURNC(PAM_BAD_ITEM);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Error codes:
|
||||
*
|
||||
* PAM_SYMBOL_ERR
|
||||
* PAM_BAD_ITEM
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
|
@ -70,7 +70,7 @@ pam_set_item(pam_handle_t *pamh,
|
|||
case PAM_SERVICE:
|
||||
/* set once only, by pam_start() */
|
||||
if (*slot != NULL && item != NULL)
|
||||
RETURNC(PAM_SYSTEM_ERR);
|
||||
RETURNC(PAM_BAD_ITEM);
|
||||
/* fall through */
|
||||
case PAM_USER:
|
||||
case PAM_AUTHTOK:
|
||||
|
@ -94,7 +94,7 @@ pam_set_item(pam_handle_t *pamh,
|
|||
osize = nsize = sizeof(struct pam_conv);
|
||||
break;
|
||||
default:
|
||||
RETURNC(PAM_SYMBOL_ERR);
|
||||
RETURNC(PAM_BAD_ITEM);
|
||||
}
|
||||
if (*slot != NULL) {
|
||||
memset(*slot, 0xd0, osize);
|
||||
|
@ -113,8 +113,7 @@ pam_set_item(pam_handle_t *pamh,
|
|||
/*
|
||||
* Error codes:
|
||||
*
|
||||
* PAM_SYMBOL_ERR
|
||||
* PAM_SYSTEM_ERR
|
||||
* PAM_BAD_ITEM
|
||||
* PAM_BUF_ERR
|
||||
*/
|
||||
|
||||
|
|
Loading…
Reference in a new issue