Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sso
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor 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
ai
sso
Commits
02d83bf6
Commit
02d83bf6
authored
5 years ago
by
ale
Browse files
Options
Downloads
Patches
Plain Diff
Only link to libpam in the pam_sso module
Prevents spurious dependencies in the other libraries.
parent
a81129d4
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure.ac
+6
-1
6 additions, 1 deletion
configure.ac
src/pam_sso/Makefile.am
+2
-2
2 additions, 2 deletions
src/pam_sso/Makefile.am
with
8 additions
and
3 deletions
configure.ac
+
6
−
1
View file @
02d83bf6
...
@@ -59,7 +59,12 @@ AC_ARG_ENABLE(pam-sso,
...
@@ -59,7 +59,12 @@ AC_ARG_ENABLE(pam-sso,
dnl Probe for the functionality of the PAM libraries and their include file
dnl Probe for the functionality of the PAM libraries and their include file
dnl naming. Mac OS X puts them in pam/* instead of security/*.
dnl naming. Mac OS X puts them in pam/* instead of security/*.
if test "$build_pam_sso" != "no" ; then
if test "$build_pam_sso" != "no" ; then
AC_SEARCH_LIBS([pam_set_data], [pam])
dnl Do not add -lpam to LIBS, set PAM_LIBS instead.
save_LIBS="$LIBS"
AC_SEARCH_LIBS([pam_set_data], [pam], [], [
AC_MSG_ERROR([libpam not found])])
LIBS="$save_LIBS"
AC_SUBST(PAM_LIBS, [-lpam])
AC_CHECK_FUNCS([pam_getenv pam_getenvlist pam_modutil_getpwnam])
AC_CHECK_FUNCS([pam_getenv pam_getenvlist pam_modutil_getpwnam])
AC_REPLACE_FUNCS([pam_syslog pam_vsyslog])
AC_REPLACE_FUNCS([pam_syslog pam_vsyslog])
AC_CHECK_HEADERS([security/pam_modutil.h], [],
AC_CHECK_HEADERS([security/pam_modutil.h], [],
...
...
This diff is collapsed.
Click to expand it.
src/pam_sso/Makefile.am
+
2
−
2
View file @
02d83bf6
...
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = pam_sso.la
...
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = pam_sso.la
pam_sso_la_SOURCES
=
\
pam_sso_la_SOURCES
=
\
pam_sso.c pam_sso.h
pam_sso.c pam_sso.h
pam_sso_la_LDFLAGS
=
-module
pam_sso_la_LDFLAGS
=
-module
pam_sso_la_LIBADD
=
$(
top_builddir
)
/src/sso/libsso.la
pam_sso_la_LIBADD
=
$(
PAM_LIBS
)
$(
top_builddir
)
/src/sso/libsso.la
check_PROGRAMS
=
\
check_PROGRAMS
=
\
pam_sso_unittest
pam_sso_unittest
...
@@ -16,6 +16,6 @@ TESTS = $(check_PROGRAMS)
...
@@ -16,6 +16,6 @@ TESTS = $(check_PROGRAMS)
pam_sso_unittest_CPPFLAGS
=
$(
AM_CPPFLAGS
)
$(
GTEST_CPPFLAGS
)
pam_sso_unittest_CPPFLAGS
=
$(
AM_CPPFLAGS
)
$(
GTEST_CPPFLAGS
)
pam_sso_unittest_LDFLAGS
=
$(
AM_LDFLAGS
)
$(
GTEST_LDFLAGS
)
pam_sso_unittest_LDFLAGS
=
$(
AM_LDFLAGS
)
$(
GTEST_LDFLAGS
)
pam_sso_unittest_LDADD
=
$(
GTEST_LIBS
)
\
pam_sso_unittest_LDADD
=
$(
GTEST_LIBS
)
$(
PAM_LIBS
)
\
$(
top_builddir
)
/src/sso/libsso.la
$(
top_builddir
)
/src/sso/libsso.la
pam_sso_unittest_SOURCES
=
pam_sso_unittest.cc
pam_sso_unittest_SOURCES
=
pam_sso_unittest.cc
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