Merge branch 'basavesh-master' into fixes

eclipse · Nov 21, 2019 · fc23889 · fc23889
2 parents 3d92dcb + 91961d9
commit fc23889
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 497 deletions.
diff --git a/docker/1.5/Dockerfile b/docker/1.5/Dockerfile
@@ -75,7 +75,7 @@ RUN set -x && \
  install -m644 /build/mosq/mosquitto.conf /mosquitto/config/mosquitto.conf && \
  chown -R mosquitto:mosquitto /mosquitto && \
  apk --no-cache add \
- libuuid ca-certificates && \
+ ca-certificates libuuid && \
  apk del build-deps && \
  rm -rf /build
 

diff --git a/docker/generic/Dockerfile b/docker/generic/Dockerfile
@@ -47,6 +47,7 @@ LABEL maintainer="Jonathan Hanson <[email protected]>" \
 # Install the run-time dependencies
 RUN apk --no-cache add \
  busybox \
+ ca-certificates \
  libcrypto1.0 \
  libssl1.0 \
  libuuid \

diff --git a/lib/mosquitto.h b/lib/mosquitto.h
@@ -633,10 +633,6 @@ libmosq_EXPORT int mosquitto_connect_srv(struct mosquitto *mosq, const char *hos
  * MOSQ_ERR_SUCCESS - on success.
  * MOSQ_ERR_INVAL - if the input parameters were invalid.
  * MOSQ_ERR_NOMEM - if an out of memory condition occurred.
- *
- * Returns:
- * MOSQ_ERR_SUCCESS - on success.
- * MOSQ_ERR_INVAL - if the input parameters were invalid.
  * MOSQ_ERR_ERRNO - if a system call returned an error. The variable errno
  * contains the error code, even on Windows.
  * Use strerror_r() where available or FormatMessage() on
@@ -664,10 +660,6 @@ libmosq_EXPORT int mosquitto_reconnect(struct mosquitto *mosq);
  * MOSQ_ERR_SUCCESS - on success.
  * MOSQ_ERR_INVAL - if the input parameters were invalid.
  * MOSQ_ERR_NOMEM - if an out of memory condition occurred.
- *
- * Returns:
- * MOSQ_ERR_SUCCESS - on success.
- * MOSQ_ERR_INVAL - if the input parameters were invalid.
  * MOSQ_ERR_ERRNO - if a system call returned an error. The variable errno
  * contains the error code, even on Windows.
  * Use strerror_r() where available or FormatMessage() on