From: Paul Mackerras <paulus@ozlabs.org>
Date: Fri, 9 Sep 2022 02:06:37 +0000 (+1000)
Subject: Merge pull request #365 from enaess/ppp-options
X-Git-Tag: ppp-2.5.0~25
X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=a14ede90df712b4a0fed82b9a66a81c56e1e97a9;hp=-c

Merge pull request #365 from enaess/ppp-options

Add option to show all options (show-options)
---

a14ede90df712b4a0fed82b9a66a81c56e1e97a9
diff --combined pppd/main.c
index 8d5f32b,2eec966..b302c08
--- a/pppd/main.c
+++ b/pppd/main.c
@@@ -109,7 -109,6 +109,7 @@@
  #include "ccp.h"
  #include "ecp.h"
  #include "pathnames.h"
 +#include "ppp-crypto.h"
  
  #ifdef PPP_WITH_TDB
  #include "tdb.h"
@@@ -295,8 -294,6 +295,8 @@@ main(int argc, char *argv[]
      struct protent *protp;
      char numbuf[16];
  
 +    PPP_crypto_init();
 +
      strlcpy(path_ipup, PPP_PATH_IPUP, MAXPATHLEN);
      strlcpy(path_ipdown, PPP_PATH_IPDOWN, MAXPATHLEN);
  
@@@ -367,6 -364,11 +367,11 @@@
      if (debug)
  	setlogmask(LOG_UPTO(LOG_DEBUG));
  
+     if (show_options) {
+ 	showopts();
+ 	die(0);
+     }
+ 
      /*
       * Check that we are running as root.
       */
@@@ -584,7 -586,6 +589,7 @@@
  	}
      }
  
 +    PPP_crypto_deinit();
      die(status);
      return 0;
  }