diff options
Diffstat (limited to 'pam_sql')
-rw-r--r-- | pam_sql/pam_mysql.c | 10 | ||||
-rw-r--r-- | pam_sql/pam_pgsql.c | 12 | ||||
-rw-r--r-- | pam_sql/pam_sql.c | 73 | ||||
-rw-r--r-- | pam_sql/pam_sql.h | 5 |
4 files changed, 54 insertions, 46 deletions
diff --git a/pam_sql/pam_mysql.c b/pam_sql/pam_mysql.c index ca1f9e6..3f4a0d6 100644 --- a/pam_sql/pam_mysql.c +++ b/pam_sql/pam_mysql.c @@ -366,10 +366,14 @@ gpam_sql_verify_user_pass(pam_handle_t *pamh, const char *password, `make check-sql-config' in doc: gpam_sql_find_config("setenv-query") */ - if (rc == PAM_SUCCESS - && (q = gpam_sql_get_query(pamh, "setenv-query", - &slist, 0))) { + if (rc == PAM_SUCCESS) { + rc = gpam_sql_get_query(pamh, "setenv-query", 0, + &slist, &q); + if (rc == PAM_SUCCESS) { + if (q) { mysql_setenv(pamh, &mysql, q); gray_slist_free(&slist); } + } + } mysql_close(&mysql); } diff --git a/pam_sql/pam_pgsql.c b/pam_sql/pam_pgsql.c index f6d19e1..5f66b53 100644 --- a/pam_sql/pam_pgsql.c +++ b/pam_sql/pam_pgsql.c @@ -116,4 +116,5 @@ gpam_sql_verify_user_pass(pam_handle_t *pamh, const char *password, int n; gray_slist_t slist; + char const *query; n = PQntuples(res); @@ -154,12 +155,15 @@ gpam_sql_verify_user_pass(pam_handle_t *pamh, const char *password, `make check-sql-config' in doc: gpam_sql_find_config("setenv-query") */ - if (rc == PAM_SUCCESS - && (query = gpam_sql_get_query(pamh, - "setenv-query", - &slist, 0))) { + if (rc == PAM_SUCCESS) { + rc = gpam_sql_get_query(pamh, "setenv-query", 0, + &slist, &query); + if (rc == PAM_SUCCESS) { + if (query) { pgsql_setenv(pamh, pgconn, query); gray_slist_free(&slist); } } + } + } PQclear(res); diff --git a/pam_sql/pam_sql.c b/pam_sql/pam_sql.c index 359ba64..6707eb3 100644 --- a/pam_sql/pam_sql.c +++ b/pam_sql/pam_sql.c @@ -160,46 +160,37 @@ gpam_sql_check_boolean_config(const char *name, int defval) -const char * -gpam_sql_get_query(pam_handle_t *pamh, const char *name, gray_slist_t *pslist, - int required) +int +gpam_sql_get_query(pam_handle_t *pamh, const char *name, int required, + gray_slist_t *pslist, const char **retptr) { gray_slist_t slist; const char *query = gpam_sql_find_config(name); + char *retval; if (!query) { - if (required) - gray_raise("%s: %s not defined", gpam_sql_config_file, name); - return NULL; - } - - slist = gray_slist_create(); - gray_expand_string(pamh, query, slist); - gray_slist_append_char(slist, 0); - *pslist = slist; - return gray_slist_finish(slist); + if (required) { + _pam_log(LOG_ERR, "%s: %s not defined", + gpam_sql_config_file, name); + return PAM_AUTHINFO_UNAVAIL; } - -static const char * -get_query2(pam_handle_t *pamh, const char *name1, const char *name2, - gray_slist_t *pslist, int required) -{ - gray_slist_t slist; - const char *query = gpam_sql_find_config(name1); - - if (!query) - query = gpam_sql_find_config(name2); - - if (!query) { - if (required) - gray_raise("%s: %s not defined", - gpam_sql_config_file, name1); - return NULL; + *pslist = NULL; + *retptr = NULL; + return PAM_SUCCESS; } slist = gray_slist_create(); + if (!slist) + return errno_to_pam(errno); gray_expand_string(pamh, query, slist); gray_slist_append_char(slist, 0); *pslist = slist; - return gray_slist_finish(slist); + retval = gray_slist_finish(slist); + if (gray_slist_err(slist)) { + int rc = errno_to_pam(gray_slist_err(slist)); + gray_slist_free(&slist); + return rc; + } + *retptr = retval; + return PAM_SUCCESS; } @@ -213,5 +204,4 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) char *password; int retval = PAM_AUTH_ERR; - gray_pam_init(PAM_SERVICE_ERR); /* parse arguments */ @@ -238,12 +228,17 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) else { gray_slist_t slist; + char const *query; + /* FIXME: This comment is needed to pacify `make check-sql-config' in doc: gpam_sql_find_config("passwd-query") */ + retval = gpam_sql_get_query(pamh, "passwd-query", 1, + &slist, &query); + if (retval == PAM_SUCCESS) { retval = gpam_sql_verify_user_pass(pamh, password, - get_query2(pamh, "passwd-query", - "query", &slist, 1)); + query); gray_slist_free(&slist); } + } gray_env_free(config_env); @@ -277,5 +272,4 @@ sql_session_mgmt(pam_handle_t *pamh, int flags, int retval; - gray_pam_init(PAM_SERVICE_ERR); /* parse arguments */ @@ -286,9 +280,14 @@ sql_session_mgmt(pam_handle_t *pamh, int flags, else { gray_slist_t slist; - retval = gpam_sql_acct(pamh, - gpam_sql_get_query(pamh, query_name, - &slist, 0)); + char const *query; + + retval = gpam_sql_get_query(pamh, query_name, 0, &slist, &query); + if (retval == PAM_SUCCESS) { + if (query) { + retval = gpam_sql_acct(pamh, query); gray_slist_free(&slist); } + } + } gray_env_free(config_env); diff --git a/pam_sql/pam_sql.h b/pam_sql/pam_sql.h index 9eeecd6..5dc9525 100644 --- a/pam_sql/pam_sql.h +++ b/pam_sql/pam_sql.h @@ -48,6 +48,7 @@ int gpam_sql_acct(pam_handle_t *pamh, const char *query); char *gpam_sql_find_config(const char *name); -const char *gpam_sql_get_query(pam_handle_t *pamh, const char *name, - gray_slist_t *pslist, int required); +int gpam_sql_get_query(pam_handle_t *pamh, char const *var, + int required, + gray_slist_t *pslist, const char **query); int gpam_sql_check_boolean_config(const char *name, int defval); |