Merge branch 'svn-trunk' into master

This commit is contained in:
Bart Van Assche
2020-09-04 21:22:06 -07:00
3 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -2823,7 +2823,7 @@ static bool scst_cm_check_access_acg(const char *initiator_name,
if (default_acg)
goto found;
list_for_each_entry(acn, &acg->acn_list, acn_list_entry) {
if (strcmp(acn->name, initiator_name) == 0)
if (wildcmp(acn->name, initiator_name))
goto found;
}
}
+2
View File
@@ -379,6 +379,8 @@ int scst_del_free_acg(struct scst_acg *acg, bool close_sessions);
void scst_get_acg(struct scst_acg *acg);
void scst_put_acg(struct scst_acg *acg);
bool wildcmp(const char *wild, const char *string);
struct scst_acg *scst_tgt_find_acg(struct scst_tgt *tgt, const char *name);
struct scst_acg *scst_find_acg(const struct scst_session *sess);
+1 -1
View File
@@ -7132,7 +7132,7 @@ static bool __wildcmp(const char *wild, const char *string, int recursion_level)
*
* Also see comment for __wildcmp().
*/
static bool wildcmp(const char *wild, const char *string)
bool wildcmp(const char *wild, const char *string)
{
return __wildcmp(wild, string, 0);
}