diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-12-06 13:17:55 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-12-06 13:17:55 +0000 |
| commit | 693cf0515372e6ad7fd1a58eaa9fc7d5ad4823cb (patch) | |
| tree | e4b36183157ac3a73d7249d008d82a825ce8725b /usr/src/lib | |
| parent | b3bd764962b86d7c9b6cb4939d04a3bde0ca6519 (diff) | |
| parent | a949e73d2676619263a21aaaaea30669bfcc27a1 (diff) | |
| download | illumos-joyent-693cf0515372e6ad7fd1a58eaa9fc7d5ad4823cb.tar.gz | |
[illumos-gate merge]
commit a949e73d2676619263a21aaaaea30669bfcc27a1
10019 libsldap: macro expands to multiple statements
commit a50e8766452bf989ab5da8c51bb857190e7a18c9
10018 libkmf: macro expands to multiple statements
commit fa79a855d371dfcb29461ad6ebaf48a458bf9f14
10017 libilb: macro expands to multiple statements
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/libilb/common/ilb_sg.c | 5 | ||||
| -rw-r--r-- | usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c | 3 | ||||
| -rw-r--r-- | usr/src/lib/libkmf/plugins/kmf_pkcs11/common/pkcs11_spi.c | 3 | ||||
| -rw-r--r-- | usr/src/lib/libsldap/common/ns_reads.c | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/usr/src/lib/libilb/common/ilb_sg.c b/usr/src/lib/libilb/common/ilb_sg.c index 62990f0f09..bd59b9dc7f 100644 --- a/usr/src/lib/libilb/common/ilb_sg.c +++ b/usr/src/lib/libilb/common/ilb_sg.c @@ -423,11 +423,12 @@ i_ilb_fillin_srvdata(ilb_handle_t h, ilb_server_data_t *srv, const char *sgname, sgs = &sg_info->sg_servers[0]; - if (cmd == ILBD_SRV_ID2ADDR) + if (cmd == ILBD_SRV_ID2ADDR) { (void) strlcpy(sgs->sgs_srvID, srv->sd_srvID, sizeof (sgs->sgs_srvID)); - else + } else { IP_COPY_CLI_2_IMPL(&srv->sd_addr, &sgs->sgs_addr); + } rc = i_ilb_do_comm(h, ic, ic_sz, rbuf, &rbufsz); if (rc != ILB_STATUS_OK) diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c b/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c index 1faa4bea34..f014d5b2be 100644 --- a/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c +++ b/usr/src/lib/libkmf/plugins/kmf_openssl/common/openssl_spi.c @@ -1033,8 +1033,9 @@ openssl_load_key(KMF_HANDLE_T handle, const char *file) } end: - if (pkey == NULL) + if (pkey == NULL) { SET_ERROR(kmfh, ERR_get_error()); + } if (keyfile != NULL) (void) BIO_free(keyfile); diff --git a/usr/src/lib/libkmf/plugins/kmf_pkcs11/common/pkcs11_spi.c b/usr/src/lib/libkmf/plugins/kmf_pkcs11/common/pkcs11_spi.c index e36085ad03..bab6957c45 100644 --- a/usr/src/lib/libkmf/plugins/kmf_pkcs11/common/pkcs11_spi.c +++ b/usr/src/lib/libkmf/plugins/kmf_pkcs11/common/pkcs11_spi.c @@ -3245,8 +3245,9 @@ store_raw_key(KMF_HANDLE_T handle, SETATTR(templ, i, CKA_KEY_TYPE, &keytype, sizeof (keytype)); i++; SETATTR(templ, i, CKA_TOKEN, &cktrue, sizeof (cktrue)); i++; SETATTR(templ, i, CKA_PRIVATE, &cktrue, sizeof (cktrue)); i++; - if (keytype != CKK_EC) + if (keytype != CKK_EC) { SETATTR(templ, i, CKA_DECRYPT, &cktrue, sizeof (cktrue)); i++; + } cert = kmf_get_attr_ptr(KMF_CERT_DATA_ATTR, attrlist, numattr); if (cert != NULL) { diff --git a/usr/src/lib/libsldap/common/ns_reads.c b/usr/src/lib/libsldap/common/ns_reads.c index 61a59e16db..726aea2bc1 100644 --- a/usr/src/lib/libsldap/common/ns_reads.c +++ b/usr/src/lib/libsldap/common/ns_reads.c @@ -1360,10 +1360,11 @@ get_mapped_filter(ns_ldap_cookie_t *cookie, char **new_filter) "'%s' not allowed."), info[i]->from_name, filter); err = strdup(errstr); - if (err) + if (err) { MKERROR(LOG_WARNING, cookie->errorp, NS_CONFIG_SYNTAX, err, NULL); + } free(filter_c); for (j = 0; j < num_veq; j++) { |