Skip to content

Commit 078a416

Browse files
jhelmoldbjoernricks
authored andcommitted
Change: Removed hosts_ordering option.
The hosts ordering option has never been used, so it is removed from the sources.
1 parent b072395 commit 078a416

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

src/gsad_gmp.c

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2147,7 +2147,7 @@ create_task_gmp (gvm_connection_t *connection, credentials_t *credentials,
21472147
const char *name, *comment, *config_id, *target_id, *scanner_type;
21482148
const char *scanner_id, *schedule_id, *schedule_periods;
21492149
const char *max_checks, *max_hosts;
2150-
const char *in_assets, *hosts_ordering, *alterable;
2150+
const char *in_assets, *alterable;
21512151
const char *add_tag, *tag_id, *auto_delete, *auto_delete_data;
21522152
const char *apply_overrides, *min_qod, *usage_type;
21532153
const char *cs_allow_failed_retrieval;
@@ -2160,7 +2160,6 @@ create_task_gmp (gvm_connection_t *connection, credentials_t *credentials,
21602160
auto_delete_data = params_value (params, "auto_delete_data");
21612161
comment = params_value (params, "comment");
21622162
config_id = params_value (params, "config_id");
2163-
hosts_ordering = params_value (params, "hosts_ordering");
21642163
in_assets = params_value (params, "in_assets");
21652164
max_checks = params_value (params, "max_checks");
21662165
max_hosts = params_value (params, "max_hosts");
@@ -2182,14 +2181,12 @@ create_task_gmp (gvm_connection_t *connection, credentials_t *credentials,
21822181
CHECK_VARIABLE_INVALID (scanner_type, "Create Task");
21832182
if (!strcmp (scanner_type, "1"))
21842183
{
2185-
hosts_ordering = "";
21862184
max_checks = "";
21872185
max_hosts = "";
21882186
}
21892187
else if (!strcmp (scanner_type, "3"))
21902188
{
21912189
config_id = "";
2192-
hosts_ordering = "";
21932190
max_checks = "";
21942191
max_hosts = "";
21952192
}
@@ -2199,7 +2196,6 @@ create_task_gmp (gvm_connection_t *connection, credentials_t *credentials,
21992196
CHECK_VARIABLE_INVALID (usage_type, "Create Task");
22002197
CHECK_VARIABLE_INVALID (config_id, "Create Task");
22012198
CHECK_VARIABLE_INVALID (target_id, "Create Task");
2202-
CHECK_VARIABLE_INVALID (hosts_ordering, "Create Task");
22032199
CHECK_VARIABLE_INVALID (scanner_id, "Create Task");
22042200
CHECK_VARIABLE_INVALID (schedule_id, "Create Task");
22052201

@@ -2275,7 +2271,6 @@ create_task_gmp (gvm_connection_t *connection, credentials_t *credentials,
22752271
"<schedule_periods>%s</schedule_periods>"
22762272
"<target id=\"%s\"/>"
22772273
"<scanner id=\"%s\"/>"
2278-
"<hosts_ordering>%s</hosts_ordering>"
22792274
"<name>%s</name>"
22802275
"<comment>%s</comment>"
22812276
"<preferences>"
@@ -2317,7 +2312,7 @@ create_task_gmp (gvm_connection_t *connection, credentials_t *credentials,
23172312
"<alterable>%i</alterable>"
23182313
"<usage_type>%s</usage_type>"
23192314
"</create_task>",
2320-
config_id, schedule_periods, target_id, scanner_id, hosts_ordering, name,
2315+
config_id, schedule_periods, target_id, scanner_id, name,
23212316
comment, max_checks, max_hosts, strcmp (in_assets, "0") ? "yes" : "no",
23222317
strcmp (apply_overrides, "0") ? "yes" : "no", min_qod, auto_delete,
23232318
auto_delete_data,
@@ -3001,7 +2996,7 @@ save_task_gmp (gvm_connection_t *connection, credentials_t *credentials,
30012996
gchar *html, *response, *format;
30022997
const char *comment, *name, *schedule_id, *in_assets;
30032998
const char *scanner_id, *task_id, *max_checks, *max_hosts;
3004-
const char *config_id, *target_id, *hosts_ordering, *alterable;
2999+
const char *config_id, *target_id, *alterable;
30053000
const char *scanner_type, *schedule_periods, *auto_delete, *auto_delete_data;
30063001
const char *apply_overrides, *min_qod;
30073002
const char *cs_allow_failed_retrieval;
@@ -3016,7 +3011,6 @@ save_task_gmp (gvm_connection_t *connection, credentials_t *credentials,
30163011
auto_delete_data = params_value (params, "auto_delete_data");
30173012
comment = params_value (params, "comment");
30183013
config_id = params_value (params, "config_id");
3019-
hosts_ordering = params_value (params, "hosts_ordering");
30203014
in_assets = params_value (params, "in_assets");
30213015
max_checks = params_value (params, "max_checks");
30223016
max_hosts = params_value (params, "max_hosts");
@@ -3036,14 +3030,12 @@ save_task_gmp (gvm_connection_t *connection, credentials_t *credentials,
30363030
CHECK_VARIABLE_INVALID (scanner_type, "Save Task");
30373031
if (!strcmp (scanner_type, "1"))
30383032
{
3039-
hosts_ordering = "";
30403033
max_checks = "";
30413034
max_hosts = "";
30423035
}
30433036
else if (!strcmp (scanner_type, "3"))
30443037
{
30453038
config_id = "0";
3046-
hosts_ordering = "";
30473039
max_checks = "";
30483040
max_hosts = "";
30493041
}
@@ -3052,7 +3044,6 @@ save_task_gmp (gvm_connection_t *connection, credentials_t *credentials,
30523044
CHECK_VARIABLE_INVALID (name, "Save Task");
30533045
CHECK_VARIABLE_INVALID (comment, "Save Task");
30543046
CHECK_VARIABLE_INVALID (target_id, "Save Task");
3055-
CHECK_VARIABLE_INVALID (hosts_ordering, "Save Task");
30563047
CHECK_VARIABLE_INVALID (config_id, "Save Task");
30573048
CHECK_VARIABLE_INVALID (schedule_id, "Save Task");
30583049

@@ -3119,7 +3110,6 @@ save_task_gmp (gvm_connection_t *connection, credentials_t *credentials,
31193110
"<modify_task task_id=\"%%s\">"
31203111
"<name>%%s</name>"
31213112
"<comment>%%s</comment>"
3122-
"<hosts_ordering>%s</hosts_ordering>"
31233113
"%s"
31243114
"<target id=\"%%s\"/>"
31253115
"<config id=\"%%s\"/>"
@@ -3162,7 +3152,7 @@ save_task_gmp (gvm_connection_t *connection, credentials_t *credentials,
31623152
"</preferences>"
31633153
"%s%i%s"
31643154
"</modify_task>",
3165-
hosts_ordering, alert_element->str, alterable ? "<alterable>" : "",
3155+
alert_element->str, alterable ? "<alterable>" : "",
31663156
alterable ? strcmp (alterable, "0") : 0, alterable ? "</alterable>" : "");
31673157
response = NULL;
31683158
entity = NULL;

src/gsad_validator.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,6 @@ init_validator ()
396396
gvm_validator_add (validator, "hosts", "^[-_[:alnum:],: \\./]+$");
397397
gvm_validator_add (validator, "hosts_allow", "^(0|1)$");
398398
gvm_validator_add (validator, "hosts_opt", "^[-_[:alnum:],: \\./]*$");
399-
gvm_validator_add (validator, "hosts_ordering",
400-
"^(sequential|random|reverse)$");
401399
gvm_validator_add (validator, "hour", "^([01]?[0-9]|2[0-3])$");
402400
gvm_validator_add (validator, "howto_use", "(?s)^.*$");
403401
gvm_validator_add (validator, "howto_install", "(?s)^.*$");

0 commit comments

Comments
 (0)