Merge pull request #365 from enaess/ppp-options

Add option to show all options (show-options)

diff --combined pppd/main.c
index 8d5f32bb6efc8d55f121272900d527f76cc08427,2eec96641696273fe1eb65cce9a683539108cd69..b302c08e0659379fd23896e20bdd287d3c7041d9
--- 1/pppd/main.c
--- 2/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;
  }