diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-11 13:13:38 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-11 13:13:38 +0000 |
| commit | cbabb52cbef55dc12ac62bb5e5da7cc02cf114d2 (patch) | |
| tree | 9b95d76ec1eaca7a5112c582f7f176891a918e1c /usr/src/cmd/cmd-inet | |
| parent | e790b92538e616017d45a87be045bccb1a3c8758 (diff) | |
| parent | 36ac8d7d925ed80286cf13327142ca1fa6943fc3 (diff) | |
| download | illumos-joyent-cbabb52cbef55dc12ac62bb5e5da7cc02cf114d2.tar.gz | |
[illumos-gate merge]
commit 36ac8d7d925ed80286cf13327142ca1fa6943fc3
10119 audit(1) gets NULL check wrong
commit dbef1f18aebff7758796283d40875419be721c2b
10510 loader: bios comc_probe() is out of sync with uefi version
commit 7b38fab6300e0a1599b9741cfeafd94d362b87aa
9433 Fix ARC hit rate
commit bc54f855e0de1e590115101c80f152a20722cfb0
10120 smatch indenting fixes for usr/src/cmd
Diffstat (limited to 'usr/src/cmd/cmd-inet')
| -rw-r--r-- | usr/src/cmd/cmd-inet/common/kcmd.c | 11 | ||||
| -rw-r--r-- | usr/src/cmd/cmd-inet/usr.bin/finger.c | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/usr/src/cmd/cmd-inet/common/kcmd.c b/usr/src/cmd/cmd-inet/common/kcmd.c index 35d2c4ee96..c4a078c96a 100644 --- a/usr/src/cmd/cmd-inet/common/kcmd.c +++ b/usr/src/cmd/cmd-inet/common/kcmd.c @@ -20,6 +20,10 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + /* derived from @(#)rcmd.c 5.17 (Berkeley) 6/27/88 */ #include <unistd.h> @@ -412,8 +416,11 @@ kcmd(int *sock, char **ahost, ushort_t rport, *sock = s; /* pass back credentials if wanted */ - if (cred) (void) krb5_copy_creds(bsd_context, ret_cred, cred); - krb5_free_creds(bsd_context, ret_cred); + if (cred) + (void) krb5_copy_creds(bsd_context, ret_cred, cred); + + krb5_free_creds(bsd_context, ret_cred); + /* * Initialize *authconp to auth_context, so * that the clients can make use of it diff --git a/usr/src/cmd/cmd-inet/usr.bin/finger.c b/usr/src/cmd/cmd-inet/usr.bin/finger.c index cdc94a7be6..d42d90eacf 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/finger.c +++ b/usr/src/cmd/cmd-inet/usr.bin/finger.c @@ -38,6 +38,10 @@ */ /* + * Copyright (c) 2018, Joyent, Inc. + */ + +/* * This is a finger program. It prints out useful information about users * by digging it up from various system files. * @@ -1359,7 +1363,7 @@ AlreadyPrinted(uid_t uid) while (i++ < PPIndex) { if (PlanPrinted[i] == uid) - return (1); + return (1); } if (i < PPMAX) { PlanPrinted[i] = uid; |