projects
/
freeradius.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4054756
)
Documentation
author
Arran Cudbard-Bell
<a.cudbardb@freeradius.org>
Tue, 3 Mar 2015 18:03:15 +0000
(13:03 -0500)
committer
Arran Cudbard-Bell
<a.cudbardb@freeradius.org>
Tue, 3 Mar 2015 18:53:30 +0000
(13:53 -0500)
src/main/conffile.c
patch
|
blob
|
history
diff --git
a/src/main/conffile.c
b/src/main/conffile.c
index
b051106
..
e05423e
100644
(file)
--- a/
src/main/conffile.c
+++ b/
src/main/conffile.c
@@
-1129,11
+1129,18
@@
int cf_item_parse(CONF_SECTION *cs, char const *name, unsigned int type, void *d
rcode = 0;
cp = cf_pair_find(cs, name);
- if (cp) {
- value = cp->value;
- } else {
+ /*
+ * No pairs match the configuration item name in the current
+ * section, use the default value.
+ */
+ if (!cp) {
rcode = 1;
value = dflt;
+ /*
+ * Something matched, used the CONF_PAIR value.
+ */
+ } else {
+ value = cp->value;
}
if (!value) {