Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
base
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
puppetpublic
base
Commits
33b10dfa
Verified
Commit
33b10dfa
authored
7 years ago
by
Adam Lewenberg
Browse files
Options
Downloads
Patches
Plain Diff
fix some whitespace issues in /etc/pam.d/sshd
parent
e59e41a2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
NEWS
+2
-1
2 additions, 1 deletion
NEWS
templates/ssh/etc/pam.d/sshd.erb
+6
-6
6 additions, 6 deletions
templates/ssh/etc/pam.d/sshd.erb
with
8 additions
and
7 deletions
NEWS
+
2
−
1
View file @
33b10dfa
...
...
@@ -3,7 +3,8 @@ unreleased (207x-xx-xx)
[ssh] Change interface parameter. The parameter
base::ssh::extra_gssapi_only_users has been renamed to
base::ssh::extra_skip_duo_users to more accurately reflect what this
parameter does. [adamhl]
parameter does. Also, fix some whitespace messiness in
/etc/pam.d/sshd [adamhl]
release/005.010 (2017-10-02)
...
...
This diff is collapsed.
Click to expand it.
templates/ssh/etc/pam.d/sshd.erb
+
6
−
6
View file @
33b10dfa
...
...
@@ -9,16 +9,16 @@
# credential), then "jump over" the pam_duo module to step 3. If not,
# go to the next module in the stack (2).
# 2. If the user is _not_ root, require Duo.
<%
if
@pam_afs
%>
# 3. Set up the AFS session and then, whether the AFS sess
s
ion setup works
# or not, quit the pam stack
<%
end
%>
<%
-
if
@pam_afs
-
%>
# 3. Set up the AFS session and then, whether the AFS session setup works
# or not, quit the pam stack
.
<%
-
end
-
%>
auth [success=1 default=ignore] pam_succeed_if.so uid eq 0
auth required pam_duo.so conf=/etc/security/pam_duo_ssh.conf
<%
if
@pam_afs
%>
<%
-
if
@pam_afs
-
%>
auth [success=done default=die] pam_afs_session.so
<%
end
%>
<%
-
end
-
%>
##############################################################################
# account
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment