| 1 | *************** |
|---|
| 2 | *** 137,142 **** |
|---|
| 3 | oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, |
|---|
| 4 | oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication, |
|---|
| 5 | oKexAlgorithms, oIPQoS, oRequestTTY, |
|---|
| 6 | oDeprecated, oUnsupported |
|---|
| 7 | } OpCodes; |
|---|
| 8 | |
|---|
| 9 | --- 137,145 ---- |
|---|
| 10 | oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, |
|---|
| 11 | oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication, |
|---|
| 12 | oKexAlgorithms, oIPQoS, oRequestTTY, |
|---|
| 13 | + #ifdef __APPLE_KEYCHAIN__ |
|---|
| 14 | + oAskPassGUI, |
|---|
| 15 | + #endif |
|---|
| 16 | oDeprecated, oUnsupported |
|---|
| 17 | } OpCodes; |
|---|
| 18 | |
|---|
| 19 | *************** |
|---|
| 20 | *** 257,263 **** |
|---|
| 21 | { "kexalgorithms", oKexAlgorithms }, |
|---|
| 22 | { "ipqos", oIPQoS }, |
|---|
| 23 | { "requesttty", oRequestTTY }, |
|---|
| 24 | - |
|---|
| 25 | { NULL, oBadOption } |
|---|
| 26 | }; |
|---|
| 27 | |
|---|
| 28 | --- 260,268 ---- |
|---|
| 29 | { "kexalgorithms", oKexAlgorithms }, |
|---|
| 30 | { "ipqos", oIPQoS }, |
|---|
| 31 | { "requesttty", oRequestTTY }, |
|---|
| 32 | + #ifdef __APPLE_KEYCHAIN__ |
|---|
| 33 | + { "askpassgui", oAskPassGUI }, |
|---|
| 34 | + #endif |
|---|
| 35 | { NULL, oBadOption } |
|---|
| 36 | }; |
|---|
| 37 | |
|---|
| 38 | *************** |
|---|
| 39 | *** 1282,1287 **** |
|---|
| 40 | options->ip_qos_interactive = -1; |
|---|
| 41 | options->ip_qos_bulk = -1; |
|---|
| 42 | options->request_tty = -1; |
|---|
| 43 | } |
|---|
| 44 | |
|---|
| 45 | /* |
|---|
| 46 | --- 1293,1301 ---- |
|---|
| 47 | options->ip_qos_interactive = -1; |
|---|
| 48 | options->ip_qos_bulk = -1; |
|---|
| 49 | options->request_tty = -1; |
|---|
| 50 | + #ifdef __APPLE_KEYCHAIN__ |
|---|
| 51 | + options->ask_pass_gui = -1; |
|---|
| 52 | + #endif |
|---|
| 53 | } |
|---|
| 54 | |
|---|
| 55 | /* |
|---|
