diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-07-20 11:34:31 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-07-20 11:34:31 -0400 |
| commit | 4f1b05c45770d0fbaa922623e9a2e72b2d0ff404 (patch) | |
| tree | d694a07ac8eeef81944b6f6474d7c5159fc6e458 | |
| parent | 39873cb53990e4289691c72f59c37e0743aa7b6c (diff) | |
| parent | 3fa2c5b4960d0046e3080b8f059afab7943d0a1b (diff) | |
| download | illumos-joyent-4f1b05c45770d0fbaa922623e9a2e72b2d0ff404.tar.gz | |
[illumos-gate merge]
commit 3fa2c5b4960d0046e3080b8f059afab7943d0a1b
13955 loader: support.4th resets the read buffer incorrectly
commit 85ee7b00732be2ebee41883d84ee6454eafcb8d4
13944 nsswitch getnetgrent.c build has reset CERRWARN and SMATCH
| -rw-r--r-- | usr/src/boot/sys/boot/forth/support.4th | 2 | ||||
| -rw-r--r-- | usr/src/lib/nsswitch/files/Makefile.com | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/usr/src/boot/sys/boot/forth/support.4th b/usr/src/boot/sys/boot/forth/support.4th index 961d3b528a..50d368ef9f 100644 --- a/usr/src/boot/sys/boot/forth/support.4th +++ b/usr/src/boot/sys/boot/forth/support.4th @@ -538,7 +538,7 @@ variable fd get-current ( -- wid ) previous definitions >search ( wid -- ) : reset_line_reading - 0 to read_buffer_ptr + 0 read_buffer .len ! ; : read_line diff --git a/usr/src/lib/nsswitch/files/Makefile.com b/usr/src/lib/nsswitch/files/Makefile.com index 5b57f6b6ed..504b75d9af 100644 --- a/usr/src/lib/nsswitch/files/Makefile.com +++ b/usr/src/lib/nsswitch/files/Makefile.com @@ -76,6 +76,3 @@ $(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \ $(ROOT)/etc/lib/$(DYNLIB1) := COMPATLINKTARGET= ../../lib/$(DYNLIB1) all: $(DYNLIB1) - -pics/getnetgrent.o := CERRWARN= -pics/getnetgrent.o := SMATCH= |