diff options
| author | Klaus Ziegler <klausz@haus-gisela.de> | 2021-02-27 10:51:37 +0100 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-03-01 20:34:33 -0500 |
| commit | ba32d0fa40167766c2c4c2a83c7475bd3aed4258 (patch) | |
| tree | 3d905f1bc842df09a7fa0bc41735c4c65e824de6 /usr/src | |
| parent | ae5c3fb759f05e5de586c82b204aabe1e336b578 (diff) | |
| download | illumos-joyent-ba32d0fa40167766c2c4c2a83c7475bd3aed4258.tar.gz | |
13562 zlogin for Solaris10 branded zones does not work after implementation of Feature #13274
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/brand/shared/brand/Makefile.com | 5 | ||||
| -rw-r--r-- | usr/src/lib/brand/solaris10/s10_brand/Makefile.com | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/usr/src/lib/brand/shared/brand/Makefile.com b/usr/src/lib/brand/shared/brand/Makefile.com index 0d5afe31f6..f88ee2a794 100644 --- a/usr/src/lib/brand/shared/brand/Makefile.com +++ b/usr/src/lib/brand/shared/brand/Makefile.com @@ -55,6 +55,11 @@ CPPFLAGS += -D_REENTRANT -U_ASM -I. -I../sys CFLAGS += $(CCVERBOSE) ASFLAGS = -P $(ASFLAGS_$(CURTYPE)) -D_ASM -I. -I../sys +# +# Disable stack protection as this code might be running in an s10 context. +# +STACKPROTECT = none + # intentional code after abort() SMOFF += unreachable diff --git a/usr/src/lib/brand/solaris10/s10_brand/Makefile.com b/usr/src/lib/brand/solaris10/s10_brand/Makefile.com index d4c5e5f683..dd3f0c5d73 100644 --- a/usr/src/lib/brand/solaris10/s10_brand/Makefile.com +++ b/usr/src/lib/brand/solaris10/s10_brand/Makefile.com @@ -84,6 +84,11 @@ DYNFLAGS += $(DYNFLAGS_$(CLASS)) DYNFLAGS += $(BLOCAL) $(ZNOVERSION) -Wl,-e_start LDLIBS += -lmapmalloc -lc +# +# Disable stack protection as we're running in an s10 context. +# +STACKPROTECT = none + CERRWARN += $(CNOWARN_UNINIT) $(LIBS):= PICS += $(SHAREDOBJS) |