From 4d839f5a8083e1ddd4767c838f56a4079f846c6d Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 2 Sep 2020 14:50:59 +0200 Subject: [PATCH] keyboxd: Fix user id based queries * kbx/backend-sqlite.c (run_select_statement): Add the missing join for user id bases queries. Signed-off-by: Werner Koch --- kbx/backend-sqlite.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kbx/backend-sqlite.c b/kbx/backend-sqlite.c index 935811fd5..67d40f0b6 100644 --- a/kbx/backend-sqlite.c +++ b/kbx/backend-sqlite.c @@ -696,7 +696,7 @@ run_select_statement (be_sqlite_local_t ctx, if (!ctx->select_stmt) err = run_sql_prepare ("SELECT p.ubid, p.type, p.keyblob" " FROM pubkey as p, userid as u" - " WHERE u.uid = ?1", + " WHERE p.ubid = u.ubid AND u.uid = ?1", &ctx->select_stmt); if (!err) err = run_sql_bind_text (ctx->select_stmt, 1, desc[descidx].u.name); @@ -706,7 +706,7 @@ run_select_statement (be_sqlite_local_t ctx, if (!ctx->select_stmt) err = run_sql_prepare ("SELECT p.ubid, p.type, p.keyblob" " FROM pubkey as p, userid as u" - " WHERE u.addrspec = ?1", + " WHERE p.ubid = u.ubid AND u.addrspec = ?1", &ctx->select_stmt); if (!err) err = run_sql_bind_text (ctx->select_stmt, 1, desc[descidx].u.name); @@ -716,7 +716,7 @@ run_select_statement (be_sqlite_local_t ctx, if (!ctx->select_stmt) err = run_sql_prepare ("SELECT p.ubid, p.type, p.keyblob" " FROM pubkey as p, userid as u" - " WHERE u.addrspec LIKE ?1", + " WHERE p.ubid = u.ubid AND u.addrspec LIKE ?1", &ctx->select_stmt); if (!err) err = run_sql_bind_text_like (ctx->select_stmt, 1, @@ -727,7 +727,7 @@ run_select_statement (be_sqlite_local_t ctx, if (!ctx->select_stmt) err = run_sql_prepare ("SELECT p.ubid, p.type, p.keyblob" " FROM pubkey as p, userid as u" - " WHERE u.uid LIKE ?1", + " WHERE p.ubid = u.ubid AND u.uid LIKE ?1", &ctx->select_stmt); if (!err) err = run_sql_bind_text_like (ctx->select_stmt, 1,