fix to use library version of canonicalize hostname

diff --git a/clients/moira/nfs.c b/clients/moira/nfs.c
index b7d252dfa416b05ad2a69662d18e2b37bd5d4b75..be915437ef949599d254955f29034066e28dd14a 100644 (file)
--- a/clients/moira/nfs.c
+++ b/clients/moira/nfs.c
@@ -174,13 +174,14 @@ char **argv;
     if (!ValidName(argv[1]))
        return(DM_NORMAL);
     
-    args[0] = CanonicalizeHostname(argv[1]);    
+    args[0] = canonicalize_hostname(strsave(argv[1]));
     if ( (args[1] = GetDirName()) == NULL)
        return(DM_NORMAL);
     
     if ( (stat = do_sms_query("get_nfsphys", 2, args,
                              StoreInfo, (char *)  &elem)) != SMS_SUCCESS)
        com_err(program_name, stat, " in ShowNFSServices.");
+    free(args[0]);
     free(args[1]);             /* prevents memory leaks. */
 
     elem = QueueTop(elem);
@@ -206,7 +207,7 @@ int argc;
     char *info[MAX_ARGS_SIZE];
     int stat;
 
-    args[0] = CanonicalizeHostname(argv[1]);
+    args[0] = canonicalize_hostname(strsave(argv[1]));
     if ( (args[1] = GetDirName()) == NULL)
        return(DM_NORMAL);
     
@@ -235,6 +236,7 @@ int argc;
        com_err(program_name, stat, " in AdsNFSService");
     
     FreeInfo(info);
+    free(args[0]);
     return (DM_NORMAL);
 }
 
@@ -279,7 +281,7 @@ int argc;
     if (!ValidName(argv[1]))
        return(DM_NORMAL);
 
-    args[0] = CanonicalizeHostname(argv[1]);
+    args[0] = canonicalize_hostname(strsave(argv[1]));
     if ( (args[1] = GetDirName()) == NULL)
        return(DM_NORMAL);
 
@@ -288,6 +290,7 @@ int argc;
        com_err(program_name, stat, " in UpdateNFSService.");
        return (DM_NORMAL);
     }
+    free(args[0]);
     free(args[1]);             /* stop memory leaks. */
 
     elem = QueueTop(elem);
@@ -388,7 +391,7 @@ char **argv;
     if (!ValidName(argv[1]))
        return(DM_NORMAL);
 
-    args[0] = CanonicalizeHostname(argv[1]);
+    args[0] = canonicalize_hostname(strsave(argv[1]));
     if ( (args[1] = GetDirName()) == NULL)
        return(DM_NORMAL);
 
@@ -403,6 +406,7 @@ char **argv;
        com_err(program_name, stat, " in DeleteNFSService");
        return(DM_NORMAL);
     }
+    free(args[0]);
     free(args[1]);             /* stop memory leaks, in your neighborhood. */
 
     QueryLoop(elem, PrintNFSInfo, RealDeleteNFSService,

diff --git a/clients/moira/pobox.c b/clients/moira/pobox.c
index 86b8ae4f5a75633ec357d8283f44463d8b115ff6..3620ccf17221af0b5033870ee358c27850d5e147 100644 (file)
--- a/clients/moira/pobox.c
+++ b/clients/moira/pobox.c
@@ -147,7 +147,7 @@ char * local_user;
     if (PrintPOMachines() == SUB_NORMAL) {
        Put_message("");
        Prompt_input("Which Machine? ", temp_buf, BUFSIZ);
-       return(Strsave(CanonicalizeHostname(temp_buf)));
+       return(canonicalize_hostname(strsave(temp_buf)));
     }
     Put_message("Could not get machines to choose from, quitting.");
     return((char *) SUB_ERROR);

diff --git a/clients/moira/printer.c b/clients/moira/printer.c
index dee0336f3c62c2fdfeebb24fa0694bd4fe0a905a..a836f1cae7cfdb1521b281e1407de8d8244ef0da 100644 (file)
--- a/clients/moira/printer.c
+++ b/clients/moira/printer.c
@@ -143,9 +143,7 @@ char ** info;
     Put_message("");
 
     GetValueFromUser("Printer Server", &info[PCAP_SPOOL_HOST]);
-    strcpy(temp_buf, CanonicalizeHostname(info[PCAP_SPOOL_HOST]));
-    free(info[PCAP_SPOOL_HOST]);
-    info[PCAP_SPOOL_HOST] = Strsave(temp_buf);
+    info[PCAP_SPOOL_HOST] = canonicalize_hostname(info[PCAP_SPOOL_HOST]);
     GetValueFromUser("Spool Directory", &info[PCAP_SPOOL_DIR]);
     GetValueFromUser("Remote Printer Name", &info[PCAP_RPRINTER]);
     GetValueFromUser("Comments", &info[PCAP_COMMENTS]);