diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2013-03-04 10:31:43 +0100 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2013-03-04 10:31:43 +0100 |
| commit | c4b5ca206e7d9df745a8e74b54d3e3e2fc8dc048 (patch) | |
| tree | d2016b77fad43b3f782bb47b585daeab267a5e46 /database | |
| parent | c75acecc3035af732936c92e67c29e0937a32178 (diff) | |
| download | eurephia-c4b5ca206e7d9df745a8e74b54d3e3e2fc8dc048.tar.gz eurephia-c4b5ca206e7d9df745a8e74b54d3e3e2fc8dc048.tar.xz eurephia-c4b5ca206e7d9df745a8e74b54d3e3e2fc8dc048.zip | |
sqlite: Fixed a few oddities
memset() and free_nullsafe() was performed on a NULL pointer before
it would be used.
Also make uicid be 0 on generic database issues, not triggering a
logging of a log-in attempt. A database error is hardly a user problem,
and logging the log-in attempt may even fail as well.
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'database')
| -rw-r--r-- | database/sqlite/edb-sqlite.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/database/sqlite/edb-sqlite.c b/database/sqlite/edb-sqlite.c index 607911a..d544a8c 100644 --- a/database/sqlite/edb-sqlite.c +++ b/database/sqlite/edb-sqlite.c @@ -386,8 +386,7 @@ int eDBauth_user(eurephiaCTX *ctx, const int certid, const char *username, const " JOIN openvpn_blacklist USING(digest)) bl2 ON(uc.certid = bl2.certid)" " WHERE uc.certid = '%i' AND ou.username = '%q'", certid, username); - memset(crpwd, 0, strlen_nullsafe(crpwd)); - free_nullsafe(ctx, crpwd); + if( sqlite_query_status(res) != dbSUCCESS ) { eurephia_log(ctx, LOG_FATAL, 0, "Could not lookup user in database (certid %i, username '%s'", certid, username); @@ -408,6 +407,7 @@ int eDBauth_user(eurephiaCTX *ctx, const int certid, const char *username, const eurephia_log(ctx, LOG_WARNING, 0,"Authentication failed for user '%s'. DB error.", username); pwdok = 0; + uicid = 0; } else { crpwd = eurephia_pwd_crypt(ctx, passwd, dbpwd); pwdok = ((crpwd != NULL) && (strcmp(crpwd, dbpwd) == 0) ? 1 : 0); |