diff options
| author | Kozlov Dmitry <xeb@mail.ru> | 2012-11-01 17:45:31 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2012-11-01 17:45:31 +0400 |
| commit | c0ee752358319ef3502cbd7604a9e8be5a18afd8 (patch) | |
| tree | 47f6400c6b87c0752137da86ad92d97474833da3 /accel-pppd/ctrl/pppoe | |
| parent | 1c89473d04c74e224546c596608f227dcd77518b (diff) | |
| parent | cbd29e841d4a90cf93515ba8341a8bbdbd4dea38 (diff) | |
| download | accel-ppp-c0ee752358319ef3502cbd7604a9e8be5a18afd8.tar.gz accel-ppp-c0ee752358319ef3502cbd7604a9e8be5a18afd8.zip | |
Merge branch '1.7' of ssh://accel-ppp.git.sourceforge.net/gitroot/accel-ppp/accel-ppp into 1.7
Diffstat (limited to 'accel-pppd/ctrl/pppoe')
| -rw-r--r-- | accel-pppd/ctrl/pppoe/cli.c | 2 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pppoe/pppoe.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/accel-pppd/ctrl/pppoe/cli.c b/accel-pppd/ctrl/pppoe/cli.c index 847b8547..26846402 100644 --- a/accel-pppd/ctrl/pppoe/cli.c +++ b/accel-pppd/ctrl/pppoe/cli.c @@ -120,7 +120,7 @@ static int show_service_name_exec(const char *cmd, char * const *f, int f_cnt, v if (conf_service_name) cli_sendv(cli, "%s\r\n", conf_service_name); else - cli_sendv(cli, "*\r\n", conf_service_name); + cli_sendv(cli, "*\r\n"); return CLI_CMD_OK; } diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c index e620668f..f36a1cc5 100644 --- a/accel-pppd/ctrl/pppoe/pppoe.c +++ b/accel-pppd/ctrl/pppoe/pppoe.c @@ -1350,7 +1350,7 @@ static int init_secret(struct pppoe_serv_t *serv) DES_cblock key; if (read(urandom_fd, serv->secret, SECRET_LENGTH) < 0) { - log_emerg("pppoe: failed to read /dev/urandom\n", strerror(errno)); + log_emerg("pppoe: failed to read /dev/urandom: %s\n", strerror(errno)); return -1; } |