summaryrefslogtreecommitdiff
path: root/libpam
diff options
context:
space:
mode:
authorThorsten Kukuk <kukuk@thkukuk.de>2005-01-10 10:31:32 +0000
committerThorsten Kukuk <kukuk@thkukuk.de>2005-01-10 10:31:32 +0000
commit4c473e543d672474e685b74bb10770e762c62efc (patch)
tree32e0d4bab510bbf88b814d177f92840c419b1ddb /libpam
parent48e00c34bec7be0eb88aa3eabc89cac38506dbf2 (diff)
Relevant BUGIDs:
Purpose of commit: bugfix Commit summary: --------------- Fix seg.fault in case the PAM configuration file is corrupt
Diffstat (limited to 'libpam')
-rw-r--r--libpam/pam_handlers.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/libpam/pam_handlers.c b/libpam/pam_handlers.c
index 75519551..9d880ff1 100644
--- a/libpam/pam_handlers.c
+++ b/libpam/pam_handlers.c
@@ -113,7 +113,14 @@ static int _pam_parse_conf_file(pam_handle_t *pamh, FILE *f
, this_service));
tok = _pam_StrTok(NULL, " \n\t", &nexttok);
- if (!_pam_strCMP("auth", tok)) {
+ if (tok == NULL) {
+ /* module type does not exist */
+ D(("_pam_init_handlers: empty module type for %s", this_service));
+ _pam_system_log(LOG_ERR, "(%s) empty module type", this_service);
+ module_type = (requested_module_type != PAM_T_ANY) ?
+ requested_module_type : PAM_T_AUTH; /* most sensitive */
+ must_fail = 1; /* install as normal but fail when dispatched */
+ } else if (!_pam_strCMP("auth", tok)) {
module_type = PAM_T_AUTH;
} else if (!_pam_strCMP("session", tok)) {
module_type = PAM_T_SESS;
@@ -146,7 +153,14 @@ static int _pam_parse_conf_file(pam_handle_t *pamh, FILE *f
actions[i++] = _PAM_ACTION_UNDEF);
}
tok = _pam_StrTok(NULL, " \n\t", &nexttok);
- if (!_pam_strCMP("required", tok)) {
+ if (tok == NULL) {
+ /* no module name given */
+ D(("_pam_init_handlers: no control flag supplied"));
+ _pam_system_log(LOG_ERR,
+ "(%s) no control flag supplied", this_service);
+ _pam_set_default_control(actions, _PAM_ACTION_BAD);
+ must_fail = 1;
+ } else if (!_pam_strCMP("required", tok)) {
D(("*PAM_F_REQUIRED*"));
actions[PAM_SUCCESS] = _PAM_ACTION_OK;
actions[PAM_NEW_AUTHTOK_REQD] = _PAM_ACTION_OK;