Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/registry/registry_internals.c b/src/registry/registry_internals.c
index 54fad4254..51a861866 100644
--- a/src/registry/registry_internals.c
+++ b/src/registry/registry_internals.c
@@ -266,7 +266,7 @@ static inline int is_machine_guid_blacklisted(const char *guid) {
     return 0;
 }
 
-char *registry_get_this_machine_hostname(void) {
+const char *registry_get_this_machine_hostname(void) {
     return registry.hostname;
 }
 
@@ -315,7 +315,7 @@ const char *registry_get_this_machine_guid(void) {
         close(fd);
     }
 
-    setenv("NETDATA_REGISTRY_UNIQUE_ID", guid, 1);
+    nd_setenv("NETDATA_REGISTRY_UNIQUE_ID", guid, 1);
 
     return guid;
 }