summaryrefslogtreecommitdiff
path: root/ssh-keygen.c
diff options
context:
space:
mode:
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r--ssh-keygen.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 126556466..e8a1d4b4b 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -105,7 +105,7 @@ ask_filename(struct passwd *pw, const char *prompt)
105 105
106 if (key_type_name == NULL) 106 if (key_type_name == NULL)
107 name = _PATH_SSH_CLIENT_ID_RSA; 107 name = _PATH_SSH_CLIENT_ID_RSA;
108 else 108 else {
109 switch (key_type_from_name(key_type_name)) { 109 switch (key_type_from_name(key_type_name)) {
110 case KEY_RSA1: 110 case KEY_RSA1:
111 name = _PATH_SSH_CLIENT_IDENTITY; 111 name = _PATH_SSH_CLIENT_IDENTITY;
@@ -121,7 +121,7 @@ ask_filename(struct passwd *pw, const char *prompt)
121 exit(1); 121 exit(1);
122 break; 122 break;
123 } 123 }
124 124 }
125 snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name); 125 snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name);
126 fprintf(stderr, "%s (%s): ", prompt, identity_file); 126 fprintf(stderr, "%s (%s): ", prompt, identity_file);
127 if (fgets(buf, sizeof(buf), stdin) == NULL) 127 if (fgets(buf, sizeof(buf), stdin) == NULL)
@@ -316,7 +316,7 @@ get_line(FILE *fp, char *line, size_t len)
316 fprintf(stderr, "input line too long.\n"); 316 fprintf(stderr, "input line too long.\n");
317 exit(1); 317 exit(1);
318 } 318 }
319 switch(c) { 319 switch (c) {
320 case '\r': 320 case '\r':
321 c = fgetc(fp); 321 c = fgetc(fp);
322 if (c != EOF && c != '\n' && ungetc(c, fp) == EOF) { 322 if (c != EOF && c != '\n' && ungetc(c, fp) == EOF) {
@@ -1144,6 +1144,7 @@ main(int ac, char **av)
1144 break; 1144 break;
1145 case 'D': 1145 case 'D':
1146 download = 1; 1146 download = 1;
1147 /*FALLTHROUGH*/
1147 case 'U': 1148 case 'U':
1148 reader_id = optarg; 1149 reader_id = optarg;
1149 break; 1150 break;