| prompt.c (63484) | prompt.c (71657) |
|---|---|
| 1/*- 2 * Copyright (c) 1998 Brian Somers <brian@Awfulhak.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * | 1/*- 2 * Copyright (c) 1998 Brian Somers <brian@Awfulhak.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * |
| 26 * $FreeBSD: head/usr.sbin/ppp/prompt.c 63484 2000-07-19 02:10:35Z brian $ | 26 * $FreeBSD: head/usr.sbin/ppp/prompt.c 71657 2001-01-26 01:41:34Z brian $ |
| 27 */ 28 29#include <sys/param.h> 30#include <netinet/in.h> 31#include <netinet/in_systm.h> 32#include <netinet/ip.h> 33#include <sys/un.h> 34 --- 290 unchanged lines hidden (view full) --- 325 p->src.type = "Controller"; 326 strncpy(p->src.from, tty, sizeof p->src.from - 1); 327 p->src.from[sizeof p->src.from - 1] = '\0'; 328 tcgetattr(p->fd_in, &p->oldtio); /* Save original tty mode */ 329 } else { 330 p->fd_in = p->fd_out = fd; 331 p->Term = fdopen(fd, "a+"); 332 p->owner = s; | 27 */ 28 29#include <sys/param.h> 30#include <netinet/in.h> 31#include <netinet/in_systm.h> 32#include <netinet/ip.h> 33#include <sys/un.h> 34 --- 290 unchanged lines hidden (view full) --- 325 p->src.type = "Controller"; 326 strncpy(p->src.from, tty, sizeof p->src.from - 1); 327 p->src.from[sizeof p->src.from - 1] = '\0'; 328 tcgetattr(p->fd_in, &p->oldtio); /* Save original tty mode */ 329 } else { 330 p->fd_in = p->fd_out = fd; 331 p->Term = fdopen(fd, "a+"); 332 p->owner = s; |
| 333 p->auth = *s->passwd ? LOCAL_NO_AUTH : LOCAL_AUTH; | 333 p->auth = *s->cfg.passwd ? LOCAL_NO_AUTH : LOCAL_AUTH; |
| 334 p->src.type = "unknown"; 335 *p->src.from = '\0'; 336 } 337 p->TermMode = NULL; 338 p->nonewline = 1; 339 p->needprompt = 1; 340 p->readtilde = 0; 341 p->bundle = bundle; --- 171 unchanged lines hidden (view full) --- 513 514 if (arg->argc == arg->argn) 515 pass = ""; 516 else if (arg->argc > arg->argn+1) 517 return -1; 518 else 519 pass = arg->argv[arg->argn]; 520 | 334 p->src.type = "unknown"; 335 *p->src.from = '\0'; 336 } 337 p->TermMode = NULL; 338 p->nonewline = 1; 339 p->needprompt = 1; 340 p->readtilde = 0; 341 p->bundle = bundle; --- 171 unchanged lines hidden (view full) --- 513 514 if (arg->argc == arg->argn) 515 pass = ""; 516 else if (arg->argc > arg->argn+1) 517 return -1; 518 else 519 pass = arg->argv[arg->argn]; 520 |
| 521 if (!strcmp(arg->prompt->owner->passwd, pass)) | 521 if (!strcmp(arg->prompt->owner->cfg.passwd, pass)) |
| 522 arg->prompt->auth = LOCAL_AUTH; 523 else 524 arg->prompt->auth = LOCAL_NO_AUTH; 525 526 return 0; 527} 528 529static struct pppTimer bgtimer; --- 33 unchanged lines hidden --- | 522 arg->prompt->auth = LOCAL_AUTH; 523 else 524 arg->prompt->auth = LOCAL_NO_AUTH; 525 526 return 0; 527} 528 529static struct pppTimer bgtimer; --- 33 unchanged lines hidden --- |