Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle Adapter Type 53 and Undefined Types #56337

Merged
merged 3 commits into from
Mar 11, 2020

Conversation

twangboy
Copy link
Contributor

@twangboy twangboy commented Mar 9, 2020

What does this PR do?

Adds support for NetworkAdapterType 53. Also, if the NetworkAdapterType isn't in the Enumerated list of defined adapter types, use the adapter description instead of stack tracing.

What issues does this PR fix or reference?

#56196
#56275
#56465

Previous Behavior

The NetworkInterfaceType enumeration from Microsoft doesn't include adapter type 53. The OpenVPN Tap interface returns a NetworkInterfaceType of 53, causing the util to stack trace and the minion not to start.

New Behavior

NetworkInterfaceType 53 now resolves to TAPAdapter. Since AdapterType 53 may be an arbitrary number created by the OpenVPN driver it is arguable that other vendors may not use the same number. In which case the description will be used as the type.

Tests written?

Yes

Commits signed with GPG?

Yes

@twangboy twangboy requested a review from a team as a code owner March 9, 2020 22:56
@ghost ghost requested a review from Ch3LL March 9, 2020 22:57
@twangboy twangboy added v3000.1 vulnerable version Regression The issue is a bug that breaks functionality known to work in previous releases. severity-critical top severity, seen by most users, serious issues Merge Ready and removed Regression The issue is a bug that breaks functionality known to work in previous releases. labels Mar 9, 2020
@dwoz dwoz merged commit 8f23706 into saltstack:master Mar 11, 2020
@twangboy twangboy deleted the fix_win_network_type branch May 26, 2020 19:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
severity-critical top severity, seen by most users, serious issues v3000.1 vulnerable version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants