NAS-133586 / 25.04 / Fix domain join in Samba 4.21 #15402
+72
−85
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
Various winbind / libads parameters and commands changed in samba 4.21 and so we need to adjust.
bugclerk
changed the title
bmeagherix
approved these changes
Jan 15, 2025
| 'Failed to set spn entry: ' | ||
| f'{netads.stdout.decode().strip()}' | ||
| ) | ||
| def _ad_set_spn(self, netbiosname, domainname): |
There was a problem hiding this comment.
Should this be renamed to _ad_set_nfs_spns ?
mgrimesix
reviewed
Jan 15, 2025
| f"{SAMBA_KEYTAB_DIR}/krb5.keytab0:account_name:sync_kvno:machine_password", | ||
| f"{SAMBA_KEYTAB_DIR}/krb5.keytab1:sync_spns:sync_kvno:machine_password", | ||
| f"{SAMBA_KEYTAB_DIR}/krb5.keytab2:spn_prefixes=nfs:sync_kvno:machine_password" | ||
| ) | ||
|
|
||
| class TrueNASVfsObjects(enum.StrEnum): |
There was a problem hiding this comment.
The obligatory flake8 comment: Need an extra blank line between AD_KEYTABS_PARAMS and class TrueNASVfsObjects
mgrimesix
reviewed
Jan 15, 2025
| @@ -108,6 +109,15 @@ def __tmp_krb5_keytab() -> str: | |||
| return tmpfile.name | |||
|
|
|||
|
|
|||
| @contextmanager | |||
| def temporary_keytab() -> str: | |||
There was a problem hiding this comment.
Flake8 doesn't like the str as a return type:
Return type of generator function must be compatible with "Generator[Any, Any, Any]" "Generator[Any, Any, Any]" is not assignable to "str"
mgrimesix
approved these changes
Jan 15, 2025
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.
Various winbind / libads parameters and commands changed in samba 4.21 and so we need to adjust.