Index: /trunk/Ohana/src/elixir/include/elixir.h
===================================================================
--- /trunk/Ohana/src/elixir/include/elixir.h	(revision 33658)
+++ /trunk/Ohana/src/elixir/include/elixir.h	(revision 33659)
@@ -169,5 +169,4 @@
 int 	  WaitMsg (char *fifo, char **message, double maxdelay);
 int 	  WriteMsg (char *fifo, char *message);
-int 	  memstr (char *m1, char *m2, int n);
-int 	  rconnect (char *hostname, char *command, int *rsock, int *wsock);
-void GetConfig (char *config, char *field, char *format, int N, void *ptr);
+void      GetConfig (char *config, char *field, char *format, int N, void *ptr);
+int       rconnect_elixir (char *hostname, char *command, int *rsock, int *wsock);
Index: /trunk/Ohana/src/elixir/src/MachineOps.c
===================================================================
--- /trunk/Ohana/src/elixir/src/MachineOps.c	(revision 33658)
+++ /trunk/Ohana/src/elixir/src/MachineOps.c	(revision 33659)
@@ -202,5 +202,5 @@
   char line[256];
 
-  pid = rconnect (machine[0].hostname, CONNECT, &rsock, &wsock);
+  pid = rconnect_elixir (machine[0].hostname, CONNECT, &rsock, &wsock);
   if (pid) {
     machine[0].rsock = rsock;
Index: /trunk/Ohana/src/elixir/src/RemoteOps.c
===================================================================
--- /trunk/Ohana/src/elixir/src/RemoteOps.c	(revision 33658)
+++ /trunk/Ohana/src/elixir/src/RemoteOps.c	(revision 33659)
@@ -15,5 +15,5 @@
 
   /* set signal to remote machine */
-  if (!rconnect (machine, CONNECT, &rsock, &wsock)) {
+  if (!rconnect_elixir (machine, CONNECT, &rsock, &wsock)) {
     fprintf (stderr, "can't make connection to machine %s to kill process\n", machine);
     exit (1);
@@ -47,5 +47,5 @@
 
   /* send signal to remote machine */
-  if (!rconnect (machine, CONNECT, &rsock, &wsock)) {
+  if (!rconnect_elixir (machine, CONNECT, &rsock, &wsock)) {
     fprintf (stderr, "can't make connection to machine %s to kill process\n", machine);
     exit (1);
@@ -90,5 +90,5 @@
 
   /* send signal to remote machine */
-  if (!rconnect (machine, CONNECT, &rsock, &wsock)) {
+  if (!rconnect_elixir (machine, CONNECT, &rsock, &wsock)) {
     fprintf (stderr, "can't make connection to machine %s to signal process\n", machine);
     exit (1);
@@ -151,5 +151,5 @@
 
   /* make connection to remote machine */
-  if (!rconnect (machine, CONNECT, &rsock, &wsock)) {
+  if (!rconnect_elixir (machine, CONNECT, &rsock, &wsock)) {
     fprintf (stderr, "can't make connection to machine %s to kill process\n", machine);
     exit (1);
Index: /trunk/Ohana/src/elixir/src/SockScan.c
===================================================================
--- /trunk/Ohana/src/elixir/src/SockScan.c	(revision 33658)
+++ /trunk/Ohana/src/elixir/src/SockScan.c	(revision 33659)
@@ -5,8 +5,10 @@
 int SockScan (char *string, Fifo *fifo, int sock) {
   
-  int i, done, status;
+  int i, status;
+  char *done;
 
-  done = 0;
-  for (i = 0; (i < MAXTIME) && !done; i++) {
+  status = FALSE;
+  done = string;
+  for (i = 0; (i < MAXTIME) && (done != NULL); i++) {
     ShiftFifo (fifo);
     status = ReadtoFifo (fifo, sock);
@@ -24,20 +26,4 @@
   return (status);
 }
-
-/* returns (offset to m2) + 1, or 0 if failure */ 
-int memstr (char *m1, char *m2, int n) {
-
-  int i, N;
-
-  N = strlen (m2);
-  for (i = 0; (i < n - N + 1) && memcmp (m1, m2, N); i++, m1++);
-  if (memcmp (m1, m2, N)) {
-    return (0);
-  }
-  else {
-    return (i+1);
-  }
-
-}
  
 /* SockScan reads from the given socket looking for the given string
Index: /trunk/Ohana/src/elixir/src/rconnect.c
===================================================================
--- /trunk/Ohana/src/elixir/src/rconnect.c	(revision 33658)
+++ /trunk/Ohana/src/elixir/src/rconnect.c	(revision 33659)
@@ -4,5 +4,6 @@
    one for read, one for write */
 
-int rconnect (char *hostname, char *command, int *rsock, int *wsock) {
+// this is a slightly different version than the one in libohana -- use a local name
+int rconnect_elixir (char *hostname, char *command, int *rsock, int *wsock) {
 
   int i, rfd[2], wfd[2], status;