fixup memory management with canonicalize_hostname()

diff --git a/clients/moira/dcmmaint.c b/clients/moira/dcmmaint.c
index 1a46c1c4401f7f8fd7beca631339ba3c42783045..1c5e080da90263737aada6c3c83dbccbc52d977a 100644 (file)
--- a/clients/moira/dcmmaint.c
+++ b/clients/moira/dcmmaint.c
@@ -249,7 +249,7 @@ char **argv;
     int status;
 
     qargv[SHI_SERVICE] = argv[1];
-    qargv[SHI_MACHINE] = canonicalize_hostname(argv[2]);
+    qargv[SHI_MACHINE] = canonicalize_hostname(strsave(argv[2]));
     if (status = do_mr_query("get_server_host_info", 2, qargv, shhost, NULL))
       com_err(whoami, status, " getting server/host info");
     return(DM_NORMAL);
@@ -296,7 +296,7 @@ char  **argv;
 {
     int status;
 
-    argv[2] = canonicalize_hostname(argv[2]);
+    argv[2] = canonicalize_hostname(strsave(argv[2]));
     if (status = do_mr_query("reset_server_host_error", 2, &argv[1],
                              Scream, NULL))
       com_err(whoami, status, " while resetting server/host error");
@@ -312,11 +312,11 @@ char **argv;
     char *qargv[9], buf[BUFSIZ];
 
     sprintf(buf, "Reset state for service %s on host %s (Y/N)", argv[1],
-           canonicalize_hostname(argv[2]));
+           canonicalize_hostname(strsave(argv[2])));
     if (!Confirm(buf))
       return(DM_NORMAL);
     qargv[0] = argv[1];
-    qargv[1] = canonicalize_hostname(argv[2]);
+    qargv[1] = canonicalize_hostname(strsave(argv[2]));
     qargv[2] = "0";
     qargv[3] = "0";
     qargv[4] = "0";
@@ -337,7 +337,7 @@ char  **argv;
 {
     int status;
 
-    argv[2] = canonicalize_hostname(argv[2]);
+    argv[2] = canonicalize_hostname(strsave(argv[2]));
     if (status = do_mr_query("set_server_host_override", 2, &argv[1],
                              Scream, NULL))
       com_err(whoami, status, " while setting server/host override");
@@ -364,7 +364,7 @@ char **cargv;
 inithost(info)
 char **info;
 {
-    info[SHI_MACHINE] = strsave(canonicalize_hostname(info[SH_MACHINE]));
+    info[SHI_MACHINE] = canonicalize_hostname(strsave(info[SH_MACHINE])));
     info[SHI_ENABLE] = strsave("1");
     info[SHI_VALUE1] = strsave("0");
     info[SHI_VALUE2] = strsave("0");
@@ -396,7 +396,7 @@ char **argv;
     int status;
 
     info[SHI_SERVICE] = strsave(argv[1]);
-    info[SHI_MACHINE] = strsave(canonicalize_hostname(argv[2]));
+    info[SHI_MACHINE] = canonicalize_hostname(strsave(argv[2]));
     if (status = do_mr_query("get_server_host_info", 2, info, ghost, 
                              (char *)info)) {
        com_err(whoami, status, " while getting server/host info");
@@ -422,7 +422,7 @@ char **argv;
     int status;
 
     info[SHI_SERVICE] = strsave(argv[1]);
-    info[SHI_MACHINE] = strsave(canonicalize_hostname(argv[2]));
+    info[SHI_MACHINE] = canonicalize_hostname(strsave(argv[2]));
     inithost(info);
     if (askhost(info) == NULL) {
        Put_message("Aborted.");
@@ -454,7 +454,7 @@ char **argv;
 {
     int status;
 
-    argv[2] = canonicalize_hostname(argv[2]);
+    argv[2] = canonicalize_hostname(strsave(argv[2]));
     if (status = do_mr_query("delete_server_host_info", 2, &argv[1],
                              Scream, NULL))
       com_err(whoami, status, " while deleting server/host info");