DistRen Changeset - 11f92cc7df63 · protofusion repositories

Changeset - 11f92cc7df63

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

ethanzonca - 16 years ago 2009-08-01 13:09:24

Fixes to remove key from slave

2 files changed with 3 insertions and 4 deletions:

src/server/slave.c

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/server/slave.c

➞

Show inline comments

@@ @@ -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");

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -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;

0 comments (0 inline, 0 general)