Skip to content

Commit 8af787f

Browse files
authored
Merge pull request #202 from vvidic/login-param
Fix broken command line options
2 parents 63b6517 + 4689da8 commit 8af787f

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

login/config.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,13 @@ status_t glome_login_assign_config_option(glome_login_config_t *config,
311311
const char *section, const char *key,
312312
const char *val) {
313313
if (section == NULL) {
314-
return status_createf("ERROR: section name not set");
314+
return status_createf("ERROR: config section not set");
315+
}
316+
if (key == NULL) {
317+
return status_createf("ERROR: config key not set");
318+
}
319+
if (val == NULL) {
320+
return status_createf("ERROR: config value not set");
315321
}
316322

317323
if (strcmp(section, "service") == 0) {
@@ -320,7 +326,7 @@ status_t glome_login_assign_config_option(glome_login_config_t *config,
320326
return assign_default_option(config, key, val);
321327
}
322328

323-
return status_createf("ERROR: section name not recognized: %s", section);
329+
return status_createf("ERROR: config section not recognized: %s", section);
324330
}
325331

326332
status_t glome_login_parse_config_file(glome_login_config_t *config) {

login/ui.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ int parse_args(glome_login_config_t* config, int argc, char* argv[]) {
173173
glome_login_assign_config_option(config, "service", "key", optarg);
174174
break;
175175
case 'l':
176-
status = glome_login_assign_config_option(config, "service",
176+
status = glome_login_assign_config_option(config, "default",
177177
"login-path", optarg);
178178
break;
179179
case 'm':
@@ -186,19 +186,19 @@ int parse_args(glome_login_config_t* config, int argc, char* argv[]) {
186186
break;
187187
case 's':
188188
status = glome_login_assign_config_option(config, "default",
189-
"disable-syslog", optarg);
189+
"disable-syslog", "true");
190190
break;
191191
case 't':
192192
status = glome_login_assign_config_option(config, "default", "timeout",
193193
optarg);
194194
break;
195195
case 'v':
196196
status = glome_login_assign_config_option(config, "default", "verbose",
197-
optarg);
197+
"true");
198198
break;
199199
case 'I':
200200
status = glome_login_assign_config_option(config, "default",
201-
"print-secrets", optarg);
201+
"print-secrets", "true");
202202
break;
203203
case 'K':
204204
status = glome_login_assign_config_option(config, "default",

0 commit comments

Comments
 (0)