diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2007-08-05 22:32:49 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2007-08-05 22:32:49 +0000 |
| commit | 918926d6c15ed3a43aee10997bc93df14a2a8625 (patch) | |
| tree | a11bbf79c5cf9931c809555783e8ef6cfdcda726 /net/poptop/files/patch-pptpd.c | |
| parent | 7637ff99a2a5b2e787fe74744ddd0f047dc22e67 (diff) | |
| download | ports-918926d6c15ed3a43aee10997bc93df14a2a8625.tar.gz ports-918926d6c15ed3a43aee10997bc93df14a2a8625.zip | |
Notes
Diffstat (limited to 'net/poptop/files/patch-pptpd.c')
| -rw-r--r-- | net/poptop/files/patch-pptpd.c | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/net/poptop/files/patch-pptpd.c b/net/poptop/files/patch-pptpd.c index 0f8c68cb25d3..c45f48c77063 100644 --- a/net/poptop/files/patch-pptpd.c +++ b/net/poptop/files/patch-pptpd.c @@ -1,6 +1,15 @@ ---- pptpd.c.orig Fri Oct 21 12:10:41 2005 -+++ pptpd.c Fri Oct 21 12:12:30 2005 -@@ -109,13 +109,13 @@ +--- pptpd.c.orig Tue Sep 5 01:17:25 2006 ++++ pptpd.c Tue Jul 31 08:19:38 2007 +@@ -98,18 +98,21 @@ + printf(" [-i] [--noipparam] Suppress the passing of the client's IP address\n"); + printf(" to PPP, which is done by default otherwise.\n"); + printf(" [-l] [--listen x.x.x.x] Specifies IP of local interface to listen to.\n"); +-#if !defined(BSDUSER_PPP) ++#ifdef BSDUSER_PPP ++ printf(" [-o] [--option file] Specifies the userland PPP system label to use\n"); ++ printf(" (default is pptp).\n"); ++#else + printf(" [-o] [--option file] Specifies the PPP options file to use\n"); printf(" (default is /etc/ppp/options).\n"); #endif printf(" [-p] [--pidfile file] Specifies the file to write the process ID to\n"); @@ -16,4 +25,21 @@ + printf(" (default is %s).\n",STIMEOUT_DEFAULT); printf(" [-v] [--version] Displays the pptpd version number.\n"); printf(" [-w] [--logwtmp] Update wtmp as users login.\n"); - + printf(" [-C] [--connections n] Limit on number of connections.\n"); +@@ -375,11 +378,16 @@ + return 1; + } + /* check that the PPP options file is readable */ ++ /* If -o or --option is being used to specify BSD userland ++ PPP system label, it makes no sense to check the option string to ++ see if it is the name of a readable file. */ ++#if !defined(BSDUSER_PPP) + if (pppdoptstr && access(pppdoptstr, R_OK) < 0) { + syslog(LOG_ERR, "MGR: PPP options file %s not readable", + pppdoptstr); + return 1; + } ++#endif + #ifdef BCRELAY + /* check that the bcrelay binary is executable */ + if (bcrelay && access(BCRELAY_BIN, X_OK) < 0) { |