[v9] Re-add PAM build tag back to tctl build
#12572
Merged
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
espadolini
approved these changes
May 11, 2022
webvictim
approved these changes
May 11, 2022
| @@ -198,7 +198,7 @@ all: version | |||
| # If you are considering changing this behavior, please consult with dev team first | |||
| .PHONY: $(BUILDDIR)/tctl | |||
| $(BUILDDIR)/tctl: roletester | |||
| GOOS=$(OS) GOARCH=$(ARCH) $(CGOFLAG) go build -tags "$(FIPS_TAG) $(ROLETESTER_TAG)" -o $(BUILDDIR)/tctl $(BUILDFLAGS) ./tool/tctl | |||
| GOOS=$(OS) GOARCH=$(ARCH) $(CGOFLAG) go build -tags "$(PAM_TAG) $(FIPS_TAG) $(ROLETESTER_TAG)" -o $(BUILDDIR)/tctl $(BUILDFLAGS) ./tool/tctl | |||
There was a problem hiding this comment.
It looks like this was inadvertently removed during the big spree of merges for Teleport Connect. I'd add a comment above this line explaining why PAM needs to be enabled for tctl (as it seems like it'd be totally unrelated) just to prevent someone from doing this again.
There was a problem hiding this comment.
Well, more mistakenly than inadvertently I'd say 😏 But I agree that a comment here explaining why it's needed is a good idea.
There was a problem hiding this comment.
I was giving you the benefit of the doubt ;)
ravicious
approved these changes
May 11, 2022
Closed
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.
Backport #12570 to branch/v9