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
@@ -367,5 +367,7 @@ gpam_sql_verify_user_pass(pam_handle_t *pamh, const char *password,
                    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);
@@ -373,2 +375,4 @@ gpam_sql_verify_user_pass(pam_handle_t *pamh, const char *password,
                                 }
+                        }
+                }
                 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
@@ -117,2 +117,3 @@ gpam_sql_verify_user_pass(pam_handle_t *pamh, const char *password,
                 gray_slist_t slist;
+                char const *query;
                 
@@ -155,6 +156,7 @@ gpam_sql_verify_user_pass(pam_handle_t *pamh, const char *password,
                    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);
@@ -163,2 +165,4 @@ gpam_sql_verify_user_pass(pam_handle_t *pamh, const char *password,
                         }
+                }
+        }
 
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
@@ -161,5 +161,5 @@ 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)
 {
@@ -167,31 +167,13 @@ gpam_sql_get_query(pam_handle_t *pamh, const char *name, gray_slist_t *pslist,
         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;
         }
@@ -199,2 +181,4 @@ get_query2(pam_handle_t *pamh, const char *name1, const char *name2,
         slist = gray_slist_create();
+        if (!slist)
+                return errno_to_pam(errno);
         gray_expand_string(pamh, query, slist);
@@ -202,3 +186,10 @@ get_query2(pam_handle_t *pamh, const char *name1, const char *name2,
         *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;
 }
@@ -214,3 +205,2 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv)
         int retval = PAM_AUTH_ERR;
-        gray_pam_init(PAM_SERVICE_ERR);
 
@@ -239,2 +229,4 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv)
                 gray_slist_t slist;
+                char const *query;
+                
                 /* FIXME: This comment is needed to pacify
@@ -242,7 +234,10 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv)
                    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);
                 }
+        }
         
@@ -278,3 +273,2 @@ sql_session_mgmt(pam_handle_t *pamh, int flags,
 
-        gray_pam_init(PAM_SERVICE_ERR);
 
@@ -287,7 +281,12 @@ sql_session_mgmt(pam_handle_t *pamh, int flags,
                 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);
                         }
+                }
+        }
         
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
@@ -49,4 +49,5 @@ 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);