mirrors/pam-modules
1
0
Fork 0
mirror of git://git.gnu.org.ua/pam-modules.git synced 2025-04-29 09:59:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

* configure.ac: Check for pam libraries and header files.

Browse source 
* pam_sql/pam_mysql.c (mysql_setenv): Protect by #ifdef
HAVE_PAM_MISC_SETENV.  Prevent coredumps on NULL values.
* pam_sql/pam_pgsql.c (pgsql_setenv): Likewise.
* pam_sql/Makefile.am (pam_mysql_la_LDADD,pam_pgsql_la_LDADD): Add
@PAM_MISC@.
* pam_sql/pam_sql.c (read_config): Read lines of arbitrary length.




git-svn-id: file:///svnroot/pam-modules/trunk@90 56984be4-0537-0410-a56c-fcb268c96130
This commit is contained in:
Sergey Poznyakoff 2008-03-19 09:50:00 +00:00
parent 80aafa9dcf
commit 06aaf68ec3
5 changed files with 51 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
pam_sql/pam_mysql.c
View file

@ -304,10 +304,8 @@ mysql_do_query(MYSQL *mysql, const char *query)
static int
mysql_setenv(pam_handle_t *pamh, MYSQL *mysql, const char *query)
{
#ifdef HAVE_PAM_MISC_SETENV
MYSQL_RES *result;
MYSQL_ROW row;
MYSQL_FIELD *fields;
size_t nf, i;
DEBUG(10,("Executing %s", query));
if (mysql_query(mysql, query)) {
@ -319,13 +317,21 @@ mysql_setenv(pam_handle_t *pamh, MYSQL *mysql, const char *query)
mysql_error(mysql));
return PAM_SERVICE_ERR;
}
row = mysql_fetch_row(result);
fields = mysql_fetch_fields(result);
nf = mysql_num_fields(result);
for (i = 0; i < nf; i++)
pam_misc_setenv(pamh, fields[i].name, row[i], 0);
if (mysql_num_rows(result)) {
MYSQL_ROW row = mysql_fetch_row(result);
MYSQL_FIELD *fields = mysql_fetch_fields(result);
size_t i, nf = mysql_num_fields(result);
for (i = 0; i < nf; i++)
if (row[i])
pam_misc_setenv(pamh, fields[i].name,
row[i], 0);
}
mysql_free_result(result);
return PAM_SUCCESS;
#else
_pam_log(LOG_ERR, "MySQL: PAM setenv is not available.");
return PAM_SERVICE_ERR;
#endif
}
static int