DistRen Changeset - ac8cf7af18cd · protofusion repositories

Changeset - ac8cf7af18cd

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

ethanzonca - 16 years ago 2009-07-31 23:49:38

Made slave die on failed registration

2 files changed with 3 insertions and 2 deletions:

src/server/slave.c

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/server/slave.c

➞

Show inline comments

@@ @@ -66,25 +66,26 @@ for(counter=0; counter<argc; counter++){ @@
 		email = argv[3];
 		if(!strchr(email, '@'))
+		{
 			fprintf(stderr, "I want to see an '@' in your email address!\n%s may be good enough for you, but I need more!\n", email);
 			return 235;
+		}
 		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");
+		}
 		else{
 			fprintf(stderr,"Registration failed. Sorry!\n");
 			fprintf(stderr,"Please try again! :D\n");
 			return 0;
+		}
+	}
 /* End arg parser */
 /* 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;

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -33,25 +33,25 @@ @@
 #include <sys/stat.h>
 #include <fcntl.h>
 /** Generates a SSH key with ssh-keygen */
 int ssh_keygen(){
 	// distren.id_rsa and distren.id_rsa.pub are now generated in SYSCONFDIR (etc)
 	// Checks to see if the keys are already present.
 	int status;
 	struct stat buffer;
 	status = stat(SYSCONFDIR "/distren.id_rsa", &buffer);
 	if(status != -1){
 		fprintf(stderr, "Please delete etc/distren.id_rsa and etc/distren.id_rsa.pub to register.");
+		fprintf(stderr, "Please delete etc/distren.id_rsa and etc/distren.id_rsa.pub to register.\n");
 		return 0;
+	}
 /* start execio code */
 	char *command = "ssh-keygen"; // @TODO: append .exe if win32?
 	int ret;
 	char *cmd[] = { command, "-q", "-f", SYSCONFDIR "/distren.id_rsa", "-N", "", (char *)NULL }; // TODO: Give me the correct args!
 	char buf[10];
 	struct execio *testrem;
 	size_t readlen;
 	ret = execio_open(&testrem, command, cmd); // This path will be absolute for testing, should be relative to install on production

0 comments (0 inline, 0 general)