diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-25 12:52:48 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-25 12:52:48 +0000 |
| commit | a23a88c8822def3a025fde613631b67191ea9ae0 (patch) | |
| tree | 8f52ea07a65ee949c88d9d0d98cbbb438f926229 /usr/src/lib/libscf | |
| parent | 540be08e437ce290999b29a244386a4283dca907 (diff) | |
| parent | 6a1a5bb98a625f9f7115565ac77e5c4170a030cc (diff) | |
| download | illumos-joyent-a23a88c8822def3a025fde613631b67191ea9ae0.tar.gz | |
[illumos-gate merge]
commit 6a1a5bb98a625f9f7115565ac77e5c4170a030cc
10133 smatch fixes for usr/src/cmd/fs.d
commit 86fec011b9215dec3869eac1fc39dc1aa9307340
10414 loader: move libzfs to libstand and clean up Makefiles
commit eef4f27b270242808b43b4b23bd161df52839361
8928 Want open source bnx
commit 57aea9348dbfeb813b16956eec292357525e2f66
10429 loader: dereferencing type-punned pointer will break strict-aliasing rules
commit 54bc10fe6ad8a64fc279dc5fba56eaafea7ec2c0
10421 bofi: cast between incompatible function types
commit 4bf63a956d4991cc5b0ead02fdea0b65bad10e78
10428 loader: really fix cd9660 dirmatch
commit f18d8787c0ba765f61b003e2aae78db90b48f833
7928 Add support for SMF_EXIT_NODAEMON
Conflicts:
usr/src/cmd/svc/startd/method.c
usr/src/cmd/nscd/svc-nscd
usr/src/cmd/dlmgmtd/svc-dlmgmtd
exception_lists/cstyle
Diffstat (limited to 'usr/src/lib/libscf')
| -rw-r--r-- | usr/src/lib/libscf/inc/libscf.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/lib/libscf/inc/libscf.h b/usr/src/lib/libscf/inc/libscf.h index f4502b7f14..adc7455622 100644 --- a/usr/src/lib/libscf/inc/libscf.h +++ b/usr/src/lib/libscf/inc/libscf.h @@ -23,6 +23,7 @@ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright 2016 RackTop Systems. + * Copyright (c) 2012, Joyent, Inc. All rights reserved. */ #ifndef _LIBSCF_H @@ -340,7 +341,7 @@ typedef struct { #define SCF_PROPERTY_GROUP "group" #define SCF_PROPERTY_GROUPING "grouping" #define SCF_PROPERTY_IGNORE "ignore_error" -#define SCF_PROPERTY_INTERNAL_SEPARATORS "internal_separators" +#define SCF_PROPERTY_INTERNAL_SEPARATORS "internal_separators" #define SCF_PROPERTY_LIMIT_PRIVILEGES "limit_privileges" #define SCF_PROPERTY_MAINT_OFF "maint_off" #define SCF_PROPERTY_MAINT_ON "maint_on" @@ -390,7 +391,7 @@ typedef struct { #define SCF_PROPERTY_TM_CHOICES_NAME "choices_name" #define SCF_PROPERTY_TM_CHOICES_RANGE "choices_range" #define SCF_PROPERTY_TM_CONSTRAINT_NAME "constraint_name" -#define SCF_PROPERTY_TM_CONSTRAINT_RANGE "constraint_range" +#define SCF_PROPERTY_TM_CONSTRAINT_RANGE "constraint_range" #define SCF_PROPERTY_TM_MANPATH "manpath" #define SCF_PROPERTY_TM_NAME "name" #define SCF_PROPERTY_TM_PG_PATTERN "pg_pattern" |