1 files changed, 7 insertions, 3 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);