1
0

patch-pppd_pppd_8 2.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677
  1. --- ppp-2.4.5.orig/pppd/pppd.8 2009-11-16 23:26:07.000000000 +0100
  2. +++ ppp-2.4.5/pppd/pppd.8 2011-01-16 15:51:05.000000000 +0100
  3. @@ -638,9 +638,29 @@ control, as for the \fIcrtscts\fR option
  4. Enables the use of PPP multilink; this is an alias for the `multilink'
  5. option. This option is currently only available under Linux.
  6. .TP
  7. -.B mppe\-stateful
  8. -Allow MPPE to use stateful mode. Stateless mode is still attempted first.
  9. -The default is to disallow stateful mode.
  10. +.B mppc
  11. +Enables MPPC (Microsoft Point to Point Compression). This is the default.
  12. +.TP
  13. +.B mppe \fIsubopt1[,subopt2[,subopt3[..]]]
  14. +Modify MPPE (Microsoft Point to Point Encryption) parameters. In order
  15. +for MPPE to successfully come up, you must have authenticated with either
  16. +MS-CHAP or MS-CHAPv2. By default MPPE is optional, it means that pppd will
  17. +not propose MPPE to the peer, but will negotiate MPPE if peer wants that.
  18. +You can change this using \fIrequired\fR suboption.
  19. +This option is presently only supported under Linux, and only if your
  20. +kernel has been configured to include MPPE support.
  21. +.IP
  22. +MPPE suboptions:
  23. +.br
  24. +\fIrequired\fR - require MPPE; disconnect if peer doesn't support it,
  25. +.br
  26. +\fIstateless\fR - try to negotiate stateless mode; default is stateful,
  27. +.br
  28. +\fIno40\fR - disable 40 bit keys,
  29. +.br
  30. +\fIno56\fR - disable 56 bit keys,
  31. +.br
  32. +\fIno128\fR - disable 128 bit keys
  33. .TP
  34. .B mpshortseq
  35. Enables the use of short (12-bit) sequence numbers in multilink
  36. @@ -778,17 +798,11 @@ peer is buggy.
  37. Disables the use of PPP multilink. This option is currently only
  38. available under Linux.
  39. .TP
  40. -.B nomppe
  41. -Disables MPPE (Microsoft Point to Point Encryption). This is the default.
  42. -.TP
  43. -.B nomppe\-40
  44. -Disable 40-bit encryption with MPPE.
  45. -.TP
  46. -.B nomppe\-128
  47. -Disable 128-bit encryption with MPPE.
  48. +.B nomppc
  49. +Disables MPPC (Microsoft Point to Point Compression).
  50. .TP
  51. -.B nomppe\-stateful
  52. -Disable MPPE stateful mode. This is the default.
  53. +.B nomppe
  54. +Disables MPPE (Microsoft Point to Point Encryption).
  55. .TP
  56. .B nompshortseq
  57. Disables the use of short (12-bit) sequence numbers in the PPP
  58. @@ -980,19 +994,6 @@ peer using PAP.
  59. Require the peer to authenticate itself using CHAP [Challenge
  60. Handshake Authentication Protocol] authentication.
  61. .TP
  62. -.B require\-mppe
  63. -Require the use of MPPE (Microsoft Point to Point Encryption). This
  64. -option disables all other compression types. This option enables
  65. -both 40-bit and 128-bit encryption. In order for MPPE to successfully
  66. -come up, you must have authenticated with either MS\-CHAP or MS\-CHAPv2.
  67. -This option is presently only supported under Linux, and only if your
  68. -kernel has been configured to include MPPE support.
  69. -.TP
  70. -.B require\-mppe\-40
  71. -Require the use of MPPE, with 40-bit encryption.
  72. -.TP
  73. -.B require\-mppe\-128
  74. -Require the use of MPPE, with 128-bit encryption.
  75. .TP
  76. .B require\-mschap
  77. Require the peer to authenticate itself using MS\-CHAP [Microsoft Challenge