# HG changeset patch
# User ethanzonca
# Date 2009-08-01 13:09:24
# Node ID 11f92cc7df63311b7ae22dfaa4bcfced8bd93faa
# Parent  bd7fe8c34cb5452eb525e304cfa1fbe6436bd16c

Fixes to remove key from slave

diff --git a/src/server/slave.c b/src/server/slave.c
--- a/src/server/slave.c
+++ b/src/server/slave.c
@@ -73,6 +73,7 @@ for(counter=0; counter<argc; counter++){
 		if( register_user(username, email) == 1){
 			// register_user generates a key, too */
 			fprintf(stderr,"Registration successfull. You may now invoke distrenslave with no arguments.\n");
+			return 0;
 		}
 		else{
 			fprintf(stderr,"Please try again! :D\n");
@@ -85,9 +86,7 @@ for(counter=0; counter<argc; counter++){
 
 /* Option getter: Creates vars to grab stuff from conf, uses the options include to grab this data */
 char *username;
-char *key;
 username = NULL;
-key = NULL;
 cfg_t * my_cfg;
 cfg_opt_t myopts[] = {
 		CFG_SIMPLE_STR("username", &username),
@@ -103,7 +102,7 @@ options_init(argc,argv,&my_cfg, myopts, 
 	  fprintf(stderr, "\nYou didn't register!\nPlease register or edit your config. (see -h)\nIf this error persists, check distrenslave.conf to ensure all items are filled.\n");
 	}
 	else if( username != NULL || strcmp(username,"!username") != 0 ){
-		fprintf(stderr, "Your username is %s, and your key is %s.\n",username, key);
+		fprintf(stderr, "Your username is %s\n",username);
 		// Logs ya in:
 		if(login_user(username) == 1){
 			fprintf(stderr,"You should now be logged into distren.\n");
diff --git a/src/server/slavefuncs.c b/src/server/slavefuncs.c
--- a/src/server/slavefuncs.c
+++ b/src/server/slavefuncs.c
@@ -103,7 +103,7 @@ int ssh_keygen(){
 		return 0;
 	}
 	else{
-		fprintf(stderr,"We successfully generated your key! Yay!");
+		fprintf(stderr,"We successfully generated your key! Yay!\n");
 		return 1;
 	}
 return 0;