Fixed undefined order of permissions
This commit is contained in:
parent
56165c0b76
commit
a7e5d7d92d
@ -212,14 +212,20 @@ access_t check_perm_access_noparent(const char *filename,
|
|||||||
|
|
||||||
access_t ret = NDEF;
|
access_t ret = NDEF;
|
||||||
sqlite3_stmt *stmt = NULL;
|
sqlite3_stmt *stmt = NULL;
|
||||||
const char *sql = "SELECT mode FROM permissions WHERE executable = ?1 "
|
const char *sql =
|
||||||
"AND (( ?2 LIKE CONCAT(filename, \'%\') AND filename "
|
"SELECT mode FROM permissions WHERE executable = ?1 "
|
||||||
"GLOB \'*/\') OR filename = ?2 );";
|
"AND (( ?2 LIKE CONCAT(filename, \'%\') AND filename "
|
||||||
|
"GLOB \'*/\') OR filename = ?2 ) ORDER BY LENGTH( filename ) DESC;";
|
||||||
sqlite3_prepare_v2(perm_database, sql, -1, &stmt, NULL);
|
sqlite3_prepare_v2(perm_database, sql, -1, &stmt, NULL);
|
||||||
sqlite3_bind_text(stmt, 1, pi.name, -1, SQLITE_STATIC);
|
sqlite3_bind_text(stmt, 1, pi.name, -1, SQLITE_STATIC);
|
||||||
sqlite3_bind_text(stmt, 2, filename, -1, SQLITE_STATIC);
|
sqlite3_bind_text(stmt, 2, filename, -1, SQLITE_STATIC);
|
||||||
|
|
||||||
int step_ret = sqlite3_step(stmt);
|
int step_ret = sqlite3_step(stmt);
|
||||||
|
if (step_ret != SQLITE_ROW && step_ret != SQLITE_DONE) {
|
||||||
|
fprintf(stderr, "SQLite error: %s\n", sqlite3_errstr(step_ret));
|
||||||
|
sqlite3_finalize(stmt);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
if (step_ret == SQLITE_ROW) {
|
if (step_ret == SQLITE_ROW) {
|
||||||
int mode_col = sqlite3_column_int(stmt, 0);
|
int mode_col = sqlite3_column_int(stmt, 0);
|
||||||
if (mode_col) {
|
if (mode_col) {
|
||||||
@ -227,8 +233,6 @@ access_t check_perm_access_noparent(const char *filename,
|
|||||||
} else {
|
} else {
|
||||||
ret = DENY;
|
ret = DENY;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
fprintf(stderr, "SQLite error: %s\n", sqlite3_errstr(step_ret));
|
|
||||||
}
|
}
|
||||||
sqlite3_finalize(stmt);
|
sqlite3_finalize(stmt);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user