lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make store/account error messages less redundant

Browse Source 
this will become more relevant when more are added.
This commit is contained in:
Oswald Buddenhagen 2014-07-05 23:02:30 +02:00
parent d9c78b7787
commit 834a65d85c
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/drv_imap.c
View File

@ -2229,6 +2229,7 @@ imap_parse_store( conffile_t *cfg, store_conf_t **storep )
{ {
imap_store_conf_t *store; imap_store_conf_t *store;
imap_server_conf_t *server, *srv, sserver; imap_server_conf_t *server, *srv, sserver;
const char *type, *name;
int acc_opt = 0; int acc_opt = 0;
if (!strcasecmp( "IMAPAccount", cfg->cmd )) { if (!strcasecmp( "IMAPAccount", cfg->cmd )) {
@ -2344,20 +2345,18 @@ imap_parse_store( conffile_t *cfg, store_conf_t **storep )
} }
acc_opt = 1; acc_opt = 1;
} }
if (store)
type = "IMAP store", name = store->gen.name;
else
type = "IMAP account", name = server->name;
if (!store || !store->server) { if (!store || !store->server) {
if (!server->sconf.tunnel && !server->sconf.host) { if (!server->sconf.tunnel && !server->sconf.host) {
if (store) error( "%s '%s' has incomplete/missing connection details\n", type, name );
error( "IMAP store '%s' has incomplete/missing connection details\n", store->gen.name );
else
error( "IMAP account '%s' has incomplete/missing connection details\n", server->name );
cfg->err = 1; cfg->err = 1;
return 1; return 1;
} }
if (server->pass && server->pass_cmd) { if (server->pass && server->pass_cmd) {
if (store) error( "%s '%s' has both Pass and PassCmd\n", type, name );
error( "IMAP store '%s' has both Pass and PassCmd\n", store->gen.name );
else
error( "IMAP account '%s' has both Pass and PassCmd\n", server->name );
cfg->err = 1; cfg->err = 1;
return 1; return 1;
} }
@ -2368,7 +2367,7 @@ imap_parse_store( conffile_t *cfg, store_conf_t **storep )
memcpy( store->server, &sserver, sizeof(sserver) ); memcpy( store->server, &sserver, sizeof(sserver) );
store->server->name = store->gen.name; store->server->name = store->gen.name;
} else if (acc_opt) { } else if (acc_opt) {
error( "IMAP store '%s' has both Account and account-specific options\n", store->gen.name ); error( "%s '%s' has both Account and account-specific options\n", type, name );
cfg->err = 1; cfg->err = 1;
} }
} }