Fix another freeing-memory-we-didn't-malloc bug in AddMachine. This

[moira.git] / lib / mr_connect.c

diff --git a/lib/mr_connect.c b/lib/mr_connect.c
index e1d197e715d88b33b14b4b8ac6af8fa923d286cb..b619e2d7196a81351a2bedd9df150b4b74ad488f 100644 (file)
--- a/lib/mr_connect.c
+++ b/lib/mr_connect.c
@@ -13,12 +13,14 @@
 
 #ifndef lint
 static char *rcsid_sms_connect_c = "$Header$";
-#endif lint
+#endif
 
 #include <mit-copyright.h>
 #include "mr_private.h"
 #include <moira_site.h>
-#include <strings.h>
+#include <string.h>
+#include <stdlib.h>
+#include <hesiod.h>
 
 static char *mr_server_host = 0;
 
@@ -33,7 +35,6 @@ char *server;
 {
     extern int errno;
     char *p, **pp, sbuf[256];
-    extern char *getenv(), **hes_resolve();
        
     if (!mr_inited) mr_init();
     if (_mr_conn) return MR_ALREADY_CONNECTED;
@@ -47,14 +48,14 @@ char *server;
        pp = hes_resolve("moira", "sloc");
        if (pp) server = *pp;
     }
-#endif HESIOD
+#endif
 
     if (!server || (strlen(server) == 0)) {
        server = MOIRA_SERVER;
     }
 
-    if (!index(server, ':')) {
-       p = index(MOIRA_SERVER, ':');
+    if (!strchr(server, ':')) {
+       p = strchr(MOIRA_SERVER, ':');
        p++;
        sprintf(sbuf, "%s:%s", server, p);
        server = sbuf;
@@ -76,7 +77,7 @@ char *server;
      */
 
     mr_server_host = strsave(server);
-    if (p = index(mr_server_host, ':'))
+    if (p = strchr(mr_server_host, ':'))
        *p = 0;
     mr_server_host = canonicalize_hostname(mr_server_host);
     return 0;