diff options
| author | Gordon Ross <gwr@nexenta.com> | 2017-05-05 18:21:42 -0400 |
|---|---|---|
| committer | Gordon Ross <gwr@nexenta.com> | 2017-07-20 21:56:50 -0400 |
| commit | 82584a069e2e3824df112a1249fa7818c01f9d49 (patch) | |
| tree | 70290efad5097368f59aeda49a2806241340c73c /usr/src | |
| parent | e72ff08d3b44e4e2f89e0ec84680f40062be00d5 (diff) | |
| download | illumos-gate-82584a069e2e3824df112a1249fa7818c01f9d49.tar.gz | |
7287 smb pam module not picking up libsmb from proto area (fix LDLIBS order)
Reviewed by: Andrew Stormont <astormont@racktopsystems.com
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/pam_modules/smb/Makefile.com | 4 | ||||
| -rw-r--r-- | usr/src/lib/pam_modules/smb/amd64/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/lib/pam_modules/smb/i386/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/lib/pam_modules/smb/sparc/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/lib/pam_modules/smb/sparcv9/Makefile | 1 |
5 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/lib/pam_modules/smb/Makefile.com b/usr/src/lib/pam_modules/smb/Makefile.com index 518564ca79..2a461d53bc 100644 --- a/usr/src/lib/pam_modules/smb/Makefile.com +++ b/usr/src/lib/pam_modules/smb/Makefile.com @@ -32,6 +32,10 @@ OBJECTS= smb_passwd.o include ../../Makefile.pam_modules +# These are in LDLIBS32/64 so they come before -lsmb +LDLIBS32 += -L$(ROOT)/usr/lib/smbsrv +LDLIBS64 += -L$(ROOT)/usr/lib/smbsrv/$(MACH64) + LDLIBS += -lsmb -lpam -lc all: $(LIBS) diff --git a/usr/src/lib/pam_modules/smb/amd64/Makefile b/usr/src/lib/pam_modules/smb/amd64/Makefile index d2d77bfc78..9b4eadce04 100644 --- a/usr/src/lib/pam_modules/smb/amd64/Makefile +++ b/usr/src/lib/pam_modules/smb/amd64/Makefile @@ -29,7 +29,6 @@ include ../Makefile.com include ../../../Makefile.lib.64 -LDLIBS += -L$(ROOT)/usr/lib/smbsrv/$(MACH64) DYNFLAGS += -R/usr/lib/smbsrv/$(MACH64) DYNFLAGS += $(ROOT)/usr/lib/$(MACH64)/passwdutil.so.1 diff --git a/usr/src/lib/pam_modules/smb/i386/Makefile b/usr/src/lib/pam_modules/smb/i386/Makefile index fefb0fc549..f4af79c32e 100644 --- a/usr/src/lib/pam_modules/smb/i386/Makefile +++ b/usr/src/lib/pam_modules/smb/i386/Makefile @@ -28,7 +28,6 @@ include ../Makefile.com -LDLIBS += -L$(ROOT)/usr/lib/smbsrv DYNFLAGS += -R/usr/lib/smbsrv DYNFLAGS += $(ROOT)/usr/lib/passwdutil.so.1 diff --git a/usr/src/lib/pam_modules/smb/sparc/Makefile b/usr/src/lib/pam_modules/smb/sparc/Makefile index fefb0fc549..f4af79c32e 100644 --- a/usr/src/lib/pam_modules/smb/sparc/Makefile +++ b/usr/src/lib/pam_modules/smb/sparc/Makefile @@ -28,7 +28,6 @@ include ../Makefile.com -LDLIBS += -L$(ROOT)/usr/lib/smbsrv DYNFLAGS += -R/usr/lib/smbsrv DYNFLAGS += $(ROOT)/usr/lib/passwdutil.so.1 diff --git a/usr/src/lib/pam_modules/smb/sparcv9/Makefile b/usr/src/lib/pam_modules/smb/sparcv9/Makefile index d2d77bfc78..9b4eadce04 100644 --- a/usr/src/lib/pam_modules/smb/sparcv9/Makefile +++ b/usr/src/lib/pam_modules/smb/sparcv9/Makefile @@ -29,7 +29,6 @@ include ../Makefile.com include ../../../Makefile.lib.64 -LDLIBS += -L$(ROOT)/usr/lib/smbsrv/$(MACH64) DYNFLAGS += -R/usr/lib/smbsrv/$(MACH64) DYNFLAGS += $(ROOT)/usr/lib/$(MACH64)/passwdutil.so.1 |