diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-19 12:18:51 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-19 12:18:51 +0000 |
| commit | 6040a68c1ef27209fe7cd5dfd799ddfa5f11a701 (patch) | |
| tree | 5ac8fef7a57586e8ebcbfe6013e47a96f9f26ce2 /usr/src/lib/libsecdb | |
| parent | 4227bcffd4e1abf8a3987dbe0f649d7cc7ea4940 (diff) | |
| parent | ae7ff7d6ac239648a2579a0de5a0a1be3d4e10e6 (diff) | |
| download | illumos-joyent-6040a68c1ef27209fe7cd5dfd799ddfa5f11a701.tar.gz | |
[illumos-gate merge]
commit ae7ff7d6ac239648a2579a0de5a0a1be3d4e10e6
11118 libhotplug: NULL pointer errors
commit dd6458550ab2996163712b25c080615392bf94d2
11117 libzfs_core: NULL pointer errors
commit 281eb3a97ad0e298603325ba7c56d0222aaa5ac3
11114 libsecdb: NULL pointer errors
commit d5fa36a7366530f78b3c5d1cd4c4a40085383b9f
11110 crle: NULL pointer errors
commit e2294b844b9f4bfc375e88fd1260d9a39ffc82e1
11103 link_audit: NULL pointer errors
commit 430c2cddc92582fc7155aaf65c78f0919d7081c1
6474 getupeercred causes spurious event port wakeups on FIFOs
commit 5f5c35baa7f18214d2cd9ec105270892288f8497
11100 liblddbg: NULL pointer errors
commit 344db6f401efe76f7e1d4f4c1a644ae593910219
11092 libnsl: NULL pointer errors
commit e86c3f00315e5838c0ec0b14f34b94c292085956
11091 libc: NULL pointer errors
commit ad24f9fb30ac1431734347d46a592d22cbfcf3b6
11081 liblddbg: comparison between pointer and integer
commit 0362cabb4921eb6283a19fb680876f50907fda08
11115 libdisasm: NULL pointer errors
commit 9a34674dce796d46567833216389d6d430925bb2
11182 loader: Distinguish between "no partition" and "choose best partition" with a constant.
commit a8412dc108558a7a3635b7ab4f3b1b743bdff9e8
11074 loader: mod_loadkld() error: we previously assumed 'last_file' could be null
commit 535ff4fc926c4df67c4665a72c71724810962d4f
11047 zmod: make sure we use zmemcpy and friends
commit e207f0de2012ff5024160daa7e6e3cf11d04f2dc
11111 lex: NULL pointer errors
Diffstat (limited to 'usr/src/lib/libsecdb')
| -rw-r--r-- | usr/src/lib/libsecdb/common/chkauthattr.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/libsecdb/common/secdb.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/lib/libsecdb/common/chkauthattr.c b/usr/src/lib/libsecdb/common/chkauthattr.c index e76db0af24..b3c830374a 100644 --- a/usr/src/lib/libsecdb/common/chkauthattr.c +++ b/usr/src/lib/libsecdb/common/chkauthattr.c @@ -99,7 +99,7 @@ _enum_common_p(const char *cprofiles, if (cprofiles == NULL) return (0); - if (*pcnt > 0 && strcmp(profs[*pcnt - 1], PROFILE_STOP) == NULL) + if (*pcnt > 0 && strcmp(profs[*pcnt - 1], PROFILE_STOP) == 0) return (0); COPYTOSTACK(profiles, cprofiles) @@ -333,7 +333,7 @@ _auth_match_noun(const char *pattern, const char *auth, if (strncmp(pattern, auth, pattern_len - 1) == 0) { grant = strrchr(auth, '.'); if (grant != NULL) { - if (strncmp(grant + 1, "grant", 5) != NULL) + if (strncmp(grant + 1, "grant", 5) != 0) return (1); } } diff --git a/usr/src/lib/libsecdb/common/secdb.c b/usr/src/lib/libsecdb/common/secdb.c index e012d95ce0..7378ce11f4 100644 --- a/usr/src/lib/libsecdb/common/secdb.c +++ b/usr/src/lib/libsecdb/common/secdb.c @@ -257,7 +257,7 @@ _kva_dup(kva_t *old_kva) int size; kv_t *old_data; kv_t *new_data; - kva_t *nkva = NULL; + kva_t *nkva = NULL; if (old_kva == NULL) { return (NULL); @@ -339,7 +339,7 @@ _argv_to_csl(char **strings) (void) strcat(newstr, strings[i]); (void) strcat(newstr, ","); } - newstr[len-1] = NULL; + newstr[len-1] = '\0'; return (newstr); } else return (NULL); |