| --- openssh-7.2_p1-sctp.patch |
| +++ openssh-7.2_p1-sctp.patch |
| @@ -195,14 +195,6 @@ |
| .Op Fl c Ar cipher |
| .Op Fl F Ar ssh_config |
| .Op Fl i Ar identity_file |
| -@@ -181,6 +181,7 @@ For full details of the options listed below, and their possible values, see |
| - .It ServerAliveCountMax |
| - .It StrictHostKeyChecking |
| - .It TCPKeepAlive |
| -+.It Transport |
| - .It UpdateHostKeys |
| - .It UsePrivilegedPort |
| - .It User |
| @@ -222,6 +223,8 @@ and |
| to print debugging messages about their progress. |
| This is helpful in |
| @@ -477,19 +469,11 @@ |
| .Sh SYNOPSIS |
| .Nm ssh |
| .Bk -words |
| --.Op Fl 1246AaCfGgKkMNnqsTtVvXxYy |
| -+.Op Fl 1246AaCfGgKkMNnqsTtVvXxYyz |
| +-.Op Fl 1246AaCdfgKkMNnqsTtVvXxYy |
| ++.Op Fl 1246AaCdfgKkMNnqsTtVvXxYyz |
| .Op Fl b Ar bind_address |
| .Op Fl c Ar cipher_spec |
| .Op Fl D Oo Ar bind_address : Oc Ns Ar port |
| -@@ -536,6 +536,7 @@ For full details of the options listed below, and their possible values, see |
| - .It StreamLocalBindUnlink |
| - .It StrictHostKeyChecking |
| - .It TCPKeepAlive |
| -+.It Transport |
| - .It Tunnel |
| - .It TunnelDevice |
| - .It UpdateHostKeys |
| @@ -770,6 +771,8 @@ controls. |
| .Pp |
| .It Fl y |
| @@ -501,7 +485,7 @@ |
| index f9ff91f..d0d92ce 100644 |
| --- a/ssh.c |
| +++ b/ssh.c |
| -@@ -195,12 +195,17 @@ extern int muxserver_sock; |
| +@@ -195,11 +195,16 @@ extern int muxserver_sock; |
| extern u_int muxclient_command; |
| |
| /* Prints a help message to the user. This function never returns. */ |
| @@ -515,18 +499,17 @@ |
| usage(void) |
| { |
| fprintf(stderr, |
| --"usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" |
| -+"usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy" SCTP_OPT "] [-b bind_address] [-c cipher_spec]\n" |
| +-"usage: ssh [-1246AaCdfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" |
| ++"usage: ssh [-1246AaCdfgKkMNnqsTtVvXxYy" SCTP_OPT "] [-b bind_address] [-c cipher_spec]\n" |
| " [-D [bind_address:]port] [-E log_file] [-e escape_char]\n" |
| " [-F configfile] [-I pkcs11] [-i identity_file] [-L address]\n" |
| - " [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n" |
| @@ -605,7 +610,7 @@ main(int ac, char **av) |
| - argv0 = av[0]; |
| + # define ENGCONFIG "" |
| + #endif |
| |
| - again: |
| -- while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx" |
| -+ while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx" SCTP_OPT |
| - "ACD:E:F:GI:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) { |
| +- while ((opt = getopt(ac, av, "1246ab:c:de:fgi:kl:m:no:p:qstvx" |
| ++ while ((opt = getopt(ac, av, "1246ab:c:de:fgi:kl:m:no:p:qstvx" SCTP_OPT |
| + "ACD:E:F:" ENGCONFIG "I:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) { |
| switch (opt) { |
| case '1': |
| @@ -845,6 +850,11 @@ main(int ac, char **av) |