diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-08-24 15:15:38 +0000 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-08-24 15:15:38 +0000 |
| commit | 7a21a78301a60224eb4eaff4b9d3321a06f3cb1a (patch) | |
| tree | fd59a92eb74d349a1c7eba9c5c01201b40a70089 /src | |
| parent | 6430cb1c986bac90fd79181e17ae80df551b0805 (diff) | |
| download | wydawca-7a21a78301a60224eb4eaff4b9d3321a06f3cb1a.tar.gz wydawca-7a21a78301a60224eb4eaff4b9d3321a06f3cb1a.tar.bz2 | |
Update
git-svn-id: file:///svnroot/wydawca/trunk@289 6bb4bd81-ecc2-4fd4-a2d4-9571d19c0d33
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.c | 20 | ||||
| -rw-r--r-- | src/directive.c | 4 | ||||
| -rw-r--r-- | src/triplet.c | 6 |
3 files changed, 25 insertions, 5 deletions
diff --git a/src/config.c b/src/config.c index 63ce935..4cd6454 100644 --- a/src/config.c +++ b/src/config.c @@ -481,7 +481,25 @@ cfg_directory (gsc_config_file_t *file, char *kw, char *val, void *unused) } else if (dpair.verify_method.type != method_none && dpair.gpg_key_method.type != method_none) - register_directory_pair (&dpair); + { + /* FIXME: only sql supported so far */ + if (dpair.verify_method.type == method_builtin + && dpair.gpg_key_method.type != method_builtin) + { + file->error_msg (file->file_name, file->line, + "Sorry, method `builtin' is not yet supported"); + file->error_count++; + } + else if (dpair.verify_method.type == method_external + && dpair.gpg_key_method.type != method_external) + { + file->error_msg (file->file_name, file->line, + "Sorry, method `external' is not yet supported"); + file->error_count++; + } + + register_directory_pair (&dpair); + } } static void diff --git a/src/directive.c b/src/directive.c index bcf3429..cc9ed1d 100644 --- a/src/directive.c +++ b/src/directive.c @@ -328,8 +328,8 @@ process_directives (struct file_triplet *trp, struct directory_pair *dpair) relative_dir = safe_file_name_alloc (val); if (!relative_dir || relative_dir[0] == '/') { - logmsg (LOG_ERR, "%s: invalid directive", - trp->file[file_directive].name); + logmsg (LOG_ERR, "%s: invalid directory: %s", + trp->file[file_directive].name, val); return 1; } break; diff --git a/src/triplet.c b/src/triplet.c index 964b381..f5eebc6 100644 --- a/src/triplet.c +++ b/src/triplet.c @@ -195,7 +195,7 @@ triplet_processor (void *data, void *proc_data) if (debug_level) logmsg (LOG_DEBUG, "%s: incomplete triplet", trp->name); /* ignore unless expired (see below); */ - UPDATE_STATS (STAT_COMPLETE_TRIPLETS); + UPDATE_STATS (STAT_INCOMPLETE_TRIPLETS); break; case triplet_bad: @@ -204,7 +204,9 @@ triplet_processor (void *data, void *proc_data) return true; } } - + else + UPDATE_STATS (STAT_INCOMPLETE_TRIPLETS); + if (triplet_expired_p (trp, dpair->file_sweep_time)) { UPDATE_STATS (STAT_EXPIRED_TRIPLETS); |