DistRen Changeset - 81246e11146e · protofusion repositories

Changeset - 81246e11146e

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca - 16 years ago 2009-07-30 15:43:48

Todo editing

1 file changed with 2 insertions and 3 deletions:

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -81,28 +81,27 @@ int register_user(char *username, char * @@
   while(!execio_read(testrem, buf, 9, &readlen)) // What's with the readlen stuff?
+    {
       if(readlen > 9) {
 	fprintf(stderr, "!!!! Something is terribly wrong!\n");
+      }
       buf[readlen] = '\0'; // Null-terminating the end of it again based on how large the data is?
       fprintf(stderr, "read \"%s\"\n", buf);
+    }
   execio_close(testrem);
   /* @TODO: Parse the output buffer or something to check when user creation fails due to duplicate users. This is pretty important. */
-  // ssh_keygen(); // generates distren_rsa
+  ssh_keygen(); // generates keys for login, @TODO: pub key must somehow be sent to the server.
   conf_replace(username); // puts the person's username in the conf
   /* @TODO: Scan distrenslave.conf for !username and !key and replace them with "keyname" and the "username" */
   return 1;
+}
 int login_user(char *username)
+{
   char *userhost;
   char *userkey;
   char buf[10];
   struct execio *testrem;
   char *execargv[] =
+    {
@@ @@ -149,25 +148,25 @@ int login_user(char *username) @@
   while(!execio_read(testrem, buf, 9, &readlen)) // What's with the readlen stuff?
+    {
       if(readlen > 9) {
 	fprintf(stderr, "!!!! Something is terribly wrong!\n");
+      }
     buf[readlen] = '\0'; // Null-terminating the end of it again based on how large the data is?
     fprintf(stderr, "read \"%s\"\n", buf);
+    }
   execio_close(testrem);
   return 1; // 1 can be like... error-free login...
+}
-/* Replaces username and key in the slave's conf file, currently pseudo */
 /* Replaces username and key in the slave's conf file */
 void conf_replace(char *username){
   /* Note: SYSCONFDIR doesn't include a trailing slash */
   int maxlinelen = 120;
   char *fileOrig = SYSCONFDIR "/distrenslave.conf";
   char *fileRepl = SYSCONFDIR "/distrenslave.conf.edited";
   char *text2find = "!username";
   char *text2repl = username;
   char buffer[maxlinelen+2];
   char *buff_ptr, *find_ptr;
   FILE *fp1, *fp2;
   size_t find_len = strlen(text2find);

0 comments (0 inline, 0 general)