summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-11-21 18:47:27 +0000
committerThierry Vignaud <tv@mageia.org>2011-11-21 18:47:27 +0000
commitf43090757d699a396c17db668fec3f57e35adabc (patch)
tree7f9f0a45e130eac0383945339931c1ebab42bc0c
parent57cb1fab7ef3c7f970a9154d6cc2355dcb76b727 (diff)
downloadldetect-f43090757d699a396c17db668fec3f57e35adabc.tar
ldetect-f43090757d699a396c17db668fec3f57e35adabc.tar.gz
ldetect-f43090757d699a396c17db668fec3f57e35adabc.tar.bz2
ldetect-f43090757d699a396c17db668fec3f57e35adabc.tar.xz
ldetect-f43090757d699a396c17db668fec3f57e35adabc.zip
(modalias_resolve_module) make sure to behave properly on errors in libmodprobe (#3309)
-rw-r--r--NEWS2
-rw-r--r--modalias.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 07844e4..fb6028c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- make sure to behave properly on errors in libmodprobe (#3309)
+
Version 0.11.2 - 18 October 2011, Thierry Vignaud
- adapt to new module-init-tools-3.16's API
diff --git a/modalias.c b/modalias.c
index 2d17135..a235c09 100644
--- a/modalias.c
+++ b/modalias.c
@@ -82,7 +82,7 @@ char *modalias_resolve_module(const char *modalias) {
/* Returns the resolved alias, options */
parse_toplevel_config(NULL, &conf, 0, 0);
- errfn_t error;
+ errfn_t error = mod_warn;
aliases = find_matching_aliases(modalias, "", &conf, dirname, error, mit_dry_run, &list);
/* only load blacklisted modules with specific request (no alias) */