diff options
| author | Toomas Soome <tsoome@me.com> | 2019-01-22 13:00:26 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-07-03 22:49:16 +0300 |
| commit | 6afa3d1d6776a3db46447deaa893bd35c9b53c0a (patch) | |
| tree | 37ed0f01ec92122af2416ed4648ccd5796dd7fcb /usr/src | |
| parent | c3e74f84d7edf7b5144c2401d7fefd666a92e6c0 (diff) | |
| download | illumos-joyent-6afa3d1d6776a3db46447deaa893bd35c9b53c0a.tar.gz | |
11147 libinetsvc: NULL pointer errrors
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/libinetsvc/common/inetsvc.c | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/usr/src/lib/libinetsvc/common/inetsvc.c b/usr/src/lib/libinetsvc/common/inetsvc.c index b58557d03f..6c688c0c11 100644 --- a/usr/src/lib/libinetsvc/common/inetsvc.c +++ b/usr/src/lib/libinetsvc/common/inetsvc.c @@ -59,51 +59,51 @@ static inetd_prop_t inetd_properties[] = { {PR_SVC_NAME_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_STRING, - B_FALSE, IVE_UNSET, NULL, B_FALSE}, + B_FALSE, IVE_UNSET, 0, B_FALSE}, {PR_SOCK_TYPE_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_STRING, - B_FALSE, IVE_UNSET, NULL, B_FALSE}, + B_FALSE, IVE_UNSET, 0, B_FALSE}, {PR_PROTO_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_STRING_LIST, - B_FALSE, IVE_UNSET, NULL, B_FALSE}, + B_FALSE, IVE_UNSET, 0, B_FALSE}, {PR_ISRPC_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_BOOLEAN, - B_FALSE, IVE_UNSET, NULL, B_FALSE}, + B_FALSE, IVE_UNSET, 0, B_FALSE}, {PR_RPC_LW_VER_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_INTEGER, - B_FALSE, IVE_UNSET, NULL, B_FALSE}, + B_FALSE, IVE_UNSET, 0, B_FALSE}, {PR_RPC_HI_VER_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_INTEGER, - B_FALSE, IVE_UNSET, NULL, B_FALSE}, + B_FALSE, IVE_UNSET, 0, B_FALSE}, {PR_ISWAIT_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_BOOLEAN, - B_FALSE, IVE_UNSET, NULL, B_FALSE}, + B_FALSE, IVE_UNSET, 0, B_FALSE}, {PR_EXEC_NAME, START_METHOD_NAME, INET_TYPE_STRING, - B_FALSE, IVE_UNSET, NULL, B_FALSE}, + B_FALSE, IVE_UNSET, 0, B_FALSE}, {PR_ARG0_NAME, START_METHOD_NAME, INET_TYPE_STRING, - B_FALSE, IVE_UNSET, NULL, B_FALSE}, + B_FALSE, IVE_UNSET, 0, B_FALSE}, {PR_USER_NAME, START_METHOD_NAME, INET_TYPE_STRING, - B_FALSE, IVE_UNSET, NULL, B_FALSE}, + B_FALSE, IVE_UNSET, 0, B_FALSE}, {PR_BIND_ADDR_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_STRING, - B_TRUE, IVE_UNSET, NULL, B_FALSE}, + B_TRUE, IVE_UNSET, 0, B_FALSE}, {PR_BIND_FAIL_MAX_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_INTEGER, - B_TRUE, IVE_UNSET, NULL, B_FALSE}, + B_TRUE, IVE_UNSET, 0, B_FALSE}, {PR_BIND_FAIL_INTVL_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_INTEGER, - B_TRUE, IVE_UNSET, NULL, B_FALSE}, + B_TRUE, IVE_UNSET, 0, B_FALSE}, {PR_CON_RATE_MAX_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_INTEGER, - B_TRUE, IVE_UNSET, NULL, B_FALSE}, + B_TRUE, IVE_UNSET, 0, B_FALSE}, {PR_MAX_COPIES_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_INTEGER, - B_TRUE, IVE_UNSET, NULL, B_FALSE}, + B_TRUE, IVE_UNSET, 0, B_FALSE}, {PR_CON_RATE_OFFLINE_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_INTEGER, - B_TRUE, IVE_UNSET, NULL, B_FALSE}, + B_TRUE, IVE_UNSET, 0, B_FALSE}, {PR_MAX_FAIL_RATE_CNT_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_INTEGER, - B_TRUE, IVE_UNSET, NULL, B_FALSE}, + B_TRUE, IVE_UNSET, 0, B_FALSE}, {PR_MAX_FAIL_RATE_INTVL_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_INTEGER, - B_TRUE, IVE_UNSET, NULL, B_FALSE}, + B_TRUE, IVE_UNSET, 0, B_FALSE}, {PR_INHERIT_ENV_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_BOOLEAN, - B_TRUE, IVE_UNSET, NULL, B_FALSE}, + B_TRUE, IVE_UNSET, 0, B_FALSE}, {PR_DO_TCP_TRACE_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_BOOLEAN, - B_TRUE, IVE_UNSET, NULL, B_FALSE}, + B_TRUE, IVE_UNSET, 0, B_FALSE}, {PR_DO_TCP_WRAPPERS_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_BOOLEAN, - B_TRUE, IVE_UNSET, NULL, B_FALSE}, + B_TRUE, IVE_UNSET, 0, B_FALSE}, {PR_CONNECTION_BACKLOG_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_INTEGER, - B_TRUE, IVE_UNSET, NULL, B_FALSE}, + B_TRUE, IVE_UNSET, 0, B_FALSE}, {PR_DO_TCP_KEEPALIVE_NAME, PG_NAME_SERVICE_CONFIG, INET_TYPE_BOOLEAN, - B_TRUE, IVE_UNSET, NULL, B_FALSE}, + B_TRUE, IVE_UNSET, 0, B_FALSE}, {NULL}, }; @@ -1617,7 +1617,8 @@ dg_template(void (*cb)(int, const struct sockaddr *, int, const void *, size_t), */ int safe_sendto_write(int fd, const void *buf, size_t sz, int flags, - const struct sockaddr *to, int tolen) { + const struct sockaddr *to, int tolen) +{ size_t cnt = 0; ssize_t ret; @@ -1639,7 +1640,8 @@ safe_sendto_write(int fd, const void *buf, size_t sz, int flags, int safe_sendto(int fd, const void *buf, size_t sz, int flags, - const struct sockaddr *to, int tolen) { + const struct sockaddr *to, int tolen) +{ return (safe_sendto_write(fd, buf, sz, flags, to, tolen)); } |