merge back 2.0 branch changes

This commit is contained in:
bodea 2005-02-14 06:58:38 +00:00
parent cd2e983aaf
commit 7825a26691
7 changed files with 91 additions and 55 deletions

17
ppp.c
View file

@ -1,6 +1,6 @@
// L2TPNS PPP Stuff
char const *cvs_id_ppp = "$Id: ppp.c,v 1.43 2005/01/25 04:38:49 bodea Exp $";
char const *cvs_id_ppp = "$Id: ppp.c,v 1.44 2005/02/14 06:58:39 bodea Exp $";
#include <stdio.h>
#include <string.h>
@ -60,13 +60,18 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
{
uint8_t *b = p;
b += 4;
user[0] = pass[0] = 0;
if (*b && *b < sizeof(user))
{
memcpy(user, b + 1, *b);
user[*b] = 0;
b += 1 + *b;
if (*b && *b < sizeof(pass))
memcpy(pass, b + 1, *b);
pass[*b] = 0;
user[*b] = 0;
b += 1 + *b;
if (*b && *b < sizeof(pass))
{
memcpy(pass, b + 1, *b);
pass[*b] = 0;
}
}
LOG(3, s, t, "PAP login %s/%s\n", user, pass);
}
if (session[s].ip || !session[s].radius)