From 0a66ad22e54c72690ec2a29a019767c55c5281fc Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Fri, 18 Oct 2024 20:22:57 +1100 Subject: [PATCH 01/16] pppd: Remove passprompt plugin This is prompted by a number of factors: * It was more useful back in the dial-up days, but no-one uses dial-up any more * In many cases there will be no terminal accessible to the prompter program at the point where the prompter is run * The passwordfd plugin does much the same thing but does it more cleanly and securely * The handling of privileges and file descriptors needs to be audited thoroughly. Signed-off-by: Paul Mackerras --- pppd/plugins/Makefile.am | 6 +- pppd/plugins/passprompt.c | 137 -------------------------------------- 2 files changed, 1 insertion(+), 142 deletions(-) delete mode 100644 pppd/plugins/passprompt.c diff --git a/pppd/plugins/Makefile.am b/pppd/plugins/Makefile.am index 2826148..9480d51 100644 --- a/pppd/plugins/Makefile.am +++ b/pppd/plugins/Makefile.am @@ -1,4 +1,4 @@ -pppd_plugin_LTLIBRARIES = minconn.la passprompt.la passwordfd.la winbind.la +pppd_plugin_LTLIBRARIES = minconn.la passwordfd.la winbind.la pppd_plugindir = $(PPPD_PLUGIN_DIR) PLUGIN_CPPFLAGS = -I${top_srcdir} @@ -8,10 +8,6 @@ minconn_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) minconn_la_LDFLAGS = $(PLUGIN_LDFLAGS) minconn_la_SOURCES = minconn.c -passprompt_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) -passprompt_la_LDFLAGS = $(PLUGIN_LDFLAGS) -passprompt_la_SOURCES = passprompt.c - passwordfd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) passwordfd_la_LDFLAGS = $(PLUGIN_LDFLAGS) passwordfd_la_SOURCES = passwordfd.c diff --git a/pppd/plugins/passprompt.c b/pppd/plugins/passprompt.c deleted file mode 100644 index 7779d51..0000000 --- a/pppd/plugins/passprompt.c +++ /dev/null @@ -1,137 +0,0 @@ -/* - * passprompt.c - pppd plugin to invoke an external PAP password prompter - * - * Copyright 1999 Paul Mackerras, Alan Curry. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -char pppd_version[] = PPPD_VERSION; - -static char promptprog[PATH_MAX+1]; -static int promptprog_refused = 0; - -static struct option options[] = { - { "promptprog", o_string, promptprog, - "External PAP password prompting program", - OPT_STATIC, NULL, PATH_MAX }, - { NULL } -}; - -static int promptpass(char *user, char *passwd) -{ - int p[2]; - pid_t kid; - int readgood, wstat, ret; - ssize_t red; - - if (promptprog_refused || promptprog[0] == 0 || access(promptprog, X_OK) < 0) - return -1; /* sorry, can't help */ - - if (!passwd) - return 1; - - if (pipe(p)) { - warn("Can't make a pipe for %s", promptprog); - return 0; - } - if ((kid = fork()) == (pid_t) -1) { - warn("Can't fork to run %s", promptprog); - close(p[0]); - close(p[1]); - return 0; - } - if (!kid) { - /* we are the child, exec the program */ - char *argv[5], fdstr[32]; - ppp_sys_close(); - closelog(); - close(p[0]); - ret = seteuid(getuid()); - if (ret != 0) { - warn("Couldn't set effective user id"); - } - ret = setegid(getgid()); - if (ret != 0) { - warn("Couldn't set effective user id"); - } - sprintf(fdstr, "%d", p[1]); - argv[0] = promptprog; - argv[1] = strdup(user); - argv[2] = strdup(ppp_remote_name()); - argv[3] = fdstr; - argv[4] = 0; - execv(*argv, argv); - _exit(127); - } - - /* we are the parent, read the password from the pipe */ - close(p[1]); - readgood = 0; - do { - red = read(p[0], passwd + readgood, MAXSECRETLEN-1 - readgood); - if (red == 0) - break; - if (red < 0) { - if (errno == EINTR && !ppp_signaled(SIGTERM)) - continue; - error("Can't read secret from %s: %m", promptprog); - readgood = -1; - break; - } - readgood += red; - } while (readgood < MAXSECRETLEN - 1); - close(p[0]); - - /* now wait for child to exit */ - while (waitpid(kid, &wstat, 0) < 0) { - if (errno != EINTR || ppp_signaled(SIGTERM)) { - warn("error waiting for %s: %m", promptprog); - break; - } - } - - if (readgood < 0) - return 0; - passwd[readgood] = 0; - if (!WIFEXITED(wstat)) - warn("%s terminated abnormally", promptprog); - if (WEXITSTATUS(wstat)) { - warn("%s exited with code %d", promptprog, WEXITSTATUS(wstat)); - /* code when cancel was hit in the prompt prog */ - if (WEXITSTATUS(wstat) == 128) { - promptprog_refused = 1; - } - return -1; - } - return 1; -} - -void plugin_init(void) -{ - ppp_add_options(options); - pap_passwd_hook = promptpass; -#ifdef PPP_WITH_EAPTLS - eaptls_passwd_hook = promptpass; -#endif -} -- 2.39.5 From b9e627e21282aa97233c91f4360092995c377d5e Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Fri, 25 Oct 2024 17:24:30 +1100 Subject: [PATCH 02/16] Remove pppgetpass program This is associated with the passprompt plugin, and like it, seems not to be very useful any more now that no-one uses dial-up. Also, its function seems somewhat peripheral to PPP. Signed-off-by: Paul Mackerras --- Makefile.am | 2 +- configure.ac | 11 -- contrib/Makefile.am | 1 - contrib/pppgetpass/.gitignore | 2 - contrib/pppgetpass/Makefile.am | 17 --- contrib/pppgetpass/pppgetpass.8 | 18 --- contrib/pppgetpass/pppgetpass.gtk.c | 92 ------------ contrib/pppgetpass/pppgetpass.sh | 7 - contrib/pppgetpass/pppgetpass.vt.c | 218 ---------------------------- 9 files changed, 1 insertion(+), 367 deletions(-) delete mode 100644 contrib/Makefile.am delete mode 100644 contrib/pppgetpass/.gitignore delete mode 100644 contrib/pppgetpass/Makefile.am delete mode 100644 contrib/pppgetpass/pppgetpass.8 delete mode 100644 contrib/pppgetpass/pppgetpass.gtk.c delete mode 100644 contrib/pppgetpass/pppgetpass.sh delete mode 100644 contrib/pppgetpass/pppgetpass.vt.c diff --git a/Makefile.am b/Makefile.am index 3de35c8..8d3dff8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS="-Im4" -SUBDIRS = chat contrib pppd pppstats pppdump +SUBDIRS = chat pppd pppstats pppdump if PPP_WITH_PLUGINS SUBDIRS += pppd/plugins diff --git a/configure.ac b/configure.ac index e30f161..b4f4335 100644 --- a/configure.ac +++ b/configure.ac @@ -317,22 +317,11 @@ AM_COND_IF([PPP_WITH_FILTER], [ ]) ]) -# -# Some contributions require GTK/GLIB -AC_ARG_WITH([gtk], AS_HELP_STRING([--with-gtk], [Build contributions with the GTK+ interface])) -if test "x${with_gtk}" = "xyes"; then - PKG_CHECK_MODULES([GTK], [gtk+-2.0]) - PKG_CHECK_MODULES([GLIB], [glib-2.0]) -fi -AM_CONDITIONAL([WITH_GTK], test "x${with_gtk}" = "xyes") - AC_DEFINE_UNQUOTED(PPPD_VERSION, "$VERSION", [Version of pppd]) AC_CONFIG_FILES([ Makefile chat/Makefile - contrib/Makefile - contrib/pppgetpass/Makefile include/Makefile pppd/Makefile pppd/pppd.pc diff --git a/contrib/Makefile.am b/contrib/Makefile.am deleted file mode 100644 index fb9a390..0000000 --- a/contrib/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = pppgetpass diff --git a/contrib/pppgetpass/.gitignore b/contrib/pppgetpass/.gitignore deleted file mode 100644 index 1b8a1c8..0000000 --- a/contrib/pppgetpass/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -pppgetpass.vt -pppgetpass.gtk diff --git a/contrib/pppgetpass/Makefile.am b/contrib/pppgetpass/Makefile.am deleted file mode 100644 index be74d48..0000000 --- a/contrib/pppgetpass/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -noinst_PROGRAMS = pppgetpass.vt - -pppgetpass_vt_SOURCES = pppgetpass.vt.c -pppgetpass_vt_CPPFLAGS = -Wno-unused-result - -if WITH_GTK -noinst_PROGRAMS += pppgetpass.gtk - -pppgetpass_gtk_SOURCES = pppgetpass.gtk.c -pppgetpass_gtk_CPPFLAGS = -Wno-deprecated-declarations -Wno-discarded-qualifiers -pppgetpass_gtk_CPPFLAGS += $(GLIB_CFLAGS) $(GTK_CFLAGS) -pppgetpass_gtk_LDADD = $(GLIB_LIBS) $(GTK_LIBS) -endif - -EXTRA_DIST = \ - pppgetpass.sh \ - pppgetpass.8 diff --git a/contrib/pppgetpass/pppgetpass.8 b/contrib/pppgetpass/pppgetpass.8 deleted file mode 100644 index ade5769..0000000 --- a/contrib/pppgetpass/pppgetpass.8 +++ /dev/null @@ -1,18 +0,0 @@ -.TH PPPGETPASS 8 "26 Sep 1999" -.SH NAME -pppgetpass \- prompt for PAP password -.SH SYNOPSIS -.B pppgetpass -.I client server fd -.SH DESCRIPTION -.B pppgetpass -the outer half of a plugin for PAP password prompting in pppd. -If the peer requires PAP, and the -.B passprompt.so -plugin is loaded into pppd, it will run -.B /usr/sbin/pppgetpass -(or another program specified by the -.B promptprog -option) to prompt the user for the password. -.SH SEE ALSO -pppd(8) diff --git a/contrib/pppgetpass/pppgetpass.gtk.c b/contrib/pppgetpass/pppgetpass.gtk.c deleted file mode 100644 index 48ca042..0000000 --- a/contrib/pppgetpass/pppgetpass.gtk.c +++ /dev/null @@ -1,92 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -int outfd; -int err; - -static void okpressed(void *widget, void *clientdata) -{ - GtkWidget *answer=clientdata; - gchar *pass; - int passlen; - ssize_t wrote; - (void)widget; - - pass=gtk_entry_get_text(GTK_ENTRY(answer)); - - passlen=strlen(pass); - if(!passlen) - return; - - if((wrote=write(outfd, pass, passlen))!=passlen) { - if(wrote<0) - syslog(LOG_ERR, "write error on outpipe: %m"); - else - syslog(LOG_ERR, "short write on outpipe"); - err=1; - } - gtk_main_quit(); -} - -int main(int argc, char **argv) -{ - GtkWidget *mainwindow, *vbox, *question, *answer, *ok; - char buf[1024]; - gtk_init(&argc, &argv); - - openlog(argv[0], LOG_PID, LOG_DAEMON); - if(argc!=4) { - syslog(LOG_WARNING, "Usage error"); - return 1; - } - outfd=atoi(argv[3]); - mainwindow=gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_title(GTK_WINDOW(mainwindow), "pppgetpass"); - gtk_signal_connect(GTK_OBJECT(mainwindow), "destroy", - GTK_SIGNAL_FUNC(gtk_main_quit), 0); - - vbox=gtk_vbox_new(FALSE, 5); - gtk_container_add(GTK_CONTAINER(mainwindow), vbox); - gtk_widget_show(vbox); - - if(argv[1][0] && argv[2][0]) - snprintf(buf, sizeof buf, "Password for PPP client %s on server %s: ", argv[1], argv[2]); - else if(argv[1][0] && !argv[2][0]) - snprintf(buf, sizeof buf, "Password for PPP client %s: ", argv[1]); - else if(!argv[1][0] && argv[2][0]) - snprintf(buf, sizeof buf, "Password for PPP on server %s: ", argv[2]); - else - snprintf(buf, sizeof buf, "Enter PPP password: "); - question=gtk_label_new(buf); - gtk_box_pack_start(GTK_BOX(vbox), question, FALSE, TRUE, 0); - gtk_widget_show(question); - - answer=gtk_entry_new(); - gtk_entry_set_visibility(GTK_ENTRY(answer), 0); - gtk_box_pack_start(GTK_BOX(vbox), answer, FALSE, TRUE, 0); - gtk_widget_show(answer); - - ok=gtk_button_new_with_label("OK"); - gtk_box_pack_start(GTK_BOX(vbox), ok, FALSE, TRUE, 0); - gtk_signal_connect(GTK_OBJECT(ok), "clicked", - GTK_SIGNAL_FUNC(okpressed), answer); - gtk_widget_show(ok); - - gtk_widget_show(mainwindow); - gtk_main(); - - return err; -} diff --git a/contrib/pppgetpass/pppgetpass.sh b/contrib/pppgetpass/pppgetpass.sh deleted file mode 100644 index 09c4805..0000000 --- a/contrib/pppgetpass/pppgetpass.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ -z "$DISPLAY" ]; then - exec pppgetpass.vt "$@" -else - exec pppgetpass.gtk "$@" -fi diff --git a/contrib/pppgetpass/pppgetpass.vt.c b/contrib/pppgetpass/pppgetpass.vt.c deleted file mode 100644 index a152088..0000000 --- a/contrib/pppgetpass/pppgetpass.vt.c +++ /dev/null @@ -1,218 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static int console_owner(uid_t, int); - -int main(int argc, char **argv) -{ - int console; - uid_t uid; - struct vt_stat origstate; - int openvtnum; - char openvtname[256]; - int openvt; - gid_t gid; - int chowned; - FILE *fp; - struct termios t; - char pass[256], *nl; - int outfd, passlen; - ssize_t wrote; - console=open("/dev/console", O_RDWR); - - uid=getuid(); - gid=getgid(); - seteuid(uid); - - openlog(argv[0], LOG_PID, LOG_DAEMON); - - if(argc!=4) { - syslog(LOG_WARNING, "Usage error"); - return 1; - } - - if(console<0) { - syslog(LOG_ERR, "open(/dev/console): %m"); - return 1; - } - - if(ioctl(console, VT_GETSTATE, &origstate)<0) { - syslog(LOG_ERR, "VT_GETSTATE: %m"); - return 1; - } - - if(uid) { - if(!console_owner(uid, origstate.v_active)) { - int i; - for(i=0;i<64;++i) { - if(i!=origstate.v_active && console_owner(uid, i)) - break; - } - if(i==64) { - syslog(LOG_WARNING, "run by uid %lu not at console", (unsigned long)uid); - return 1; - } - } - } - - if(ioctl(console, VT_OPENQRY, &openvtnum)<0) { - syslog(LOG_ERR, "VT_OPENQRY: %m"); - return 1; - } - if(openvtnum==-1) { - syslog(LOG_ERR, "No free VTs"); - return 1; - } - - snprintf(openvtname, sizeof openvtname, "/dev/tty%d", openvtnum); - seteuid(0); - openvt=open(openvtname, O_RDWR); - if(openvt<0) { - seteuid(uid); - syslog(LOG_ERR, "open(%s): %m", openvtname); - return 1; - } - - chowned=fchown(openvt, uid, gid); - if(chowned<0) { - seteuid(uid); - syslog(LOG_ERR, "fchown(%s): %m", openvtname); - return 1; - } - - close(console); - - if(ioctl(openvt, VT_ACTIVATE, openvtnum)<0) { - seteuid(uid); - syslog(LOG_ERR, "VT_ACTIVATE(%d): %m", openvtnum); - return 1; - } - - while(ioctl(openvt, VT_WAITACTIVE, openvtnum)<0) { - if(errno!=EINTR) { - ioctl(openvt, VT_ACTIVATE, origstate.v_active); - seteuid(uid); - syslog(LOG_ERR, "VT_WAITACTIVE(%d): %m", openvtnum); - return 1; - } - } - - seteuid(uid); - fp=fdopen(openvt, "r+"); - if(!fp) { - seteuid(0); - ioctl(openvt, VT_ACTIVATE, origstate.v_active); - seteuid(uid); - syslog(LOG_ERR, "fdopen(%s): %m", openvtname); - return 1; - } - - if(tcgetattr(openvt, &t)<0) { - seteuid(0); - ioctl(openvt, VT_ACTIVATE, origstate.v_active); - seteuid(uid); - syslog(LOG_ERR, "tcgetattr(%s): %m", openvtname); - return 1; - } - t.c_lflag &= ~ECHO; - if(tcsetattr(openvt, TCSANOW, &t)<0) { - seteuid(0); - ioctl(openvt, VT_ACTIVATE, origstate.v_active); - seteuid(uid); - syslog(LOG_ERR, "tcsetattr(%s): %m", openvtname); - return 1; - } - - if(fprintf(fp, "\033[2J\033[H")<0) { - seteuid(0); - ioctl(openvt, VT_ACTIVATE, origstate.v_active); - seteuid(uid); - syslog(LOG_ERR, "write error on %s: %m", openvtname); - return 1; - } - if(argv[1][0] && argv[2][0]) { - if(fprintf(fp, "Password for PPP client %s on server %s: ", argv[1], argv[2])<0) { - seteuid(0); - ioctl(openvt, VT_ACTIVATE, origstate.v_active); - seteuid(uid); - syslog(LOG_ERR, "write error on %s: %m", openvtname); - return 1; - } - } else if(argv[1][0] && !argv[2][0]) { - if(fprintf(fp, "Password for PPP client %s: ", argv[1])<0) { - syslog(LOG_ERR, "write error on %s: %m", openvtname); - seteuid(0); - ioctl(openvt, VT_ACTIVATE, origstate.v_active); - seteuid(uid); - return 1; - } - } else if(!argv[1][0] && argv[2][0]) { - if(fprintf(fp, "Password for PPP on server %s: ", argv[2])<0) { - seteuid(0); - ioctl(openvt, VT_ACTIVATE, origstate.v_active); - seteuid(uid); - syslog(LOG_ERR, "write error on %s: %m", openvtname); - return 1; - } - } else { - if(fprintf(fp, "Enter PPP password: ")<0) { - seteuid(0); - ioctl(openvt, VT_ACTIVATE, origstate.v_active); - seteuid(uid); - syslog(LOG_ERR, "write error on %s: %m", openvtname); - return 1; - } - } - - if(!fgets(pass, sizeof pass, fp)) { - seteuid(0); - ioctl(openvt, VT_ACTIVATE, origstate.v_active); - seteuid(uid); - if(ferror(fp)) { - syslog(LOG_ERR, "read error on %s: %m", openvtname); - } - return 1; - } - if((nl=strchr(pass, '\n'))) - *nl=0; - passlen=strlen(pass); - - outfd=atoi(argv[3]); - if((wrote=write(outfd, pass, passlen))!=passlen) { - seteuid(0); - ioctl(openvt, VT_ACTIVATE, origstate.v_active); - seteuid(uid); - if(wrote<0) - syslog(LOG_ERR, "write error on outpipe: %m"); - else - syslog(LOG_ERR, "short write on outpipe"); - return 1; - } - - seteuid(0); - ioctl(openvt, VT_ACTIVATE, origstate.v_active); - seteuid(uid); - return 0; -} - -static int console_owner(uid_t uid, int cons) -{ - char name[256]; - struct stat st; - snprintf(name, sizeof name, "/dev/tty%d", cons); - if(stat(name, &st)<0) { - if(errno!=ENOENT) - syslog(LOG_ERR, "stat(%s): %m", name); - return 0; - } - return uid==st.st_uid; -} -- 2.39.5 From c24180bcf8b10c36bad4ec3a301b98c40aa38c08 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Fri, 25 Oct 2024 18:20:40 +1100 Subject: [PATCH 03/16] scripts: Remove some old scripts of dubious value This removes various scripts and config files that related to dial-up connections, doing PPP over rsh or ssh (for which there are better alternatives), and updating resolv.conf (for which distros have other mechanisms these days). Signed-off-by: Paul Mackerras --- scripts/Makefile.am | 17 +---- scripts/README | 143 -------------------------------------- scripts/callback | 77 -------------------- scripts/chat-callback | 98 -------------------------- scripts/ip-down.local.add | 20 ------ scripts/ip-up.local.add | 24 ------- scripts/options-rsh-loc | 1 - scripts/options-rsh-rem | 1 - scripts/options-ssh-loc | 1 - scripts/options-ssh-rem | 1 - scripts/ppp-off | 34 --------- scripts/ppp-on | 36 ---------- scripts/ppp-on-dialer | 17 ----- scripts/ppp-on-rsh | 72 ------------------- scripts/ppp-on-ssh | 76 -------------------- scripts/redialer | 96 ------------------------- scripts/secure-card | 111 ----------------------------- 17 files changed, 1 insertion(+), 824 deletions(-) delete mode 100644 scripts/README delete mode 100755 scripts/callback delete mode 100644 scripts/chat-callback delete mode 100644 scripts/ip-down.local.add delete mode 100644 scripts/ip-up.local.add delete mode 100644 scripts/options-rsh-loc delete mode 100644 scripts/options-rsh-rem delete mode 100644 scripts/options-ssh-loc delete mode 100644 scripts/options-ssh-rem delete mode 100755 scripts/ppp-off delete mode 100755 scripts/ppp-on delete mode 100755 scripts/ppp-on-dialer delete mode 100755 scripts/ppp-on-rsh delete mode 100755 scripts/ppp-on-ssh delete mode 100755 scripts/redialer delete mode 100755 scripts/secure-card diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d01903a..d2779cb 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,26 +1,11 @@ EXTRA_SCRIPTS = \ autopppd \ - callback \ - ip-down.local.add \ - ip-up.local.add \ ipv6-down.sample \ ipv6-up.sample \ - options-rsh-loc \ - options-rsh-rem \ - options-ssh-loc \ - options-ssh-rem \ plog \ poff \ pon \ - pon.1 \ - ppp-off \ - ppp-on \ - ppp-on-dialer \ - ppp-on-rsh \ - ppp-on-ssh \ - README \ - redialer \ - secure-card + pon.1 EXTRA_DIST= \ $(EXTRA_SCRIPTS) diff --git a/scripts/README b/scripts/README deleted file mode 100644 index 00e032c..0000000 --- a/scripts/README +++ /dev/null @@ -1,143 +0,0 @@ -This directory contains a set of scripts which have been used on Linux -as well as Solaris 2.x systems to initiate or maintain a connection -with PPP. The files in this directory were contributed by Al Longyear -(longyear@netcom.com) and Adi Masputra (adi.masputra@sun.com) - ------------------------------------------------------------------------- - -1. README - -This file. You are reading it. It is just documentation. - ------------------------------------------------------------------------- - -2. ppp-on - -This script will initiate a connection to the PPP system. It will run -the chat program with the connection script as a parameter. This is a -possible security hole. However, it is simple. It is meant to replace -the previous version of ppp-on which was not very functional. - -The ppp-on script has entries for the account name, password, IP -addresses, and telephone numbers. The parameters are passed to the -pppd process and, then in turn, to the second part of the connect -script, as a set of environment variables. - -Please make sure that you put the full path name to the ppp-on-dialer -script in the reference to it in ppp-on. - ------------------------------------------------------------------------- - -3. ppp-on-dialer - -This is the second part to the simple calling script, ppp-on. It -executes the chat program to connect the user with a standard UNIX -style getty/login connection sequence. - ------------------------------------------------------------------------- - -4. callback - -This script may be used in lieu of the ppp-on-dialer to permit the -common modem callback sequence. You may need to make changes to the -expected prompt string for the modem. - -The script works by disabling the system's detection of the DCD -condition and working on the modem status message "NO CARRIER" which -is generated when the modem disconnects. - -It is crude. It does work for my modem connection. Use as you see fit. - ------------------------------------------------------------------------- - -5. redialer - -The redialer script is a replacement for the ppp-on-dialer script. It -will do 'attack dialing' or 'demon dialing' of one or more telephone -numbers. The first number which responds will be used for a -connection. - -There is a limit of ten attempts and a 15 second delay between dialing -attempts. Both values are set in the script. - ------------------------------------------------------------------------- - -6. ppp-off - -This is a script which will terminate the active ppp connection. Use -as either "ppp-off" to terminate ppp0, or "ppp-off " to -terminate the connection on . For example, "ppp-off ppp2" will -terminate the ppp2 connection. - ------------------------------------------------------------------------- - -7. secure-card - -This script was written by Jim Isaacson . It is a script -for the 'expect' programming language used with Tcl. You need to have -expect and Tcl installed before this script may be used. - -This script will operate with a device marketed under the name "SecureCARD". -This little device is mated with its controller. On the credit card size -device, there is a sequence number which changes on a random basis. In order -for you to connect you need to enter a fixed portion of your account name -and the number which is displayed on this card device. The number must match -the value at the controller in order for the account name to be used. - -The problem is that chat uses fixed response strings. In addition, the -timing for running the script may prevent the use of a script that reads the -value before it starts the dial sequence. What was needed was a script which -asked the user at the user's console at the time that it is needed. - -This led to the use of expect. - ------------------------------------------------------------------------- - -8. ppp-on-rsh - -This script will initiate a PPP connection to a remote machine using rsh. -This is implemented by creating a master/slave pseudo-tty with the slave -pointing to rsh, specifically with the 'pty' and 'notty' options of pppd. -It is assumed that the remote machine contains some sort of trust -mechanisms (such as ~/.rhosts, et al) to allow the local machine to -connect via rsh as root. - ------------------------------------------------------------------------- - -9. ppp-on-ssh - -This script will initiate a PPP connection to a remote machine using the -secure shell, or ssh. I've only tested this on ssh 1.x, so those of you -who are running ssh 2.x mahy need to modify the ssh options slightly. -This is implemented by creating a master/slave pseudo-ttyt with the slave -pointing to ssh, specifically with the 'pty' and 'notty' options of pppd. -It is assumed that the remote machine can accept the ssh connection from -the local host, in the sense that all ssh authentication mechanisms have -been properly configured, so that a remote root user can open a ssh -connection. - ------------------------------------------------------------------------- - -10. options-rsh-loc & options-rsh-rem - -These options files accompany the ppp-on-rsh script mentioned above. In -theory, you'd want to copy the options-rsh-rem to the remote machine where -in.rshd is running. The only extra option required on the remote machine -options file is the 'notty' option. In addition, all ASCII control characters -[0x00 to 0x1f], plus 0xff, are escaped. This may need to be modified -depending on the rsh (or pseudo-tty) implementation which may differ across -platforms, for further optimizations. - ------------------------------------------------------------------------- - -11. options-ssh-loc & options-ssh-rem - -These options files accompany the ppp-on-ssh script mentioned above. I've -only tested this on ssh 1.x, so those of you who are running ssh 2.x need -to modify the ssh options slightly. In theory, you'd want to copy the -options-ssh-rem to the remote machine where sshd daemon is running. The only -extra options required on the remote machine options file is the 'notty' -option. In addition, all ASCII control characters [0x00 to 0x1f], plus 0xff, -are escaped. This may need to be modified depending on the ssh (or -pseudo-tty) implementation which may differ across platforms, for further -optimizations. diff --git a/scripts/callback b/scripts/callback deleted file mode 100755 index 1c3d3aa..0000000 --- a/scripts/callback +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh -################################################################### -# -# Script to dial the remote system, negotiate the connection, and send -# it the id. Then wait for the modem to disconnect. Reset the modem -# to answer mode and wait for the system to call back. -# -# The telephone number and modempass are used when establishing the -# connection to the modem. -# -PHONE=555-1212 -MODEMPASS=modem_identifier -# -# Once the modem calls back, the account name and password are used for -# a UNIX style login operation. -# -ACCOUNT=my_account_name -PASSWORD=my_password - -################################################################### -# -# Step 1. Dial the modem and negotiate the initial dialog. -# note: the modem is configured to ignore loss of DCD at this point. -# it is important that this be performed because the loss of DCD -# will normally prevent system from working since 'modem' is used -# for pppd. -# -# The script is terminated normally when the carrier is lost. -# -chat -v \ - TIMEOUT 3 \ - ABORT '\nBUSY\r' \ - ABORT '\nNO ANSWER\r' \ - ABORT '\nRINGING\r\n\r\nRINGING\r' \ - '' AT \ - 'OK-+++\c-OK' 'AT&C0&D2S0=0H0' \ - TIMEOUT 30 \ - OK ATDT$TELEPHONE \ - CONNECT '' \ - assword: $MODEMPASS \ - "\nNO CARRIER\r" - -if [ "$?" = "0" ]; then - -################################################################### -# -# Step 2. Wait for the call back from the remote. This will wait for at most -# 30 seconds for the call back should the first attempt fail or -# something happen with the callback logic at the remote. -# -# note: when the callback occurs, the DCD setting is re-enabled. -# -# If some voice call should happen during this period, the system will -# answer the telephone and then hang up on them. I realize that this is -# rude, but there is little that this script can do. -# - chat -v \ - TIMEOUT 30 \ - ABORT '\nVOICE\r' \ - '\nRING\r' 'AT&C1A' \ - CONNECT '' \ - TIMEOUT 10 \ - ogin:--ogin: $ACCOUNT \ - TIMEOUT 45 \ - assword: $PASSWORD - - if [ "$?" = "0" ]; then - exit 0 - fi -fi - -################################################################### -# -# The script has failed. Terminate the connection mode. -# -chat -v TIMEOUT 3 "" AT 'OK-+++\c-OK' 'AT&C1&D2S0=0H0' OK -exit 1 diff --git a/scripts/chat-callback b/scripts/chat-callback deleted file mode 100644 index d014d6a..0000000 --- a/scripts/chat-callback +++ /dev/null @@ -1,98 +0,0 @@ -# ===================================================================================== -# Chat script to dial our Company PPP account. -# They uses a call-back system to identify us and to reverse -# charge the call cost. -# ===================================================================================== -# -ECHO OFF -# All the usual abort strings -ABORT "NO CARRIER" -ABORT "VOICE" -ABORT "BUSY" -ABORT "NO DIALTONE" -ABORT "NO ANSWER" -# -# If calling outside allowed time we get this: -# -ABORT "Access denied" -# -# Modem initialisation stuff -# -TIMEOUT 5 -SAY "Initialising modem ...\n" -'' ATE1 -'OK\r\n' ATS0=1S11=60X4&K4S42.1=1 -# -# Now dial our ISP and wait for connection -# -SAY "Dialling our ISP ...\n" -'OK\r\n' ATDT09834657 -TIMEOUT 60 -CONNECT \c -SAY "Connected ...\n" -# -# This is the first stage login, we identify ourself so that the remote -# system will agree to call us back. -# -TIMEOUT 30 -SAY "Sending Callback login ID ...\n" -name:-BREAK-name: callme -# -# From now on, we must assume no carrier is normal as well -# as receiving a HANGUP signal because it will be the -# case if our ISP clears the call to call us back. -# -CLR_ABORT "NO CARRIER" -HANGUP OFF -# -ABORT "Invalid" -# -# Now send password and wait to see what happens -# -SAY "Sending Callback password ...\n" -word:--word: xvsgsgs -"You will be" \c -# -# What can happen now is: -# either: we get "You will be called back..." which is the successful case -# or: we get "Invalid login" and we abort (bad login ID or password) -# or: we get "NO CARRIER" because of an error, this will not abort -# and we will time out after 30 seconds -# or: we get nothing and we will time out after 30 seconds -# -# -# We reach here if we got "You will be called back..." -# -CLR_ABORT "Invalid" -SAY "Now waiting for Call back ...\n" -# -# The remote system will now hangup and we will get both "NO CARRIER" -# and a hangup signal which are ignored. We now wait for a connection -# for up to 120 seconds. What happens here if somebody else calls before -# the remote system is a bit dangerous: -# -# If a malicious user connects and says 'name:', he will see 'PPPuser' -# If he then says 'word:' he will see the passowrd 'blipblop'. I may not -# know to which systems these belong to, though. It is up to you to consider -# that case and decide wether the risk is too big or not .... -# -TIMEOUT 120 -"CONNECT" \c -# -# We have been called, re-arm ABORT on NO CARRIER and normal hangup signal -# behaviour -# -HANGUP ON -ABORT "NO CARRIER" -# -# Second stage login in order to start PPP -# -SAY "Remote system called back, logging in ...\n" -SAY "Sending login ID ...\n" -name:-BREAK-name: PPPuser -SAY "Sending password ...\n" -word:--word: blipblop -SAY "Asking to start PPP ...\n" -'CnetSrv' "ppp default" -"Entering PPP mode" \c -SAY "ISP PPP started ...\n" diff --git a/scripts/ip-down.local.add b/scripts/ip-down.local.add deleted file mode 100644 index b93590e..0000000 --- a/scripts/ip-down.local.add +++ /dev/null @@ -1,20 +0,0 @@ - -# -# This sample code shows you one way to modify your setup to allow automatic -# configuration of your resolv.conf for peer supplied DNS addresses when using -# the `usepeerdns' option. -# -# In my case I just added this to my /etc/ppp/ip-down.local script. You may need to -# create an executable script if one does not exist. -# -# Nick Walker (nickwalker@email.com) -# - -if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then - if [ -f /etc/ppp/resolv.prev ]; then - cp -f /etc/ppp/resolv.prev /etc/resolv.conf - else - rm -f /etc/resolv.conf - fi -fi - diff --git a/scripts/ip-up.local.add b/scripts/ip-up.local.add deleted file mode 100644 index 8017209..0000000 --- a/scripts/ip-up.local.add +++ /dev/null @@ -1,24 +0,0 @@ - -# -# This sample code shows you one way to modify your setup to allow automatic -# configuration of your resolv.conf for peer supplied DNS addresses when using -# the `usepeerdns' option. -# -# In my case I just added this to my /etc/ppp/ip-up.local script. You may need to -# create an executable script if one does not exist. -# -# Nick Walker (nickwalker@email.com) -# - -if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then - rm -f /etc/ppp/resolv.prev - if [ -f /etc/resolv.conf ]; then - cp /etc/resolv.conf /etc/ppp/resolv.prev - grep domain /etc/ppp/resolv.prev > /etc/resolv.conf - grep search /etc/ppp/resolv.prev >> /etc/resolv.conf - cat /etc/ppp/resolv.conf >> /etc/resolv.conf - else - cp /etc/ppp/resolv.conf /etc - fi -fi - diff --git a/scripts/options-rsh-loc b/scripts/options-rsh-loc deleted file mode 100644 index b015b87..0000000 --- a/scripts/options-rsh-loc +++ /dev/null @@ -1 +0,0 @@ -debug asyncmap FFFFFFFF escape FF kdebug 0 noipdefault nodefaultroute noauth mtu 1460 diff --git a/scripts/options-rsh-rem b/scripts/options-rsh-rem deleted file mode 100644 index 4b10bb9..0000000 --- a/scripts/options-rsh-rem +++ /dev/null @@ -1 +0,0 @@ -notty debug asyncmap FFFFFFFF escape FF kdebug 0 noipdefault nodefaultroute noauth mtu 1460 diff --git a/scripts/options-ssh-loc b/scripts/options-ssh-loc deleted file mode 100644 index add03d6..0000000 --- a/scripts/options-ssh-loc +++ /dev/null @@ -1 +0,0 @@ -debug asyncmap FFFFFFFF escape FF kdebug 0 noipdefault nodefaultroute noauth mtu 1400 diff --git a/scripts/options-ssh-rem b/scripts/options-ssh-rem deleted file mode 100644 index d690722..0000000 --- a/scripts/options-ssh-rem +++ /dev/null @@ -1 +0,0 @@ -notty debug asyncmap FFFFFFFF escape FF kdebug 0 noipdefault nodefaultroute noauth mtu 1400 diff --git a/scripts/ppp-off b/scripts/ppp-off deleted file mode 100755 index a22b5ea..0000000 --- a/scripts/ppp-off +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -###################################################################### -# -# Determine the device to be terminated. -# -if [ "$1" = "" ]; then - DEVICE=ppp0 -else - DEVICE=$1 -fi - -###################################################################### -# -# If the ppp0 pid file is present then the program is running. Stop it. -if [ -r /var/run/$DEVICE.pid ]; then - kill -INT `cat /var/run/$DEVICE.pid` -# -# If the kill did not work then there is no process running for this -# pid. It may also mean that the lock file will be left. You may wish -# to delete the lock file at the same time. - if [ ! "$?" = "0" ]; then - rm -f /var/run/$DEVICE.pid - echo "ERROR: Removed stale pid file" - exit 1 - fi -# -# Success. Let pppd clean up its own junk. - echo "PPP link to $DEVICE terminated." - exit 0 -fi -# -# The ppp process is not running for ppp0 -echo "ERROR: PPP link is not active on $DEVICE" -exit 1 diff --git a/scripts/ppp-on b/scripts/ppp-on deleted file mode 100755 index ab79db4..0000000 --- a/scripts/ppp-on +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# Script to initiate a ppp connection. This is the first part of the -# pair of scripts. This is not a secure pair of scripts as the codes -# are visible with the 'ps' command. However, it is simple. -# -# These are the parameters. Change as needed. -TELEPHONE=555-1212 # The telephone number for the connection -ACCOUNT=george # The account name for logon (as in 'George Burns') -PASSWORD=gracie # The password for this account (and 'Gracie Allen') -LOCAL_IP=0.0.0.0 # Local IP address if known. Dynamic = 0.0.0.0 -REMOTE_IP=0.0.0.0 # Remote IP address if desired. Normally 0.0.0.0 -NETMASK=255.255.255.0 # The proper netmask if needed -# -# Export them so that they will be available at 'ppp-on-dialer' time. -export TELEPHONE ACCOUNT PASSWORD -# -# This is the location of the script which dials the phone and logs -# in. Please use the absolute file name as the $PATH variable is not -# used on the connect option. (To do so on a 'root' account would be -# a security hole so don't ask.) -# -DIALER_SCRIPT=/etc/ppp/ppp-on-dialer -# -# Initiate the connection -# -# I put most of the common options on this command. Please, don't -# forget the 'lock' option or some programs such as mgetty will not -# work. The asyncmap and escape will permit the PPP link to work with -# a telnet or rlogin connection. You are welcome to make any changes -# as desired. Don't use the 'defaultroute' option if you currently -# have a default route to an ethernet gateway. -# -exec /usr/sbin/pppd debug lock modem crtscts /dev/ttyS0 38400 \ - asyncmap 20A0000 escape FF kdebug 0 $LOCAL_IP:$REMOTE_IP \ - noipdefault netmask $NETMASK defaultroute connect $DIALER_SCRIPT diff --git a/scripts/ppp-on-dialer b/scripts/ppp-on-dialer deleted file mode 100755 index 7d66765..0000000 --- a/scripts/ppp-on-dialer +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# This is part 2 of the ppp-on script. It will perform the connection -# protocol for the desired connection. -# -exec chat -v \ - TIMEOUT 3 \ - ABORT '\nBUSY\r' \ - ABORT '\nNO ANSWER\r' \ - ABORT '\nRINGING\r\n\r\nRINGING\r' \ - '' \rAT \ - 'OK-+++\c-OK' ATH0 \ - TIMEOUT 30 \ - OK ATDT$TELEPHONE \ - CONNECT '' \ - ogin:--ogin: $ACCOUNT \ - assword: $PASSWORD diff --git a/scripts/ppp-on-rsh b/scripts/ppp-on-rsh deleted file mode 100755 index 30a50db..0000000 --- a/scripts/ppp-on-rsh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -# -# A sample script to establish PPP session(s) via rsh -# -# Adi Masputra -# Jan 24, 2000 -# - -# -# You'd definitely want to change the following addresses to suit -# your network configuration -# -LOC_IP=10.0.0.1 -REM_IP=10.0.0.2 -NETMASK=255.255.0.0 - -export LOC_IP REM_IP - -# -# This is the remote peer where in.rshd is running, either -# its hostname or IP address -# -PPPD_RHOST=myremotehost - -# -# For this example, we assume that pppd on both local and remote -# machines reside in the same place, /usr/local/bin/pppd -# -PPPD_LOC=/usr/local/bin/pppd - -# -# The location of local options file (where rsh client is running). -# Note that the sample options file included in the distribution -# may need further customizations, depending on your needs. The 'noauth' -# option specified in the file is there to simplify the example. In -# reality, you'd probably want to remove such option. -# -PPPD_LOC_OPT=/etc/ppp/options-rsh-loc - -# -# The location of remote options file (where in.rshd daemon is running). -# Note that the sample options file included in the distribution -# may need further customizations, depending on your needs. The 'noauth' -# option specified in the file is there to simplify the example. In -# reality, you'd probably want to remove such option. Also note that -# the remote options file need to include the 'notty' option for this -# to work -# -PPPD_REM_OPT=/etc/ppp/options-rsh-rem - -# -# The location of rsh client on the local machine -# -RSH_LOC=/bin/rsh - -export PPPD_LOC PPPD_LOC_OPT PPPD_REM_OPT PPPD_RHOST RSH_LOC - -# -# Uncomment the following to enable IPv6, note that the IPv6 support -# needs to be enabled during compilation -# -# PPPD_IPV6='+ipv6 ipv6cp-use-ipaddr' -export PPPD_IPV6 - -# -# And execute pppd with the pty option, specifying rsh client as the -# slave side of the pseduo-tty master/slave pair. -# -exec $PPPD_LOC \ - pty '$RSH_LOC $PPPD_RHOST $PPPD_LOC $REM_IP:$LOC_IP $PPPD_IPV6 file $PPPD_REM_OPT' \ - $LOC_IP:$REM_IP netmask $NETMASK $PPPD_IPV6 file $PPPD_LOC_OPT - diff --git a/scripts/ppp-on-ssh b/scripts/ppp-on-ssh deleted file mode 100755 index 0e41aca..0000000 --- a/scripts/ppp-on-ssh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# -# A sample script to establish PPP session(s) via SSH 1.x -# -# Adi Masputra -# Jan 24, 2000 -# - -# -# You'd definitely want to change the following addresses to suit -# your network configuration -# -LOC_IP=10.0.0.1 -REM_IP=10.0.0.2 -NETMASK=255.255.0.0 - -export LOC_IP REM_IP - -# -# This is the remote peer where sshd is running, either -# its hostname or IP address -# -PPPD_RHOST=myremotehost - -# -# For this example, we assume that pppd on both local and remote -# machines reside in the same place, /usr/local/bin/pppd -# -PPPD_LOC=/usr/local/bin/pppd - -# -# The location of local options file (where ssh client is running). -# Note that the sample options file included in the distribution -# may need further customizations, depending on your needs. The 'noauth' -# option specified in the file is there to simplify the example, although -# some may choose to have it there and rely on ssh authentication -# instead. -# -PPPD_LOC_OPT=/etc/ppp/options-ssh-loc - -# -# The location of remote options file (where sshd daemon is running) -# Note that the sample options file included in the distribution -# may need further customizations, depending on your needs. The 'noauth' -# option specified in the file is there to simplify the example, although -# some may choose to have it there and rely on ssh authentication -# instead. Also note that the remote options file need to include the 'notty' -# options for this to work. -# -PPPD_REM_OPT=/etc/ppp/options-ssh-rem - -# -# The location of ssh client on the local machine -# -SSH_LOC=/usr/local/bin/ssh - -export PPPD_LOC PPPD_LOC_OPT PPPD_REM_OPT PPPD_RHOST SSH_LOC - -# -# Uncomment the following to enable IPv6, note that the IPv6 support -# needs to be enabled during compilation -# -# PPPD_IPV6='+ipv6 ipv6cp-use-ipaddr' -export PPPD_IPV6 - -# -# And execute pppd with the pty option, specifying ssh client as the -# slave side of the pseudo-tty master/slave pair. Note that on this example, -# ssh has been compiled to allow NULL encryption (thus the '-c none' option), -# but in reality, you'd probably want to specify the encryption algorithm. -# See the man page of ssh(1) for details. -# -exec $PPPD_LOC \ - pty '$SSH_LOC -c none $PPPD_RHOST $PPPD_LOC $REM_IP:$LOC_IP $PPPD_IPV6 file $PPPD_REM_OPT' \ - $LOC_IP:$REM_IP netmask $NETMASK $PPPD_IPV6 file $PPPD_LOC_OPT - diff --git a/scripts/redialer b/scripts/redialer deleted file mode 100755 index d43c42a..0000000 --- a/scripts/redialer +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash -################################################################### -# -# These parameters control the attack dialing sequence. -# -# Maximum number of attempts to reach the telephone number(s) -MAX_ATTEMPTS=10 - -# Delay between each of the attempts. This is a parameter to sleep -# so use "15s" for 15 seconds, "1m" for 1 minute, etc. -SLEEP_DELAY=15s - -################################################################### -# -# This is a list of telephone numbers. Add new numbers if you wish -# and see the function 'callall' below for the dial process. -PHONE1=555-1212 -PHONE2=411 - -################################################################### -# -# If you use the ppp-on script, then these are passed to this routine -# automatically. There is no need to define them here. If not, then -# you will need to set the values. -# -ACCOUNT=my_account_name -PASSWORD=my_password - -################################################################### -# -# Function to initialize the modem and ensure that it is in command -# state. This may not be needed, but it doesn't hurt. -# -function initialize -{ - chat -v TIMEOUT 3 '' AT 'OK-+++\c-OK' - return -} - -################################################################### -# -# Script to dial a telephone -# -function callnumber -{ -chat -v \ - ABORT '\nBUSY\r' \ - ABORT '\nNO ANSWER\r' \ - ABORT '\nRINGING\r\n\r\nRINGING\r' \ - '' ATDT$1 \ - CONNECT '' \ - ogin:--ogin: $ACCOUNT \ - assword: $PASSWORD -# -# If the connection was successful then end the whole script with a -# success. -# - if [ "$?" = "0" ]; then - exit 0 - fi - - return -} - -################################################################### -# -# Script to dial any telephone number -# -function callall -{ -# echo "dialing attempt number: $1" >/dev/console - callnumber $PHONE1 -# callnumber $PHONE2 -} - -################################################################### -# -# Initialize the modem to ensure that it is in the command state -# -initialize -if [ ! "$?" = "0" ]; then - exit 1 -fi - -# -# Dial telephone numbers until one answers -# -attempt=0 -while : ; do - attempt=`expr $attempt + 1` - callall $attempt - if [ "$attempt" = "$MAX_ATTEMPTS" ]; then - exit 1 - fi - sleep "$SLEEP_DELAY" -done diff --git a/scripts/secure-card b/scripts/secure-card deleted file mode 100755 index ae3ae50..0000000 --- a/scripts/secure-card +++ /dev/null @@ -1,111 +0,0 @@ -#!/usr/bin/expect -f -# -# This script was written by Jim Isaacson . It is -# designed to work as a script to use the SecureCARD(tm) device. This -# little device is mated with a central controller. The number displayed -# on this card changes every so often and you need to enter the number -# along with your user account name in order to gain access. Since chat -# is based upon fixed strings this procedure will not work with chat. -# -# It is included by permission. An excellent reference for the expect -# program used by this script is in the book: -# -# "Exploring Expect" -# by Don Libes -# Published by O'Rielly and Associates -# - -send_user "hello, starting ppp\n" - -system "stty 19200 -echoe -echo raw < /dev/ttyS3 > /dev/ttyS3" - -# -# These are the parameters for the program. -# -set user Pxxxxxx -set password xxxxxxx -set modem /dev/ttyS3 -set dialup -set timeout 60 - -spawn -noecho -open [open $modem "r+"] - -send "AT&F\r" -expect "OK" - -send "ATe0v1x4&c1q0&d2&c1s2=128s0=0DT $dialup\r" -set timeout 15 -set counter 0 - -set still_connecting 1 - -expect { - -re ".*CONNECT.*\n" { - set timeout 5 - set still_connecting 0 - continue -expect - } - -re ".*CONNECT.*\r" { - set timeout 5 - set still_connecting 0 - continue -expect - } - -re ".*NO.*CARRIER" { - send_user "Failed to Connect, exiting...\n" - exit - } - -re ".*NO.*DIAL.*TONE" { - send_user "Failed to Connect, exiting...\n" - exit - } - -re ".*VOICE" { - send_user "Failed to Connect, exiting...\n" - exit - } - -re ".*sscode:.*\n" { - continue -expect - } - -re ".*sscode:" { - set timeout -1 - expect_user -re "(.*)\n" - send "$expect_out(1,string)\r" - set timeout 30 - continue -expect - } - -re ".*Next.*:" { - set timeout -1 - expect_user -re "(.*)\n" - send "$expect_out(1,string)\r" - set timeout 30 - continue -expect - } - -re "Your.*" { - send "\r" - continue -expect - } - -re ".*in:" { - send "$user\r" - continue -expect - } - -re ".*word:" { - send "$password\r" - } - - timeout { - if { $still_connecting > 0 } { - continue -expect - } - set timeout 15 - send "\r" - incr counter - if { $counter > 8 } { - send_user "Cannot Connect\n" - exit - } else { - continue -expect - } - } -} - -overlay -0 $spawn_id -1 $spawn_id pppd /dev/ttyS3 19200 192.111.187.215: \ - crtscts modem defaultroute debug -- 2.39.5 From ef41a6dcb297dc248acb67b811fa282b737f8747 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Sat, 26 Oct 2024 17:02:03 +1100 Subject: [PATCH 04/16] Delete samples/options.ttyXX The commentary and example in this file doesn't seem all that useful. Signed-off-by: Paul Mackerras --- sample/options.ttyXX | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 sample/options.ttyXX diff --git a/sample/options.ttyXX b/sample/options.ttyXX deleted file mode 100644 index d4202f5..0000000 --- a/sample/options.ttyXX +++ /dev/null @@ -1,14 +0,0 @@ -# If you need to set up multiple serial lines then copy this file to -# options. for each tty with a modem on it. -# -# The options.tty file will assign an IP address to each PPP connection -# as it comes up. They must all be distinct! -# -# Example: -# options.ttyS1 for com2 under DOS. -# -# Edit the following line so that the first IP address -# mentioned is the ip address of the serial port while the second -# is the IP address of your host -# -hostname-s1:hostname -- 2.39.5 From f7120b5cea9ef51f6b3e95b0be9938f2fec24eaf Mon Sep 17 00:00:00 2001 From: Tomas Paukrt <44699103+tpaukrt@users.noreply.github.com> Date: Tue, 29 Oct 2024 06:40:55 +0100 Subject: [PATCH 05/16] pppd: Fix printing 64-bit counters (#528) Add support of format specifiers %lld and %llu to the function vslprintf and use the correct specifiers for printing 64-bit counters. Signed-off-by: Tomas Paukrt --- pppd/main.c | 2 +- pppd/utils.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/pppd/main.c b/pppd/main.c index 051bac8..66db6a9 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -1332,7 +1332,7 @@ print_link_stats(void) if (link_stats_print && link_stats_valid) { int t = (link_connect_time + 5) / 6; /* 1/10ths of minutes */ info("Connect time %d.%d minutes.", t/10, t%10); - info("Sent %u bytes, received %u bytes.", + info("Sent %llu bytes, received %llu bytes.", link_stats.bytes_out, link_stats.bytes_in); link_stats_print = 0; } diff --git a/pppd/utils.c b/pppd/utils.c index bf9923c..edda503 100644 --- a/pppd/utils.c +++ b/pppd/utils.c @@ -142,8 +142,8 @@ vslprintf(char *buf, int buflen, const char *fmt, va_list args) int c, i, n; int width, prec, fillch; int base, len, neg, quoted; - long lval = 0; - unsigned long val = 0; + long long lval = 0; + unsigned long long val = 0; char *str, *buf0; const char *f; unsigned char *p; @@ -208,6 +208,30 @@ vslprintf(char *buf, int buflen, const char *fmt, va_list args) case 'l': c = *fmt++; switch (c) { + case 'l': + c = *fmt++; + switch (c) { + case 'd': + lval = va_arg(args, long long); + if (lval < 0) { + neg = 1; + val = -lval; + } else + val = lval; + base = 10; + break; + case 'u': + val = va_arg(args, unsigned long long); + base = 10; + break; + default: + OUTCHAR('%'); + OUTCHAR('l'); + OUTCHAR('l'); + --fmt; /* so %llz outputs %llz etc. */ + continue; + } + break; case 'd': lval = va_arg(args, long); if (lval < 0) { -- 2.39.5 From d72b03393a4fe14768dcf54b6cb14a6220b83aaf Mon Sep 17 00:00:00 2001 From: orbea Date: Mon, 28 Oct 2024 22:42:18 -0700 Subject: [PATCH 06/16] pppd: fix build with LibreSSL 4.0.0 (#526) Starting with LibreSSL 4.0.0 the OPENSSL_load_builtin_modules() function was removed. It is obsolete after automatic library initialization and now an internal API. Signed-off-by: orbea --- pppd/eap-tls.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pppd/eap-tls.c b/pppd/eap-tls.c index d70557e..4c0b99b 100644 --- a/pppd/eap-tls.c +++ b/pppd/eap-tls.c @@ -171,7 +171,9 @@ CONF *eaptls_ssl_load_config( void ) #ifndef OPENSSL_NO_ENGINE ENGINE_load_builtin_engines(); #endif +#if !defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER < 0x4000000fL) OPENSSL_load_builtin_modules(); +#endif dbglog( "Loading OpenSSL configured modules" ); if (CONF_modules_load( config, NULL, 0 ) <= 0 ) -- 2.39.5 From 5f6eabdb6666d914e0f8feb3facfa591dee75a1f Mon Sep 17 00:00:00 2001 From: Tomas Paukrt <44699103+tpaukrt@users.noreply.github.com> Date: Thu, 21 Nov 2024 03:53:28 +0100 Subject: [PATCH 07/16] pppd: Fix build without OpenSSL (#533) The symbol OPENSSL_VERSION_NUMBER is not defined when pppd is compiled without OpenSSL support, so it evaluates to zero. This results in the following linker error: crypto.c:241: undefined reference to `ERR_free_strings' Signed-off-by: Tomas Paukrt --- pppd/crypto.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pppd/crypto.c b/pppd/crypto.c index 3576afd..8e98261 100644 --- a/pppd/crypto.c +++ b/pppd/crypto.c @@ -43,7 +43,6 @@ #ifdef PPP_WITH_OPENSSL #include #include -#endif #if OPENSSL_VERSION_NUMBER >= 0x30000000L #include @@ -53,6 +52,7 @@ struct crypto_ctx { OSSL_PROVIDER *provider; } g_crypto_ctx; #endif +#endif PPP_MD_CTX *PPP_MD_CTX_new() { @@ -200,6 +200,7 @@ int PPP_crypto_init() { int retval = 0; +#ifdef PPP_WITH_OPENSSL #if OPENSSL_VERSION_NUMBER >= 0x30000000L g_crypto_ctx.legacy = OSSL_PROVIDER_load(NULL, "legacy"); if (g_crypto_ctx.legacy == NULL) @@ -214,6 +215,7 @@ int PPP_crypto_init() PPP_crypto_error("Could not load default provider"); goto done; } +#endif #endif retval = 1; @@ -225,6 +227,7 @@ done: int PPP_crypto_deinit() { +#ifdef PPP_WITH_OPENSSL #if OPENSSL_VERSION_NUMBER >= 0x30000000L if (g_crypto_ctx.legacy) { OSSL_PROVIDER_unload(g_crypto_ctx.legacy); @@ -239,6 +242,7 @@ int PPP_crypto_deinit() #if OPENSSL_VERSION_NUMBER < 0x10100000L ERR_free_strings(); +#endif #endif return 1; } -- 2.39.5 From 3102b0b61816daad8b0c5b4212db1bf6828cb334 Mon Sep 17 00:00:00 2001 From: DragonBluep <70847398+DragonBluep@users.noreply.github.com> Date: Thu, 21 Nov 2024 11:17:22 +0800 Subject: [PATCH 08/16] pppd: remove redundant rtentry device name init in cifdefaultroute() (#535) The rtentry device name has already been set in commit: 9856f47063c0 ("Specify the device name on the default route deletion") Fixes: 35e5a569c988 (pppd: add support for defaultroute-metric option) Signed-off-by: Shiji Yang --- pppd/sys-linux.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index c0955a0..b497231 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -2279,8 +2279,6 @@ int cifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway) SET_SA_FAMILY (rt.rt_dst, AF_INET); SET_SA_FAMILY (rt.rt_gateway, AF_INET); - rt.rt_dev = ifname; - rt.rt_dev = ifname; rt.rt_metric = dfl_route_metric + 1; /* +1 for binary compatibility */ -- 2.39.5 From 734bc0438e78b7c7cd34acfce3a4ec119d9a50b6 Mon Sep 17 00:00:00 2001 From: DragonBluep <70847398+DragonBluep@users.noreply.github.com> Date: Tue, 26 Nov 2024 17:14:42 +0800 Subject: [PATCH 09/16] pppd: Make pid directory before creating the pid file (#536) If multilink feature is not enabled, the '/var/run/pppd' directory won't be created before adding pid file. Fixes error message: 'Failed to create pid file /var/run/pppd/pppoe-wan.pid: No such file or directory' Signed-off-by: Shiji Yang --- pppd/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/pppd/main.c b/pppd/main.c index 66db6a9..a4bc777 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -923,6 +923,7 @@ create_pidfile(int pid) { FILE *pidfile; + mkdir_recursive(PPP_PATH_VARRUN); slprintf(pidfilename, sizeof(pidfilename), "%s/%s.pid", PPP_PATH_VARRUN, ifname); if ((pidfile = fopen(pidfilename, "w")) != NULL) { -- 2.39.5 From d4ec06ec5839350bd728da0e92a8cb2e1c37d880 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Fri, 20 Dec 2024 12:15:01 +1100 Subject: [PATCH 10/16] Update my copyright notices and remove old RCS tags Make my copyright notices all consistently have a 2-clause BSD licence. Signed-off-by: Paul Mackerras --- PLUGINS | 2 -- chat/chat.8 | 1 - include/linux/ppp-comp.h | 25 +------------------- include/linux/ppp_defs.h | 25 +------------------- pppd/auth.c | 16 ++++--------- pppd/ccp.c | 16 ++++--------- pppd/ccp.h | 16 ++++--------- pppd/chap-md5.c | 16 ++++--------- pppd/chap-md5.h | 14 ++++------- pppd/chap.c | 18 +++++--------- pppd/chap.h | 16 +++++-------- pppd/chap_ms.c | 2 -- pppd/chap_ms.h | 2 -- pppd/demand.c | 16 ++++--------- pppd/eap.h | 2 -- pppd/ecp.c | 14 ++++------- pppd/ecp.h | 2 -- pppd/fsm.h | 2 -- pppd/main.c | 14 ++++------- pppd/mppe.h | 9 ------- pppd/multilink.c | 14 ++++------- pppd/multilink.h | 14 ++++------- pppd/options.c | 2 +- pppd/options.h | 14 ++++------- pppd/pathnames.h | 14 ++++------- pppd/plugins/minconn.c | 11 +-------- pppd/plugins/pppoe/common.c | 3 --- pppd/plugins/pppoe/discovery.c | 3 --- pppd/plugins/pppoe/if.c | 3 --- pppd/plugins/pppoe/plugin.c | 3 --- pppd/plugins/pppoe/pppoe.h | 2 -- pppd/plugins/radius/avpair.c | 2 -- pppd/plugins/radius/buildreq.c | 2 -- pppd/plugins/radius/clientid.c | 2 -- pppd/plugins/radius/config.c | 2 -- pppd/plugins/radius/dict.c | 2 -- pppd/plugins/radius/etc/dictionary.microsoft | 2 -- pppd/plugins/radius/includes.h | 2 -- pppd/plugins/radius/ip_util.c | 2 -- pppd/plugins/radius/lock.c | 2 -- pppd/plugins/radius/md5.c | 3 --- pppd/plugins/radius/options.h | 2 -- pppd/plugins/radius/pathnames.h | 2 -- pppd/plugins/radius/pppd-radattr.8 | 1 - pppd/plugins/radius/pppd-radius.8 | 1 - pppd/plugins/radius/radattr.c | 3 --- pppd/plugins/radius/radius.c | 2 -- pppd/plugins/radius/radiusclient.h | 2 -- pppd/plugins/radius/radrealms.c | 3 --- pppd/plugins/radius/sendserver.c | 2 -- pppd/plugins/radius/util.c | 2 -- pppd/pppd-private.h | 2 -- pppd/pppd.8 | 2 +- pppd/srp-entry.8 | 1 - pppd/sys-linux.c | 14 ++++------- pppd/sys-solaris.c | 14 ++++------- pppd/tty.c | 14 ++++------- pppd/utils.c | 14 ++++------- pppdump/pppdump.8 | 1 - pppdump/pppdump.c | 11 +-------- pppstats/pppstats.8 | 1 - pppstats/pppstats.c | 4 ---- scripts/poff | 1 - 63 files changed, 98 insertions(+), 333 deletions(-) diff --git a/PLUGINS b/PLUGINS index bcaa5f0..96292ed 100644 --- a/PLUGINS +++ b/PLUGINS @@ -327,5 +327,3 @@ access the MPPE keys directly via the: variables. The 2.5.0 release prohibits the direct access of these variables by making them static and private in favor of using the new API. - -## $Id: PLUGINS,v 1.8 2008/06/15 07:02:18 paulus Exp $ ## \ No newline at end of file diff --git a/chat/chat.8 b/chat/chat.8 index 6d10836..2d1b74b 100644 --- a/chat/chat.8 +++ b/chat/chat.8 @@ -1,6 +1,5 @@ .\" -*- nroff -*- .\" manual page [] for chat 1.8 -.\" $Id: chat.8,v 1.11 2004/11/13 12:22:49 paulus Exp $ .\" SH section heading .\" SS subsection heading .\" LP paragraph diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h index 8758e34..b1ed76d 100644 --- a/include/linux/ppp-comp.h +++ b/include/linux/ppp-comp.h @@ -1,7 +1,7 @@ /* * ppp-comp.h - Definitions for doing PPP packet compression. * - * Copyright (c) 1994 Paul Mackerras. All rights reserved. + * Copyright (c) 1994-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -15,15 +15,6 @@ * the documentation and/or other materials provided with the * distribution. * - * 3. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 4. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". - * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY @@ -31,20 +22,6 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * $Id: ppp-comp.h,v 1.10 2002/12/06 09:49:15 paulus Exp $ - */ - -/* - * ==FILEVERSION 20020319== - * - * NOTE TO MAINTAINERS: - * If you modify this file at all, please set the above date. - * ppp-comp.h is shipped with a PPP distribution as well as with the kernel; - * if everyone increases the FILEVERSION number above, then scripts - * can do the right thing when deciding whether to install a new ppp-comp.h - * file. Don't change the format of that line otherwise, so the - * installation script can recognize it. */ #ifndef _NET_PPP_COMP_H diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h index 807d681..5f20649 100644 --- a/include/linux/ppp_defs.h +++ b/include/linux/ppp_defs.h @@ -1,9 +1,7 @@ -/* $Id: ppp_defs.h,v 1.11 2002/12/06 09:49:15 paulus Exp $ */ - /* * ppp_defs.h - PPP definitions. * - * Copyright (c) 1994-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1994-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -17,15 +15,6 @@ * the documentation and/or other materials provided with the * distribution. * - * 3. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 4. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". - * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY @@ -35,18 +24,6 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* - * ==FILEVERSION 20020521== - * - * NOTE TO MAINTAINERS: - * If you modify this file at all, please set the above date. - * ppp_defs.h is shipped with a PPP distribution as well as with the kernel; - * if everyone increases the FILEVERSION number above, then scripts - * can do the right thing when deciding whether to install a new ppp_defs.h - * file. Don't change the format of that line otherwise, so the - * installation script can recognize it. - */ - #ifndef _PPP_DEFS_H_ #define _PPP_DEFS_H_ diff --git a/pppd/auth.c b/pppd/auth.c index f69492e..a8fd1e6 100644 --- a/pppd/auth.c +++ b/pppd/auth.c @@ -1,7 +1,7 @@ /* * auth.c - PPP authentication and phase control. * - * Copyright (c) 1993-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1993-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY @@ -68,8 +64,6 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: auth.c,v 1.117 2008/07/01 12:27:56 paulus Exp $" - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/ccp.c b/pppd/ccp.c index f0311b0..732091f 100644 --- a/pppd/ccp.c +++ b/pppd/ccp.c @@ -1,7 +1,7 @@ /* * ccp.c - PPP Compression Control Protocol. * - * Copyright (c) 1994-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1994-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY @@ -32,8 +28,6 @@ #include "config.h" #endif -#define RCSID "$Id: ccp.c,v 1.50 2005/06/26 19:34:41 carlsonj Exp $" - #include #include #if defined(SOL2) diff --git a/pppd/ccp.h b/pppd/ccp.h index 0a56686..785f702 100644 --- a/pppd/ccp.h +++ b/pppd/ccp.h @@ -1,7 +1,7 @@ /* * ccp.h - Definitions for PPP Compression Control Protocol. * - * Copyright (c) 1994-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1994-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY @@ -26,8 +22,6 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * $Id: ccp.h,v 1.12 2004/11/04 10:02:26 paulus Exp $ */ #ifndef PPP_CCP_H #define PPP_CCP_H diff --git a/pppd/chap-md5.c b/pppd/chap-md5.c index b928ce9..7b66ae2 100644 --- a/pppd/chap-md5.c +++ b/pppd/chap-md5.c @@ -1,7 +1,7 @@ /* * chap-md5.c - New CHAP/MD5 implementation. * - * Copyright (c) 2003 Paul Mackerras. All rights reserved. + * Copyright (c) 2003-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY @@ -28,8 +24,6 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: chap-md5.c,v 1.4 2004/11/09 22:39:25 paulus Exp $" - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/chap-md5.h b/pppd/chap-md5.h index e5ced4e..62fca9e 100644 --- a/pppd/chap-md5.h +++ b/pppd/chap-md5.h @@ -1,7 +1,7 @@ /* * chap-md5.h - New CHAP/MD5 implementation. * - * Copyright (c) 2003 Paul Mackerras. All rights reserved. + * Copyright (c) 2003-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/chap.c b/pppd/chap.c index d0009e8..7af7991 100644 --- a/pppd/chap.c +++ b/pppd/chap.c @@ -1,7 +1,7 @@ /* - * chap-new.c - New CHAP implementation. + * chap.c - New CHAP implementation. * - * Copyright (c) 2003 Paul Mackerras. All rights reserved. + * Copyright (c) 2003-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY @@ -28,8 +24,6 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: chap-new.c,v 1.9 2007/06/19 02:08:35 carlsonj Exp $" - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/chap.h b/pppd/chap.h index 2c69e77..77c077e 100644 --- a/pppd/chap.h +++ b/pppd/chap.h @@ -1,7 +1,7 @@ /* - * chap-new.c - New CHAP implementation. + * chap.h - New CHAP implementation. * - * Copyright (c) 2003 Paul Mackerras. All rights reserved. + * Copyright (c) 2003-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/chap_ms.c b/pppd/chap_ms.c index e3d808f..6c8ef91 100644 --- a/pppd/chap_ms.c +++ b/pppd/chap_ms.c @@ -74,8 +74,6 @@ * */ -#define RCSID "$Id: chap_ms.c,v 1.38 2007/12/01 20:10:51 carlsonj Exp $" - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/chap_ms.h b/pppd/chap_ms.h index b3fdae6..7bcbbfc 100644 --- a/pppd/chap_ms.h +++ b/pppd/chap_ms.h @@ -26,8 +26,6 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * $Id: chap_ms.h,v 1.13 2004/11/15 22:13:26 paulus Exp $ */ #ifndef PPP_CHAPMS_H diff --git a/pppd/demand.c b/pppd/demand.c index b7f9508..d8c46fe 100644 --- a/pppd/demand.c +++ b/pppd/demand.c @@ -1,7 +1,7 @@ /* * demand.c - Support routines for demand-dialling. * - * Copyright (c) 1996-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1996-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY @@ -28,8 +24,6 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: demand.c,v 1.20 2005/08/25 12:14:18 paulus Exp $" - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/eap.h b/pppd/eap.h index 50c652a..a9a1d82 100644 --- a/pppd/eap.h +++ b/pppd/eap.h @@ -16,8 +16,6 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * Original version by James Carlson - * - * $Id: eap.h,v 1.2 2003/06/11 23:56:26 paulus Exp $ */ #ifndef PPP_EAP_H diff --git a/pppd/ecp.c b/pppd/ecp.c index ffd2801..44c06d9 100644 --- a/pppd/ecp.c +++ b/pppd/ecp.c @@ -30,7 +30,7 @@ * * Derived from ccp.c, which is: * - * Copyright (c) 1994-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1994-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -39,14 +39,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/ecp.h b/pppd/ecp.h index 975d79b..b01969b 100644 --- a/pppd/ecp.h +++ b/pppd/ecp.h @@ -27,8 +27,6 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * $Id: ecp.h,v 1.2 2003/01/10 07:12:36 fcusack Exp $ */ #ifndef PPP_ECP_H #define PPP_ECP_H diff --git a/pppd/fsm.h b/pppd/fsm.h index 50f75e6..92f024a 100644 --- a/pppd/fsm.h +++ b/pppd/fsm.h @@ -38,8 +38,6 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * $Id: fsm.h,v 1.10 2004/11/13 02:28:15 paulus Exp $ */ #ifndef PPP_FSM_H #define PPP_FSM_H diff --git a/pppd/main.c b/pppd/main.c index a4bc777..32ad489 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -39,7 +39,7 @@ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * Copyright (c) 1999-2020 Paul Mackerras. All rights reserved. + * Copyright (c) 1999-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -48,14 +48,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/mppe.h b/pppd/mppe.h index 376eb62..f2a4cb2 100644 --- a/pppd/mppe.h +++ b/pppd/mppe.h @@ -15,15 +15,6 @@ * the documentation and/or other materials provided with the * distribution. * - * 3. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 4. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". - * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY diff --git a/pppd/multilink.c b/pppd/multilink.c index b44d2bb..d5423da 100644 --- a/pppd/multilink.c +++ b/pppd/multilink.c @@ -1,7 +1,7 @@ /* * multilink.c - support routines for multilink. * - * Copyright (c) 2000-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 2000-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/multilink.h b/pppd/multilink.h index 8afdadd..07ea4b2 100644 --- a/pppd/multilink.h +++ b/pppd/multilink.h @@ -1,7 +1,7 @@ /* * multilink.h - support routines for multilink. * - * Copyright (c) 2000-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 2000-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/options.c b/pppd/options.c index 36f59a9..879223d 100644 --- a/pppd/options.c +++ b/pppd/options.c @@ -1177,7 +1177,7 @@ usage(void) FILE *fp = stderr; if (in_phase(PHASE_INITIALIZE)) { fprintf(fp, "%s v%s\n", PACKAGE_NAME, PACKAGE_VERSION); - fprintf(fp, "Copyright (C) 1999-2022 Paul Mackerras, and others. All rights reserved.\n\n"); + fprintf(fp, "Copyright (C) 1999-2024 Paul Mackerras, and others. All rights reserved.\n\n"); fprintf(fp, "License BSD: The 3 clause BSD license \n"); diff --git a/pppd/options.h b/pppd/options.h index 8634e87..4ed0892 100644 --- a/pppd/options.h +++ b/pppd/options.h @@ -1,7 +1,7 @@ /* * options.h - header declarations for option processing for PPP. * - * Copyright (c) 2000-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 2000-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/pathnames.h b/pppd/pathnames.h index d08e8ef..ddc5e76 100644 --- a/pppd/pathnames.h +++ b/pppd/pathnames.h @@ -1,7 +1,7 @@ /* * pathnames.h - define default paths for pppd * - * Copyright (c) 1999-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1999-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/plugins/minconn.c b/pppd/plugins/minconn.c index cd61ccd..016526d 100644 --- a/pppd/plugins/minconn.c +++ b/pppd/plugins/minconn.c @@ -1,7 +1,7 @@ /* * minconn.c - pppd plugin to implement a `minconnect' option. * - * Copyright (c) 1999 Paul Mackerras. All rights reserved. + * Copyright (c) 1999-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -15,15 +15,6 @@ * the documentation and/or other materials provided with the * distribution. * - * 3. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 4. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". - * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY diff --git a/pppd/plugins/pppoe/common.c b/pppd/plugins/pppoe/common.c index 31811f5..8d3b21a 100644 --- a/pppd/plugins/pppoe/common.c +++ b/pppd/plugins/pppoe/common.c @@ -13,9 +13,6 @@ * ***********************************************************************/ -static char const RCSID[] = -"$Id: common.c,v 1.3 2008/06/09 08:34:23 paulus Exp $"; - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/plugins/pppoe/discovery.c b/pppd/plugins/pppoe/discovery.c index c1df4ff..86bda61 100644 --- a/pppd/plugins/pppoe/discovery.c +++ b/pppd/plugins/pppoe/discovery.c @@ -8,9 +8,6 @@ * ***********************************************************************/ -static char const RCSID[] = -"$Id: discovery.c,v 1.6 2008/06/15 04:35:50 paulus Exp $"; - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/plugins/pppoe/if.c b/pppd/plugins/pppoe/if.c index d5a4624..8a0f608 100644 --- a/pppd/plugins/pppoe/if.c +++ b/pppd/plugins/pppoe/if.c @@ -13,9 +13,6 @@ * ***********************************************************************/ -static char const RCSID[] = -"$Id: if.c,v 1.2 2008/06/09 08:34:23 paulus Exp $"; - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/plugins/pppoe/plugin.c b/pppd/plugins/pppoe/plugin.c index 00e68d5..b429a2f 100644 --- a/pppd/plugins/pppoe/plugin.c +++ b/pppd/plugins/pppoe/plugin.c @@ -22,9 +22,6 @@ * ***********************************************************************/ -static char const RCSID[] = -"$Id: plugin.c,v 1.17 2008/06/15 04:35:50 paulus Exp $"; - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/plugins/pppoe/pppoe.h b/pppd/plugins/pppoe/pppoe.h index 2eb97bd..1952dcb 100644 --- a/pppd/plugins/pppoe/pppoe.h +++ b/pppd/plugins/pppoe/pppoe.h @@ -9,8 +9,6 @@ * This program may be distributed according to the terms of the GNU * General Public License, version 2 or (at your option) any later version. * -* $Id: pppoe.h,v 1.4 2008/06/15 04:35:50 paulus Exp $ -* ***********************************************************************/ #include /* For FILE */ diff --git a/pppd/plugins/radius/avpair.c b/pppd/plugins/radius/avpair.c index c1e6d28..5ad1cc9 100644 --- a/pppd/plugins/radius/avpair.c +++ b/pppd/plugins/radius/avpair.c @@ -1,6 +1,4 @@ /* - * $Id: avpair.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/plugins/radius/buildreq.c b/pppd/plugins/radius/buildreq.c index c1fda5a..fe6a854 100644 --- a/pppd/plugins/radius/buildreq.c +++ b/pppd/plugins/radius/buildreq.c @@ -1,6 +1,4 @@ /* - * $Id: buildreq.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1997 Lars Fenneberg * * See the file COPYRIGHT for the respective terms and conditions. diff --git a/pppd/plugins/radius/clientid.c b/pppd/plugins/radius/clientid.c index bf26947..94a23a6 100644 --- a/pppd/plugins/radius/clientid.c +++ b/pppd/plugins/radius/clientid.c @@ -1,6 +1,4 @@ /* - * $Id: clientid.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1996,1997 Lars Fenneberg * * See the file COPYRIGHT for the respective terms and conditions. diff --git a/pppd/plugins/radius/config.c b/pppd/plugins/radius/config.c index e1a4814..0499911 100644 --- a/pppd/plugins/radius/config.c +++ b/pppd/plugins/radius/config.c @@ -1,6 +1,4 @@ /* - * $Id: config.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1996,1997 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/plugins/radius/dict.c b/pppd/plugins/radius/dict.c index 6f2657d..fca8a8b 100644 --- a/pppd/plugins/radius/dict.c +++ b/pppd/plugins/radius/dict.c @@ -1,6 +1,4 @@ /* - * $Id: dict.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 2002 Roaring Penguin Software Inc. * * Copyright (C) 1995,1996,1997 Lars Fenneberg diff --git a/pppd/plugins/radius/etc/dictionary.microsoft b/pppd/plugins/radius/etc/dictionary.microsoft index da3a317..8c7d33c 100644 --- a/pppd/plugins/radius/etc/dictionary.microsoft +++ b/pppd/plugins/radius/etc/dictionary.microsoft @@ -1,8 +1,6 @@ # # Microsoft's VSA's, from RFC 2548 # -# $Id: dictionary.microsoft,v 1.1 2004/11/14 07:26:26 paulus Exp $ -# VENDOR Microsoft 311 Microsoft diff --git a/pppd/plugins/radius/includes.h b/pppd/plugins/radius/includes.h index 1e6d87a..dae1b3b 100644 --- a/pppd/plugins/radius/includes.h +++ b/pppd/plugins/radius/includes.h @@ -1,6 +1,4 @@ /* - * $Id: includes.h,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1997 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/plugins/radius/ip_util.c b/pppd/plugins/radius/ip_util.c index f443185..43a7ff0 100644 --- a/pppd/plugins/radius/ip_util.c +++ b/pppd/plugins/radius/ip_util.c @@ -1,6 +1,4 @@ /* - * $Id: ip_util.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1996,1997 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/plugins/radius/lock.c b/pppd/plugins/radius/lock.c index 482e97c..50e54fa 100644 --- a/pppd/plugins/radius/lock.c +++ b/pppd/plugins/radius/lock.c @@ -1,6 +1,4 @@ /* - * $Id: lock.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1997 Lars Fenneberg * * See the file COPYRIGHT for the respective terms and conditions. diff --git a/pppd/plugins/radius/md5.c b/pppd/plugins/radius/md5.c index ec3a7dd..5038c9a 100644 --- a/pppd/plugins/radius/md5.c +++ b/pppd/plugins/radius/md5.c @@ -1,6 +1,3 @@ -/* - * $Id: md5.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - */ #include #include diff --git a/pppd/plugins/radius/options.h b/pppd/plugins/radius/options.h index f4ad986..4842882 100644 --- a/pppd/plugins/radius/options.h +++ b/pppd/plugins/radius/options.h @@ -1,6 +1,4 @@ /* - * $Id: options.h,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1996 Lars Fenneberg * * See the file COPYRIGHT for the respective terms and conditions. diff --git a/pppd/plugins/radius/pathnames.h b/pppd/plugins/radius/pathnames.h index 3a00d2c..0a8495e 100644 --- a/pppd/plugins/radius/pathnames.h +++ b/pppd/plugins/radius/pathnames.h @@ -1,6 +1,4 @@ /* - * $Id: pathnames.h,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1996 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/plugins/radius/pppd-radattr.8 b/pppd/plugins/radius/pppd-radattr.8 index 1346fdd..5c54d2e 100644 --- a/pppd/plugins/radius/pppd-radattr.8 +++ b/pppd/plugins/radius/pppd-radattr.8 @@ -1,5 +1,4 @@ .\" manual page [] for RADATTR plugin for pppd 2.4 -.\" $Id: pppd-radattr.8,v 1.2 2003/04/25 07:33:20 fcusack Exp $ .\" SH section heading .\" SS subsection heading .\" LP paragraph diff --git a/pppd/plugins/radius/pppd-radius.8 b/pppd/plugins/radius/pppd-radius.8 index 8628d08..9393851 100644 --- a/pppd/plugins/radius/pppd-radius.8 +++ b/pppd/plugins/radius/pppd-radius.8 @@ -1,5 +1,4 @@ .\" manual page [] for RADIUS plugin for pppd 2.4 -.\" $Id: pppd-radius.8,v 1.5 2004/03/26 13:27:17 kad Exp $ .\" SH section heading .\" SS subsection heading .\" LP paragraph diff --git a/pppd/plugins/radius/radattr.c b/pppd/plugins/radius/radattr.c index 802cb66..69ee766 100644 --- a/pppd/plugins/radius/radattr.c +++ b/pppd/plugins/radius/radattr.c @@ -14,9 +14,6 @@ * ***********************************************************************/ -static char const RCSID[] = -"$Id: radattr.c,v 1.2 2004/10/28 00:24:40 paulus Exp $"; - #include #include #include diff --git a/pppd/plugins/radius/radius.c b/pppd/plugins/radius/radius.c index e99bc75..cec02f4 100644 --- a/pppd/plugins/radius/radius.c +++ b/pppd/plugins/radius/radius.c @@ -23,8 +23,6 @@ * General Public License, version 2 or (at your option) any later version. * ***********************************************************************/ -static char const RCSID[] = -"$Id: radius.c,v 1.32 2008/05/26 09:18:08 paulus Exp $"; #include #include diff --git a/pppd/plugins/radius/radiusclient.h b/pppd/plugins/radius/radiusclient.h index 5292ce1..0af23ac 100644 --- a/pppd/plugins/radius/radiusclient.h +++ b/pppd/plugins/radius/radiusclient.h @@ -1,6 +1,4 @@ /* - * $Id: radiusclient.h,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1996,1997,1998 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/plugins/radius/radrealms.c b/pppd/plugins/radius/radrealms.c index ab923cc..2702a40 100644 --- a/pppd/plugins/radius/radrealms.c +++ b/pppd/plugins/radius/radrealms.c @@ -14,9 +14,6 @@ * */ -static char const RCSID[] = - "$Id: radrealms.c,v 1.2 2004/11/14 07:26:26 paulus Exp $"; - #include #include #include diff --git a/pppd/plugins/radius/sendserver.c b/pppd/plugins/radius/sendserver.c index 6553b0e..5464895 100644 --- a/pppd/plugins/radius/sendserver.c +++ b/pppd/plugins/radius/sendserver.c @@ -1,6 +1,4 @@ /* - * $Id: sendserver.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1996,1997 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/plugins/radius/util.c b/pppd/plugins/radius/util.c index 4065724..aaadb28 100644 --- a/pppd/plugins/radius/util.c +++ b/pppd/plugins/radius/util.c @@ -1,6 +1,4 @@ /* - * $Id: util.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1996,1997 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/pppd-private.h b/pppd/pppd-private.h index a1db34d..d8ec443 100644 --- a/pppd/pppd-private.h +++ b/pppd/pppd-private.h @@ -38,8 +38,6 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * $Id: pppd.h,v 1.96 2008/06/23 11:47:18 paulus Exp $ */ #ifndef PPP_PPPD_PRIVATE_H diff --git a/pppd/pppd.8 b/pppd/pppd.8 index 3279e4b..d2c88e3 100644 --- a/pppd/pppd.8 +++ b/pppd/pppd.8 @@ -5,7 +5,7 @@ .\" IP indented paragraph .\" TP hanging label .\" -.\" Copyright (c) 1993-2003 Paul Mackerras +.\" Copyright (c) 1993-2024 Paul Mackerras .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above diff --git a/pppd/srp-entry.8 b/pppd/srp-entry.8 index 097281a..7564c08 100644 --- a/pppd/srp-entry.8 +++ b/pppd/srp-entry.8 @@ -1,5 +1,4 @@ .\" manual page [] for srp-entry -.\" $Id: srp-entry.8,v 1.2 2004/11/13 12:22:49 paulus Exp $ .\" SH section heading .\" SS subsection heading .\" LP paragraph diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index b497231..b94f3ec 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -2,7 +2,7 @@ * sys-linux.c - System-dependent procedures for setting up * PPP interfaces on Linux systems * - * Copyright (c) 1994-2004 Paul Mackerras. All rights reserved. + * Copyright (c) 1994-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -11,14 +11,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/sys-solaris.c b/pppd/sys-solaris.c index eecf50f..e442108 100644 --- a/pppd/sys-solaris.c +++ b/pppd/sys-solaris.c @@ -18,7 +18,7 @@ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES * - * Copyright (c) 1995-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1995-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,14 +27,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/tty.c b/pppd/tty.c index d22ded7..2531ce1 100644 --- a/pppd/tty.c +++ b/pppd/tty.c @@ -1,7 +1,7 @@ /* * tty.c - code for handling serial ports in pppd. * - * Copyright (C) 2000-2004 Paul Mackerras. All rights reserved. + * Copyright (C) 2000-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/utils.c b/pppd/utils.c index edda503..c995e3c 100644 --- a/pppd/utils.c +++ b/pppd/utils.c @@ -1,7 +1,7 @@ /* * utils.c - various utility functions used in pppd. * - * Copyright (c) 1999-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1999-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppdump/pppdump.8 b/pppdump/pppdump.8 index 1116b85..c3f29f9 100644 --- a/pppdump/pppdump.8 +++ b/pppdump/pppdump.8 @@ -1,4 +1,3 @@ -.\" @(#) $Id: pppdump.8,v 1.2 2004/11/13 12:22:49 paulus Exp $ .TH PPPDUMP 8 "1 April 1999" .SH NAME pppdump \- convert PPP record file to readable format diff --git a/pppdump/pppdump.c b/pppdump/pppdump.c index 16a5ffb..c24208a 100644 --- a/pppdump/pppdump.c +++ b/pppdump/pppdump.c @@ -2,7 +2,7 @@ * pppdump - print out the contents of a record file generated by * pppd in readable form. * - * Copyright (c) 1999 Paul Mackerras. All rights reserved. + * Copyright (c) 1999-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -16,15 +16,6 @@ * the documentation and/or other materials provided with the * distribution. * - * 3. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 4. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". - * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY diff --git a/pppstats/pppstats.8 b/pppstats/pppstats.8 index cabf4d7..94c6fc5 100644 --- a/pppstats/pppstats.8 +++ b/pppstats/pppstats.8 @@ -1,4 +1,3 @@ -.\" @(#) $Id: pppstats.8,v 1.4 2004/11/13 12:22:49 paulus Exp $ .TH PPPSTATS 8 "26 June 1995" .SH NAME pppstats \- print PPP statistics diff --git a/pppstats/pppstats.c b/pppstats/pppstats.c index 22d1154..606ea51 100644 --- a/pppstats/pppstats.c +++ b/pppstats/pppstats.c @@ -35,10 +35,6 @@ #define const #endif -#ifndef lint -static const char rcsid[] = "$Id: pppstats.c,v 1.29 2002/10/27 12:56:26 fcusack Exp $"; -#endif - #include #include #include diff --git a/scripts/poff b/scripts/poff index 5b45d98..38b888b 100644 --- a/scripts/poff +++ b/scripts/poff @@ -1,6 +1,5 @@ #!/bin/sh -# $Id: poff,v 1.1 2002/11/24 23:30:44 etbe Exp $ # Written by John Hasler and based on work # by Phil Hands . Distributed under the GNU GPL -- 2.39.5 From 95594918d08ca2c8f48babb7903fb65803302ebd Mon Sep 17 00:00:00 2001 From: Jaco Kroon Date: Mon, 30 Dec 2024 05:47:21 +0200 Subject: [PATCH 11/16] .gitattributes to exclude .git* files from git-archive. (#539) This relates to #519 and addresses the portion where "we can also exclude things like /.github/ from the release". Signed-off-by: Jaco Kroon --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..834c029 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Exclude .git* files from being exported. +.git* export-ignore -- 2.39.5 From 5efd40cf3be955aa2857c61be759299ca238dda2 Mon Sep 17 00:00:00 2001 From: "[anp/hsw]" Date: Mon, 30 Dec 2024 12:21:55 +0700 Subject: [PATCH 12/16] disable holdoff for reconnect on timeout or link failure (#538) Signed-off-by: [anp/hsw] --- pppd/auth.c | 1 + pppd/main.c | 5 ++++- pppd/pppd.8 | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pppd/auth.c b/pppd/auth.c index a8fd1e6..a78a697 100644 --- a/pppd/auth.c +++ b/pppd/auth.c @@ -1325,6 +1325,7 @@ connect_time_expired(void *arg) info("Connect time expired"); ppp_set_status(EXIT_CONNECT_TIME); lcp_close(0, "Connect time expired"); /* Close connection */ + need_holdoff = 0; } /* diff --git a/pppd/main.c b/pppd/main.c index 32ad489..3b3fc45 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -607,8 +607,10 @@ main(int argc, char *argv[]) while (phase != PHASE_DEAD) { handle_events(); get_input(); - if (kill_link) + if (kill_link) { lcp_close(0, "User request"); + need_holdoff = 0; + } if (asked_to_quit) { bundle_terminating = 1; if (phase == PHASE_MASTER) @@ -1149,6 +1151,7 @@ get_input(void) notice("Modem hangup"); hungup = 1; code = EXIT_HANGUP; + need_holdoff = 0; lcp_lowerdown(0); /* serial link is no longer available */ link_terminated(0); return; diff --git a/pppd/pppd.8 b/pppd/pppd.8 index d2c88e3..3a787a0 100644 --- a/pppd/pppd.8 +++ b/pppd/pppd.8 @@ -475,7 +475,8 @@ exclude the password string from the log. This is the default. Specifies how many seconds to wait before re-initiating the link after it terminates. This option only has any effect if the \fIpersist\fR or \fIdemand\fR option is used. The holdoff period is not applied if -the link was terminated because it was idle. +the link was terminated because it was idle, connect time expired, +modem hangup or user request. .TP .B idle \fIn Specifies that pppd should disconnect if the link is idle for \fIn\fR -- 2.39.5 From 0885c4b2663481ebea94e158b17289a7a39a91ca Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Tue, 31 Dec 2024 09:45:06 +1100 Subject: [PATCH 13/16] configure: Make PEAP depend on microsoft extensions (#540) Since our only PEAP mechanism is MS-CHAP v2, the compile fails if we enable PEAP without MS extensions. Therefore, for now make PEAP depend on MS extensions, so if MS extensions are disabled, PEAP is automatically disabled. Signed-off-by: Paul Mackerras --- configure.ac | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index f8f8862..0ae420f 100644 --- a/configure.ac +++ b/configure.ac @@ -130,9 +130,9 @@ AM_COND_IF([PPP_WITH_CBCP], AC_DEFINE([PPP_WITH_CBCP], 1, [Have Callback Protocol support])) # -# Disable Microsoft extensions will remove CHAP and MPPE support +# Disable Microsoft extensions will remove CHAP, MPPE and PEAP support AC_ARG_ENABLE([microsoft-extensions], - AS_HELP_STRING([--disable-microsoft-extensions], [Disable Microsoft CHAP / MPPE extensions])) + AS_HELP_STRING([--disable-microsoft-extensions], [Disable Microsoft CHAP / MPPE / PEAP extensions])) AM_CONDITIONAL(PPP_WITH_CHAPMS, test "x${enable_microsoft_extensions}" != "xno") AM_COND_IF([PPP_WITH_CHAPMS], @@ -193,9 +193,9 @@ AM_CONDITIONAL(PPP_WITH_EAPTLS, test "x${enable_eaptls}" != "xno") # Disable PEAP support AC_ARG_ENABLE([peap], AS_HELP_STRING([--disable-peap], [Disable PEAP authentication support])) -AS_IF([test "x${enable_peap}" != "xno"], +AS_IF([test "x${enable_peap}" != "xno" && test "x${enable_microsoft_extensions}" != "xno"], AC_DEFINE([PPP_WITH_PEAP], 1, [Have PEAP authentication support])) -AM_CONDITIONAL([PPP_WITH_PEAP], test "x${enable_peap}" != "xno") +AM_CONDITIONAL([PPP_WITH_PEAP], test "x${enable_peap}" != "xno" && test "x${enable_microsoft_extensions}" != "xno") # # Disable OpenSSL engine support @@ -359,6 +359,5 @@ Features enabled CBCP.................: ${enable_cbcp:-no} IPV6CP...............: ${enable_ipv6cp:-yes} EAP-TLS..............: ${enable_eaptls:-yes} - PEAP.................: ${enable_peap:-yes} systemd notifications: ${enable_systemd:-no} " -- 2.39.5 From a232b7140331a9bd2c76dae5357ece33a6b7313a Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Tue, 31 Dec 2024 09:56:27 +1100 Subject: [PATCH 14/16] Update a few more copyright notices Signed-off-by: Paul Mackerras --- chat/chat.c | 2 +- pppd/mppe.c | 2 +- pppd/mppe.h | 2 +- pppd/plugins/winbind.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/chat/chat.c b/chat/chat.c index 0a4fbd3..788c42b 100644 --- a/chat/chat.c +++ b/chat/chat.c @@ -3,7 +3,7 @@ * Chat -- a program for automatic session establishment (i.e. dial * the phone and log in). * - * This version is Copyright 1995-2023 Paul Mackerras + * This version is Copyright 1995-2024 Paul Mackerras * based on the original public-domain version by Karl Fox. * * Permission is hereby granted, free of charge, to any person diff --git a/pppd/mppe.c b/pppd/mppe.c index da10338..880b278 100644 --- a/pppd/mppe.c +++ b/pppd/mppe.c @@ -1,7 +1,7 @@ /* mppe.c - MPPE key implementation * * Copyright (c) 2020 Eivind Naess. All rights reserved. - * Copyright (c) 2008 Paul Mackerras. All rights reserved. + * Copyright (c) 2008-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/pppd/mppe.h b/pppd/mppe.h index f2a4cb2..8ff27b9 100644 --- a/pppd/mppe.h +++ b/pppd/mppe.h @@ -1,7 +1,7 @@ /* * mppe.h - Definitions for MPPE * - * Copyright (c) 2008 Paul Mackerras. All rights reserved. + * Copyright (c) 2008-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/pppd/plugins/winbind.c b/pppd/plugins/winbind.c index a3e5aa0..7af6ed1 100644 --- a/pppd/plugins/winbind.c +++ b/pppd/plugins/winbind.c @@ -7,9 +7,10 @@ * * Based on the structure of the radius module. * +* Copyright 1999-2024 Paul Mackerras * Copyright (C) 2003 Andrew Bartlet * -* Copyright 1999 Paul Mackerras, Alan Curry. +* Copyright 1999 Alan Curry. * (pipe read code from passpromt.c) * * Copyright (C) 2002 Roaring Penguin Software Inc. -- 2.39.5 From 8eca3c738d7b4573ed8356a31d347daac8bc38cf Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Tue, 31 Dec 2024 10:10:55 +1100 Subject: [PATCH 15/16] Update README and configure.ac for 2.5.2 release Signed-off-by: Paul Mackerras --- README | 18 +++++++++++++++++- configure.ac | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/README b/README index 43c4555..67e6abb 100644 --- a/README +++ b/README @@ -67,9 +67,25 @@ use any IP address. (This only applies where the peer is authenticating itself to you, of course.) -What's new in ppp-2.5.1 +What's new in ppp-2.5.2 *********************** +* Some old and probably unused code has been removed, notably the + pppgetpass program and the passprompt plugin, and some of the files + in the sample and scripts directories. + +* If a remote number has been set, it is available to scripts in the + REMOTENUMBER environment variable. + +* The Solaris port has been updated, including updated installation + instructions in README.sol2. + +* Various other bug fixes and minor enhancements. + + +What was new in ppp-2.5.1 +************************* + * The files copied to /etc/ppp (or /ppp) now have ".example" appended to their filenames, so as to indicate that they are just examples, and to avoid overwriting existing configuration diff --git a/configure.ac b/configure.ac index 0ae420f..8f20192 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.69]) AC_INIT([ppp], - [2.5.2-dev], + [2.5.2], [https://github.com/ppp-project/ppp]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) -- 2.39.5 From 9f612dc02c34509f062ed63b60bcc7e937e25178 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Tue, 31 Dec 2024 15:24:46 +1100 Subject: [PATCH 16/16] config: Include some extra files in the tarball Signed-off-by: Paul Mackerras --- Makefile.am | 10 ++++++++-- pppd/Makefile.am | 5 +++-- scripts/Makefile.am | 4 +++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8d3dff8..98d7730 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,10 @@ sample_DATA = \ EXTRA_README = \ Changes-2.3 \ + Changes-2.4 \ FAQ \ + LICENSE.BSD \ + LICENSE.GPL-2 \ README \ README.cbcp \ README.eap-srp \ @@ -38,9 +41,12 @@ EXTRA_README = \ README.pwfd \ README.sol2 \ PLUGINS \ + SECURITY.md \ SETUP \ - Submitting-patches.md + Submitting-patches.md \ + autogen.sh EXTRA_DIST= \ $(sample_DATA) \ - $(EXTRA_README) + $(EXTRA_README) \ + sample diff --git a/pppd/Makefile.am b/pppd/Makefile.am index f2fb192..93dbeed 100644 --- a/pppd/Makefile.am +++ b/pppd/Makefile.am @@ -28,7 +28,6 @@ check_PROGRAMS += utest_utils if WITH_SRP sbin_PROGRAMS += srp-entry -dist_man8_MANS += srp-entry.8 endif pkgconfigdir = $(libdir)/pkgconfig @@ -205,6 +204,7 @@ srp_entry_SOURCES = srp-entry.c srp_entry_CPPFLAGS = $(OPENSSL_INCLUDES) $(SRP_CFLAGS) srp_entry_LDADD = $(SRP_LIBS) $(OPENSSL_LIBS) srp_entry_LDFLAGS = $(OPENSSL_LDFLAGS) $(SRP_LDFLAGS) +dist_srp_entry_MANS = srp-entry.8 pppd_CPPFLAGS += $(SRP_CFLAGS) pppd_LDFLAGS += $(SRP_LDFLAGS) @@ -214,7 +214,8 @@ endif pppd_LDADD = $(pppd_LIBS) EXTRA_DIST = \ - ppp.pam + ppp.pam \ + srp-entry.8 TESTS = $(check_PROGRAMS) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d2779cb..65b15f9 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -5,7 +5,9 @@ EXTRA_SCRIPTS = \ plog \ poff \ pon \ - pon.1 + pon.1 \ + lcp_rtt_dump \ + lcp_rtt_exporter EXTRA_DIST= \ $(EXTRA_SCRIPTS) -- 2.39.5