From 9305cf0f9f5230c93a76593d567307324333360b Mon Sep 17 00:00:00 2001 From: vraatikka Date: Fri, 2 Aug 2013 10:38:16 +0300 Subject: [PATCH] In server_update check if new user or pwd are NULL and decline to update used values if they are. --- server/core/server.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/server/core/server.c b/server/core/server.c index 30c51411a..11302077f 100644 --- a/server/core/server.c +++ b/server/core/server.c @@ -302,19 +302,27 @@ server_update(SERVER *server, char *protocol, char *user, char *passwd) { if (!strcmp(server->protocol, protocol)) { - skygw_log_write(NULL, LOGFILE_MESSAGE, "Update server protocol for server %s to protocol %s", - server->name, protocol); + skygw_log_write(NULL, + LOGFILE_MESSAGE, + "Update server protocol for server %s to protocol %s", + server->name, + protocol); free(server->protocol); server->protocol = strdup(protocol); } - if (strcmp(server->monuser, user) == 0 || strcmp(server->monpw, passwd) == 0) - { - skygw_log_write(NULL, LOGFILE_MESSAGE, "Update server monitor credentials for server %s", + if (user != NULL && passwd != NULL) { + if (strcmp(server->monuser, user) == 0 || + strcmp(server->monpw, passwd) == 0) + { + skygw_log_write(NULL, + LOGFILE_MESSAGE, + "Update server monitor credentials for server %s", server->name); free(server->monuser); free(server->monpw); serverAddMonUser(server, user, passwd); + } } }