Skip to content

Commit

Permalink
Some more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
x4m committed May 6, 2024
1 parent 07458cd commit a6e7169
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
2 changes: 0 additions & 2 deletions sources/config_reader.c
Original file line number Diff line number Diff line change
Expand Up @@ -1883,7 +1883,6 @@ static int od_config_reader_route(od_config_reader_t *reader, char *db_name,
}

static int od_config_reader_group(od_config_reader_t *reader, char *db_name,
int db_name_len, int db_is_default,
od_group_t *group, od_extention_t *extentions)
{
/* group name */
Expand Down Expand Up @@ -2288,7 +2287,6 @@ static int od_config_reader_database(od_config_reader_t *reader,
return NOT_OK_RESPONSE;
}
rc = od_config_reader_group(reader, db_name,
db_name_len, db_is_default,
group, extentions);
if (rc == -1)
goto error;
Expand Down
4 changes: 0 additions & 4 deletions sources/rules.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,6 @@ static inline int od_rule_update_auth(od_route_t *route, void **argv)
rule->password = group_rule->password;
rule->password_len = group_rule->password_len;

rule->is_group_member = 1;

return 0;
}

Expand Down Expand Up @@ -218,7 +216,6 @@ void od_rules_group_checker_run(void *arg)
group->route_db, strlen(group->route_db) + 1);

machine_msg_t *msg;
int is_group_member = 0;
char *group_member;
int rc;

Expand Down Expand Up @@ -485,7 +482,6 @@ od_rule_t *od_rules_add(od_rules_t *rules)

rule->enable_password_passthrough = 0;

rule->is_group_member = 0;
od_list_init(&rule->auth_common_names);
od_list_init(&rule->link);
od_list_append(&rules->rules, &rule->link);
Expand Down
3 changes: 1 addition & 2 deletions sources/rules.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,7 @@ struct od_rule {

/* group */
od_group_t *group; // set if rule is group
int is_group_member;
od_rule_t *group_rule; // set if is_group_member = 1
od_rule_t *group_rule;

/* PostgreSQL options */
kiwi_vars_t vars;
Expand Down

0 comments on commit a6e7169

Please sign in to comment.