DistRen Changeset - f46ff0f1ba9f · protofusion repositories

Changeset - f46ff0f1ba9f

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca - 16 years ago 2009-08-01 13:57:48

Made the userhost concatenator do something

1 file changed with 8 insertions and 11 deletions:

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -165,52 +165,49 @@ int register_user(char *username, char * @@
   // generates keys for login, @TODO: pub key must somehow be sent to the server.
   if(ssh_keygen() == 0){
 	  fprintf(stderr, "Failed!\n");
 	  return 0;
+  }
   return 1;
+}
 /** Logs the user into the server with a nice ssh session */
 int login_user(char *username)
+{
   char *userhost;
   userhost = malloc(strlen(username) + strlen("@protofusion.org") + 1);
   if(!userhost)
     return 43;
   strcpy(userhost, username);
   strcat(userhost, "@protofusion.org"); // Throws @protofusion.org after the username
   char buf[10];
   struct execio *testrem;
   char *execargv[] =
+    {
       "ssh",
+      userhost,// username and hostname
       "-i",
       SYSCONFDIR "/distren.id_rsa",
       "-p",
       "23",
       (char *)NULL,// username and hostname
       "echo",
       "hello", // This should eventually open a non-terminating connection to the server for communication,
       (char *)NULL
     };
   size_t readlen;
   /*< @TODO remove being tied to protofusion.org for no reason  */
   userhost = malloc(strlen(username) + strlen("@protofusion.org") + 1);
   if(!userhost)
     return 43;
   strcpy(userhost, username);
   strcat(userhost, "@protofusion.org"); // Throws @protofusion.org after the username
   fprintf(stderr, "Logging you in to %s\n", userhost);
   int status;
   struct stat buffer;
   status = stat(SYSCONFDIR "/distren.id_rsa", &buffer);
   if(status == -1){
 	  fprintf(stderr,"Your key has not been found! Re-register or somehow regenerate your key!\nWe need a way to regenerate keys coded in, but we don't have the facilities yet!\n");
 	  return 0;
+  }
   execio_open(&testrem, "ssh", execargv); // TODO: Grab returns from this someday
   buf[9] = '\0'; // null-terminating the array...
   while(!execio_read(testrem, buf, 9, &readlen))

0 comments (0 inline, 0 general)