Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
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
Code review analytics
Issue 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
caosdb
Software
caosdb-server
Commits
e7513e59
Commit
e7513e59
authored
4 years ago
by
Henrik tom Wörden
Browse files
Options
Downloads
Patches
Plain Diff
FIX: allow ldap server and domain to be different
parent
0f0e54e1
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
misc/pam_authentication/ldap.conf
+5
-4
5 additions, 4 deletions
misc/pam_authentication/ldap.conf
misc/pam_authentication/ldap_authentication.sh
+1
-1
1 addition, 1 deletion
misc/pam_authentication/ldap_authentication.sh
with
6 additions
and
5 deletions
misc/pam_authentication/ldap.conf
+
5
−
4
View file @
e7513e59
# This file is sourced by the LDAP authentication script
# This file is sourced by the LDAP authentication script
# Set the ldap server here.
# Set the ldap server here. This is also used to generate a fully qualified
# user name: <USER>@$LDAP_SERVER
# LDAP_SERVER="example.com"
# LDAP_SERVER="example.com"
# Set the ldap domain here. This is used to generate a fully qualified
# user name: <USER>@$LDAP_DOMAIN
# LDAP_DOMAIN="example.com"
This diff is collapsed.
Click to expand it.
misc/pam_authentication/ldap_authentication.sh
+
1
−
1
View file @
e7513e59
...
@@ -35,7 +35,7 @@ exe_dir=$(dirname $0)
...
@@ -35,7 +35,7 @@ exe_dir=$(dirname $0)
# If the second argument is empty or "-", take password from stdin, else use the argument as a file.
# If the second argument is empty or "-", take password from stdin, else use the argument as a file.
testpw
()
{
testpw
()
{
username
=
"
${
1
}
@
${
LDAP_
SERVER
}
"
username
=
"
${
1
}
@
${
LDAP_
DOMAIN
}
"
pwfile
=
"
$2
"
pwfile
=
"
$2
"
pwargs
=(
"-w"
"
$pwfile
"
)
pwargs
=(
"-w"
"
$pwfile
"
)
if
[[
$pwfile
==
"-"
]]
;
then
if
[[
$pwfile
==
"-"
]]
;
then
...
...
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