|
Lines 457-462
Link Here
|
| 457 |
{ |
457 |
{ |
| 458 |
char *s; |
458 |
char *s; |
| 459 |
int i, c, known; |
459 |
int i, c, known; |
|
|
460 |
int stdinfd; |
| 460 |
int got_conffile = 0, print_config = 0; |
461 |
int got_conffile = 0, print_config = 0; |
| 461 |
size_t s_len; |
462 |
size_t s_len; |
| 462 |
|
463 |
|
|
Lines 576-582
Link Here
|
| 576 |
switch (i) { |
577 |
switch (i) { |
| 577 |
case CONFIG_IPSEC_SECRET: |
578 |
case CONFIG_IPSEC_SECRET: |
| 578 |
case CONFIG_XAUTH_PASSWORD: |
579 |
case CONFIG_XAUTH_PASSWORD: |
| 579 |
s = strdup(getpass("")); |
580 |
stdinfd = fileno(stdin); |
|
|
581 |
if(isatty(stdinfd)) |
| 582 |
s = strdup(getpass("")); |
| 583 |
else |
| 584 |
getline(&s,&s_len,stdin); |
| 580 |
break; |
585 |
break; |
| 581 |
case CONFIG_IPSEC_GATEWAY: |
586 |
case CONFIG_IPSEC_GATEWAY: |
| 582 |
case CONFIG_IPSEC_ID: |
587 |
case CONFIG_IPSEC_ID: |
