Changeset - f0035ee94e64
[Not reviewed]
default
0 1 0
ethanzonca - 16 years ago 2009-07-30 16:42:23

Minor
1 file changed with 2 insertions and 2 deletions:
0 comments (0 inline, 0 general)
src/server/slavefuncs.c
Show inline comments
 
@@ -22,25 +22,25 @@
 
  * distrenslave -c username email@example.com
 
 */
 
#include "blendjob.h"
 

	
 
#include <stdio.h>
 
#include <string.h>
 
#include <unistd.h>
 
#include <stdlib.h> /*< malloc(), free() */
 

	
 
int ssh_keygen(){
 
	// distren.id_rsa and distren.id_rsa.pub are now generated in SYSCONFDIR (etc)
 
	fprintf(stderr, "We're generating your SSH key. Please be patient.\n");
 
	char *command = "ssh-keygen"; // append .exe if win32?
 
	char *command = "ssh-keygen"; // @TODO: append .exe if win32?
 
	char *path_to_command = "/usr/bin/ssh-keygen";
 
	int ret;
 
	char *cmd[] = { command, "-f", SYSCONFDIR "/distren.id_rsa", "-N", "", (char *)0 }; // TODO: Give me the correct args!
 
	ret = execv(path_to_command, cmd); // This path will be absolute for testing, should be relative to install on production
 
	if(ret == -1){
 
		fprintf(stderr, "Generating your key failed. Ensure that ssh-keygen is present!\n"); // Use different executor that searches the path? there is one...
 
		return 0;
 
	}
 
	else{
 
		fprintf(stderr,"We successfully generated your key! Yay!");
 
		return 1;
 
	}
 
@@ -52,25 +52,25 @@ int register_user(char *username, char *
 
  /*
 
   * Logs into sandboxed user on zserver2 and registers a user. Should eventually generate a key on the server and return it to the user.
 
   * All created user accounts should be sandboxed accordingly, requiring a different skel, and the default shell to be rbash. Also,
 
   * a custom path defined in the .bash_profile of the skel is needed.
 
   */
 
  char buf[10];
 
  struct execio *testrem;
 
  char *execargv[] =
 
    {
 
      "ssh",
 
      "distren_setup@protofusion.org",
 
      "-i",
 
      SYSCONFDIR "setup_rsa", // default distributed key, account can only create users.
 
      SYSCONFDIR "/setup_rsa", // default distributed key, account can only create users.
 
      "-p",
 
      "23",
 
      "sudo /usr/sbin/useradd",
 
      "-M",
 
      "-c",
 
      email,
 
      "-d",
 
      "/home/distren",
 
      "--gid",
 
      "541", // Add in shellscript to generate ssh key and set keyname
 
      username,
 
      (char *)NULL
0 comments (0 inline, 0 general)