From 67852ff149c6a8f081d66c4fb09fcfa798b2832d Mon Sep 17 00:00:00 2001
From: mar <mar>
Date: Wed, 30 Dec 1992 17:28:15 +0000
Subject: [PATCH] malloc problems

---
 dcm/dcm.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dcm/dcm.c b/dcm/dcm.c
index 52fbfaa4..89668a09 100644
--- a/dcm/dcm.c
+++ b/dcm/dcm.c
@@ -386,15 +386,17 @@ struct service *svc;
 	status = mr_update_server(svc->service, machine, svc->target,
 				   svc->script);
 	if (status == MR_SUCCESS) {
-	    argv[2] = "0";
+	    argv[2] = argv[4] = "0";
 	    argv[3] = "1";
 	    free(argv[8]);
 	    argv[8] = itoa(tv.tv_sec);
 	} else if (SOFT_FAIL(status)) {
+	    argv[4] = "0";
 	    free(argv[6]);
 	    argv[6] = strsave(error_message(status));
 	} else { /* HARD_FAIL */
 	    argv[2] = itoa(shost.override);
+	    argv[4] = "0";
 	    argv[5] = itoa(status);
 	    free(argv[6]);
 	    argv[6] = strsave(error_message(status));
@@ -422,24 +424,22 @@ struct service *svc;
 		free(qargv[4]);
 		free(qargv[5]);
 		close(lock_fd);
-		free(argv[2]);
-		argv[4] = "0";
-		free(argv[5]);
 		status = mr_query_with_retry("set_server_host_internal",
 					      9, argv,scream,NULL);
+		free(argv[2]);
+		free(argv[5]);
 		if (status)
 		  com_err(whoami, status, " setting host state again");
 		return(-1);
 	    }
-	    free(argv[2]);
-	    free(argv[5]);
 	}
-	argv[4] = "0";
 	close(lock_fd);
 	status = mr_query_with_retry("set_server_host_internal", 9, argv,
 				      scream, NULL);
 	if (status)
 	  com_err(whoami, status, " setting host state again");
+/*	free(argv[2]);
+	free(argv[5]); */
     free_mach:
 	free(machine);
 	close(lock_fd);
-- 
2.45.2