Do not return error from -i when no interfaces are configured #17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rsmarples
reviewed
Apr 12, 2023
resolvconf.in
Outdated
| @@ -444,6 +444,7 @@ list_resolv() | |||
| list= | |||
| report=false | |||
| retval=0 | |||
| pattern_specified="$1" | |||
There was a problem hiding this comment.
This should appear after the shift above as that's where the parameters to variables assignment happens.
Maybe add some whitespace between the non parameter assignments too.
hramrach
force-pushed
the
master
branch
2 times, most recently
from
5b2d85a
to
7d618c2
Compare
rsmarples
reviewed
Apr 21, 2023
resolvconf.in
Outdated
| @@ -523,7 +525,8 @@ list_resolv() | |||
| fi | |||
|
|
|||
| cd "$IFACEDIR" | |||
| retval=1 | |||
| retval=0 | |||
| [ -n "$pattern_specified" ] && retval=1 | |||
There was a problem hiding this comment.
I think this needs to be more clear as to the intent.
Can you change this to somthing like this please?
# Return an error only if we have a pattern to match with no results
if [ -n "pattern_specified" ]; then
retval=1
else
retval=0
fi
This also reduces the number of assignments on the more common path of supplying a pattern.
The -i and -l options have an optional pattern argument, and it makes sense to return an error when the pattern does not match. However, when no pattern is specified and no interface is configured an error is returned as well. This makes it problematic to detect if -i option is supported - an error is returned both when the option is not supported by other resolvconf implementation, and when there are no interfaces configured in openresolv. Signed-off-by: Michal Suchanek <[email protected]>
|
Thanks for the patch! |
rsmarples
added a commit
that referenced
this pull request
May 23, 2023
Fixes a regression introduced in #17 which in turn broke the main operationm of resolvconf. I should have tested this better.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thhe -i and -l options have an optional pattern argument, and it makes sense to return an error when the pattern does not match.
However, when no pattern is specified and no interface is configured an error is returned as well.
This makes it problematic to detect if -i option is supported - an error is returned both when the option is not supported by other resolvconf implementation, and when there are no interfaces configured in openresolv.