diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-02-23 13:11:40 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-02-23 13:11:40 +0000 |
| commit | 8c2ed3e9b7805d10816f461c713c63a8363fa61a (patch) | |
| tree | 5a12eaf4c91c09c7cba55c06de0cebd1ae0867d2 /usr/src/cmd/cron/cron.c | |
| parent | dda1f9a81f5e81013b6df1dd838f8a23774ed0b5 (diff) | |
| parent | 1951a93366b3e52f7c49ec9b2dbfb21bccc56a3e (diff) | |
| download | illumos-joyent-8c2ed3e9b7805d10816f461c713c63a8363fa61a.tar.gz | |
[illumos-gate merge]
commit 1951a93366b3e52f7c49ec9b2dbfb21bccc56a3e
7837 smbios3 64-bit entry point support
commit ec2c76eb1d5ecd7a4fccccefc1bc4aa7c1531606
7854 installboot should set MBR to load partition boot block if it was installed
commit 48bbca816818409505a6e214d0911fda44e622e3
7812 Remove gender specific language
commit e40108ff341f07fe03e96c751c6cf2cb5867d1a8
7898 mdb's ::netstat doesn't print UDP conn_t pointer correctly
Conflicts:
usr/src/uts/common/syscall/poll.c
Diffstat (limited to 'usr/src/cmd/cron/cron.c')
| -rw-r--r-- | usr/src/cmd/cron/cron.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/cmd/cron/cron.c b/usr/src/cmd/cron/cron.c index 33a7373f1e..e2c9086536 100644 --- a/usr/src/cmd/cron/cron.c +++ b/usr/src/cmd/cron/cron.c @@ -25,6 +25,7 @@ * Copyright 2013 Joshua M. Clulow <josh@sysmgr.org> * Copyright 2013 Joyent, Inc. All rights reserved. * Copyright (c) 2014 Gary Mills + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -1529,7 +1530,7 @@ next_field(int lower, int upper) * if (numbers in this field are out of range (lower..upper), * or there is a syntax error) then * NULL is returned, and a mail message is sent to the - * user telling him which line the error was in. + * user telling them which line the error was in. */ char *s; @@ -2468,7 +2469,7 @@ ex(struct event *e) } /* - * set correct user identification and check his account + * set correct user identification and check their account */ r = set_user_cred(e->u, pproj); if (r == VUC_EXPIRED) { |