Fri Jul 28 04:37:37 2023 UTC ()
openssh: whitespace fix


(rin)
diff -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/monitor.h
cvs diff -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/monitor.h (expand / switch to unified diff)

--- src/crypto/external/bsd/openssh/dist/monitor.h 2019/04/28 14:45:13 1.12
+++ src/crypto/external/bsd/openssh/dist/monitor.h 2023/07/28 04:37:37 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: monitor.h,v 1.12 2019/04/28 14:45:13 christos Exp $ */ 1/* $NetBSD: monitor.h,v 1.13 2023/07/28 04:37:37 rin Exp $ */
2/* $OpenBSD: monitor.h,v 1.23 2019/01/19 21:43:56 djm Exp $ */ 2/* $OpenBSD: monitor.h,v 1.23 2019/01/19 21:43:56 djm Exp $ */
3 3
4/* 4/*
5 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 5 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -61,27 +61,27 @@ enum monitor_reqtype { @@ -61,27 +61,27 @@ enum monitor_reqtype {
61 MONITOR_REQ_JPAKE_GET_PWDATA = 54, MONITOR_ANS_JPAKE_GET_PWDATA = 55, 61 MONITOR_REQ_JPAKE_GET_PWDATA = 54, MONITOR_ANS_JPAKE_GET_PWDATA = 55,
62 MONITOR_REQ_JPAKE_STEP2 = 56, MONITOR_ANS_JPAKE_STEP2 = 57, 62 MONITOR_REQ_JPAKE_STEP2 = 56, MONITOR_ANS_JPAKE_STEP2 = 57,
63 MONITOR_REQ_JPAKE_KEY_CONFIRM = 58, MONITOR_ANS_JPAKE_KEY_CONFIRM = 59, 63 MONITOR_REQ_JPAKE_KEY_CONFIRM = 58, MONITOR_ANS_JPAKE_KEY_CONFIRM = 59,
64 MONITOR_REQ_JPAKE_CHECK_CONFIRM = 60, MONITOR_ANS_JPAKE_CHECK_CONFIRM = 61, 64 MONITOR_REQ_JPAKE_CHECK_CONFIRM = 60, MONITOR_ANS_JPAKE_CHECK_CONFIRM = 61,
65 65
66 MONITOR_REQ_PAM_START = 100, 66 MONITOR_REQ_PAM_START = 100,
67 MONITOR_REQ_PAM_ACCOUNT = 102, MONITOR_ANS_PAM_ACCOUNT = 103, 67 MONITOR_REQ_PAM_ACCOUNT = 102, MONITOR_ANS_PAM_ACCOUNT = 103,
68 MONITOR_REQ_PAM_INIT_CTX = 104, MONITOR_ANS_PAM_INIT_CTX = 105, 68 MONITOR_REQ_PAM_INIT_CTX = 104, MONITOR_ANS_PAM_INIT_CTX = 105,
69 MONITOR_REQ_PAM_QUERY = 106, MONITOR_ANS_PAM_QUERY = 107, 69 MONITOR_REQ_PAM_QUERY = 106, MONITOR_ANS_PAM_QUERY = 107,
70 MONITOR_REQ_PAM_RESPOND = 108, MONITOR_ANS_PAM_RESPOND = 109, 70 MONITOR_REQ_PAM_RESPOND = 108, MONITOR_ANS_PAM_RESPOND = 109,
71 MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111, 71 MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111,
72 MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113, 72 MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113,
73 73
74 MONITOR_REQ_KRB4 = 200, MONITOR_ANS_KRB4 = 201, 74 MONITOR_REQ_KRB4 = 200, MONITOR_ANS_KRB4 = 201,
75 MONITOR_REQ_KRB5 = 202, MONITOR_ANS_KRB5 = 203, 75 MONITOR_REQ_KRB5 = 202, MONITOR_ANS_KRB5 = 203,
76 76
77}; 77};
78 78
79struct ssh; 79struct ssh;
80 80
81struct monitor { 81struct monitor {
82 int m_recvfd; 82 int m_recvfd;
83 int m_sendfd; 83 int m_sendfd;
84 int m_log_recvfd; 84 int m_log_recvfd;
85 int m_log_sendfd; 85 int m_log_sendfd;
86 struct kex **m_pkex; 86 struct kex **m_pkex;
87 pid_t m_pid; 87 pid_t m_pid;