diff options
author | djm@openbsd.org <djm@openbsd.org> | 2021-04-03 06:18:40 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2021-04-03 17:23:02 +1100 |
commit | 31d8d231eb9377df474746a822d380c5d68d7ad6 (patch) | |
tree | ab5619a06e3944f016d7779b8313acb8bbf1c06a | |
parent | 34afde5c73b5570d6f8cce9b49993b23b77bfb86 (diff) |
upstream: highly polished whitespace, mostly fixing spaces-for-tab
and bad indentation on continuation lines. Prompted by GHPR#185
OpenBSD-Commit-ID: e5c81f0cbdcc6144df1ce468ec1bac366d8ad6e9
-rw-r--r-- | addrmatch.c | 4 | ||||
-rw-r--r-- | auth-krb5.c | 6 | ||||
-rw-r--r-- | auth-options.c | 4 | ||||
-rw-r--r-- | auth.c | 4 | ||||
-rw-r--r-- | auth2-pubkey.c | 7 | ||||
-rw-r--r-- | auth2.c | 6 | ||||
-rw-r--r-- | channels.c | 8 | ||||
-rw-r--r-- | channels.h | 4 | ||||
-rw-r--r-- | cipher.c | 6 | ||||
-rw-r--r-- | dh.c | 4 | ||||
-rw-r--r-- | kex.c | 4 | ||||
-rw-r--r-- | kexgen.c | 4 | ||||
-rw-r--r-- | log.c | 4 | ||||
-rw-r--r-- | misc.c | 4 | ||||
-rw-r--r-- | misc.h | 12 | ||||
-rw-r--r-- | mux.c | 10 | ||||
-rw-r--r-- | packet.c | 16 | ||||
-rw-r--r-- | readconf.c | 8 | ||||
-rw-r--r-- | scp.c | 7 | ||||
-rw-r--r-- | servconf.c | 14 | ||||
-rw-r--r-- | servconf.h | 8 | ||||
-rw-r--r-- | serverloop.c | 4 | ||||
-rw-r--r-- | session.c | 4 | ||||
-rw-r--r-- | sftp-client.c | 11 | ||||
-rw-r--r-- | sftp-server.c | 6 | ||||
-rw-r--r-- | sftp.c | 4 | ||||
-rw-r--r-- | srclimit.c | 2 | ||||
-rw-r--r-- | ssh-add.c | 6 | ||||
-rw-r--r-- | ssh-agent.c | 8 | ||||
-rw-r--r-- | ssh-keygen.c | 16 | ||||
-rw-r--r-- | ssh-sk-client.c | 8 | ||||
-rw-r--r-- | ssh_api.c | 6 | ||||
-rw-r--r-- | sshconnect.c | 16 | ||||
-rw-r--r-- | sshconnect2.c | 6 | ||||
-rw-r--r-- | sshd.c | 10 | ||||
-rw-r--r-- | sshkey-xmss.c | 4 | ||||
-rw-r--r-- | sshkey-xmss.h | 12 | ||||
-rw-r--r-- | sshkey.c | 22 | ||||
-rw-r--r-- | utf8.h | 10 | ||||
-rw-r--r-- | xmalloc.h | 7 |
40 files changed, 155 insertions, 151 deletions
diff --git a/addrmatch.c b/addrmatch.c index 3215c653..b0dc0968 100644 --- a/addrmatch.c +++ b/addrmatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: addrmatch.c,v 1.16 2021/01/09 11:58:50 dtucker Exp $ */ +/* $OpenBSD: addrmatch.c,v 1.17 2021/04/03 06:18:40 djm Exp $ */ /* * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org> @@ -76,7 +76,7 @@ addr_match_list(const char *addr, const char *_list) break; } else if (r == 0) { if (addr != NULL && addr_netmatch(&try_addr, - &match_addr, masklen) == 0) { + &match_addr, masklen) == 0) { foundit: if (neg) { ret = -1; diff --git a/auth-krb5.c b/auth-krb5.c index 3096f1c8..bc17b6d4 100644 --- a/auth-krb5.c +++ b/auth-krb5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-krb5.c,v 1.23 2018/07/09 21:35:50 markus Exp $ */ +/* $OpenBSD: auth-krb5.c,v 1.24 2021/04/03 06:18:40 djm Exp $ */ /* * Kerberos v5 authentication and ticket-passing routines. * @@ -99,7 +99,7 @@ auth_krb5_password(Authctxt *authctxt, const char *password) #ifdef HEIMDAL # ifdef HAVE_KRB5_CC_NEW_UNIQUE problem = krb5_cc_new_unique(authctxt->krb5_ctx, - krb5_mcc_ops.prefix, NULL, &ccache); + krb5_mcc_ops.prefix, NULL, &ccache); # else problem = krb5_cc_gen_new(authctxt->krb5_ctx, &krb5_mcc_ops, &ccache); # endif @@ -123,7 +123,7 @@ auth_krb5_password(Authctxt *authctxt, const char *password) # ifdef HAVE_KRB5_CC_NEW_UNIQUE problem = krb5_cc_new_unique(authctxt->krb5_ctx, - krb5_fcc_ops.prefix, NULL, &authctxt->krb5_fwd_ccache); + krb5_fcc_ops.prefix, NULL, &authctxt->krb5_fwd_ccache); # else problem = krb5_cc_gen_new(authctxt->krb5_ctx, &krb5_fcc_ops, &authctxt->krb5_fwd_ccache); diff --git a/auth-options.c b/auth-options.c index 55b2e9b4..f68c629d 100644 --- a/auth-options.c +++ b/auth-options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-options.c,v 1.94 2020/10/18 11:32:01 djm Exp $ */ +/* $OpenBSD: auth-options.c,v 1.95 2021/04/03 06:18:40 djm Exp $ */ /* * Copyright (c) 2018 Damien Miller <djm@mindrot.org> * @@ -810,7 +810,7 @@ sshauthopt_serialise(const struct sshauthopt *opts, struct sshbuf *m, (r = serialise_nullable_string(m, untrusted ? NULL : opts->required_from_host_cert)) != 0 || (r = serialise_nullable_string(m, - untrusted ? NULL : opts->required_from_host_keys)) != 0) + untrusted ? NULL : opts->required_from_host_keys)) != 0) return r; /* Array options */ @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.151 2020/12/22 00:12:22 djm Exp $ */ +/* $OpenBSD: auth.c,v 1.152 2021/04/03 06:18:40 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -514,7 +514,7 @@ auth_openfile(const char *file, struct passwd *pw, int strict_modes, if ((fd = open(file, O_RDONLY|O_NONBLOCK)) == -1) { if (log_missing || errno != ENOENT) debug("Could not open %s '%s': %s", file_type, file, - strerror(errno)); + strerror(errno)); return NULL; } diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 411d2d88..721c1d9b 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.106 2021/01/27 10:05:28 djm Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.107 2021/04/03 06:18:40 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -674,7 +674,8 @@ check_authkey_line(struct ssh *ssh, struct passwd *pw, struct sshkey *key, goto fail_reason; } if (sshkey_cert_check_authority(key, 0, 0, 0, - keyopts->cert_principals == NULL ? pw->pw_name : NULL, &reason) != 0) + keyopts->cert_principals == NULL ? pw->pw_name : NULL, + &reason) != 0) goto fail_reason; verbose("Accepted certificate ID \"%s\" (serial %llu) " @@ -785,7 +786,7 @@ user_cert_trusted_ca(struct ssh *ssh, struct passwd *pw, struct sshkey *key, found_principal = 1; /* If principals file or command is specified, then require a match */ use_authorized_principals = principals_file != NULL || - options.authorized_principals_command != NULL; + options.authorized_principals_command != NULL; if (!found_principal && use_authorized_principals) { reason = "Certificate does not contain an authorized principal"; goto fail_reason; @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2.c,v 1.160 2021/01/27 10:05:28 djm Exp $ */ +/* $OpenBSD: auth2.c,v 1.161 2021/04/03 06:18:40 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -228,7 +228,7 @@ user_specific_delay(const char *user) double delay; (void)snprintf(b, sizeof b, "%llu%s", - (unsigned long long)options.timing_secret, user); + (unsigned long long)options.timing_secret, user); if (ssh_digest_memory(SSH_DIGEST_SHA512, b, strlen(b), hash, len) != 0) fatal_f("ssh_digest_memory"); /* 0-4.2 ms of delay */ @@ -703,7 +703,7 @@ void auth2_record_info(Authctxt *authctxt, const char *fmt, ...) { va_list ap; - int i; + int i; free(authctxt->auth_method_info); authctxt->auth_method_info = NULL; @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.405 2021/02/15 20:43:15 markus Exp $ */ +/* $OpenBSD: channels.c,v 1.406 2021/04/03 06:18:40 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2299,7 +2299,7 @@ channel_handler_init(struct ssh_channels *sc) chan_fn **pre, **post; if ((pre = calloc(SSH_CHANNEL_MAX_TYPE, sizeof(*pre))) == NULL || - (post = calloc(SSH_CHANNEL_MAX_TYPE, sizeof(*post))) == NULL) + (post = calloc(SSH_CHANNEL_MAX_TYPE, sizeof(*post))) == NULL) fatal_f("allocation failed"); pre[SSH_CHANNEL_OPEN] = &channel_pre_open; @@ -2699,7 +2699,7 @@ channel_proxy_downstream(struct ssh *ssh, Channel *downstream) goto out; } c = channel_new(ssh, "mux proxy", SSH_CHANNEL_MUX_PROXY, - -1, -1, -1, 0, 0, 0, ctype, 1); + -1, -1, -1, 0, 0, 0, ctype, 1); c->mux_ctx = downstream; /* point to mux client */ c->mux_downstream_id = id; /* original downstream id */ if ((r = sshbuf_put_cstring(modified, ctype)) != 0 || @@ -2726,7 +2726,7 @@ channel_proxy_downstream(struct ssh *ssh, Channel *downstream) goto out; } c = channel_new(ssh, "mux proxy", SSH_CHANNEL_MUX_PROXY, - -1, -1, -1, 0, 0, 0, "mux-down-connect", 1); + -1, -1, -1, 0, 0, 0, "mux-down-connect", 1); c->mux_ctx = downstream; /* point to mux client */ c->mux_downstream_id = id; c->remote_id = remote_id; @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.h,v 1.136 2021/04/03 05:54:14 djm Exp $ */ +/* $OpenBSD: channels.h,v 1.137 2021/04/03 06:18:40 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -289,7 +289,7 @@ int channel_input_status_confirm(int, u_int32_t, struct ssh *); /* file descriptor handling (read/write) */ void channel_prepare_select(struct ssh *, fd_set **, fd_set **, int *, - u_int*, time_t*); + u_int*, time_t*); void channel_after_select(struct ssh *, fd_set *, fd_set *); void channel_output_poll(struct ssh *); @@ -1,4 +1,4 @@ -/* $OpenBSD: cipher.c,v 1.118 2020/12/21 11:09:32 dtucker Exp $ */ +/* $OpenBSD: cipher.c,v 1.119 2021/04/03 06:18:40 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -495,9 +495,9 @@ cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, size_t len) if (cipher_authlen(c)) { if (!EVP_CIPHER_CTX_ctrl(cc->evp, EVP_CTRL_GCM_IV_GEN, len, iv)) - return SSH_ERR_LIBCRYPTO_ERROR; + return SSH_ERR_LIBCRYPTO_ERROR; } else if (!EVP_CIPHER_CTX_get_iv(cc->evp, iv, len)) - return SSH_ERR_LIBCRYPTO_ERROR; + return SSH_ERR_LIBCRYPTO_ERROR; #endif return 0; } @@ -1,4 +1,4 @@ -/* $OpenBSD: dh.c,v 1.73 2021/03/12 04:08:19 dtucker Exp $ */ +/* $OpenBSD: dh.c,v 1.74 2021/04/03 06:18:40 djm Exp $ */ /* * Copyright (c) 2000 Niels Provos. All rights reserved. * @@ -274,7 +274,7 @@ dh_pub_is_valid(const DH *dh, const BIGNUM *dh_pub) */ if (bits_set < 4) { logit("invalid public DH value (%d/%d)", - bits_set, BN_num_bits(dh_p)); + bits_set, BN_num_bits(dh_p)); return 0; } return 1; @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.167 2021/01/31 22:55:29 djm Exp $ */ +/* $OpenBSD: kex.c,v 1.168 2021/04/03 06:18:40 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -1188,7 +1188,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms, if (version_addendum != NULL && *version_addendum == '\0') version_addendum = NULL; if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n", - PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, + PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, version_addendum == NULL ? "" : " ", version_addendum == NULL ? "" : version_addendum)) != 0) { oerrno = errno; @@ -1,4 +1,4 @@ -/* $OpenBSD: kexgen.c,v 1.6 2021/01/31 22:55:29 djm Exp $ */ +/* $OpenBSD: kexgen.c,v 1.7 2021/04/03 06:18:40 djm Exp $ */ /* * Copyright (c) 2019 Markus Friedl. All rights reserved. * @@ -322,7 +322,7 @@ input_kex_gen_init(int type, u_int32_t seq, struct ssh *ssh) /* sign H */ if ((r = kex->sign(ssh, server_host_private, server_host_public, - &signature, &slen, hash, hashlen, kex->hostkey_alg)) != 0) + &signature, &slen, hash, hashlen, kex->hostkey_alg)) != 0) goto out; /* send server hostkey, ECDH pubkey 'Q_S' and signed H */ @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.56 2020/12/04 02:25:13 djm Exp $ */ +/* $OpenBSD: log.c,v 1.57 2021/04/03 06:18:40 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -318,7 +318,7 @@ log_redirect_stderr_to(const char *logfile) if ((fd = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0600)) == -1) { fprintf(stderr, "Couldn't open logfile %s: %s\n", logfile, - strerror(errno)); + strerror(errno)); exit(1); } log_stderr_fd = fd; @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.163 2021/04/03 05:21:46 djm Exp $ */ +/* $OpenBSD: misc.c,v 1.164 2021/04/03 06:18:40 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005-2020 Damien Miller. All rights reserved. @@ -1195,7 +1195,7 @@ vdollar_percent_expand(int *parseerror, int dollar, int percent, string += 2; /* skip over '${' */ if ((varend = strchr(string, '}')) == NULL) { error_f("environment variable '%s' missing " - "closing '}'", string); + "closing '}'", string); goto out; } len = varend - string; @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.94 2021/03/03 08:42:52 djm Exp $ */ +/* $OpenBSD: misc.h,v 1.95 2021/04/03 06:18:40 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -117,9 +117,9 @@ struct arglist { u_int nalloc; }; void addargs(arglist *, char *, ...) - __attribute__((format(printf, 2, 3))); + __attribute__((format(printf, 2, 3))); void replacearg(arglist *, u_int, char *, ...) - __attribute__((format(printf, 3, 4))); + __attribute__((format(printf, 3, 4))); void freeargs(arglist *); int tun_open(int, int, char **); @@ -174,7 +174,7 @@ const char *iptos2str(int); void mktemp_proto(char *, size_t); void child_set_env(char ***envp, u_int *envsizep, const char *name, - const char *value); + const char *value); int argv_split(const char *, int *, char ***); char *argv_assemble(int, char **argv); @@ -182,9 +182,9 @@ int exited_cleanly(pid_t, const char *, const char *, int); struct stat; int safe_path(const char *, struct stat *, const char *, uid_t, - char *, size_t); + char *, size_t); int safe_path_fd(int, const char *, struct passwd *, - char *err, size_t errlen); + char *err, size_t errlen); /* authorized_key-style options parsing helpers */ int opt_flag(const char *opt, int allow_negate, const char **optsp); @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.86 2020/10/29 02:52:43 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.87 2021/04/03 06:18:40 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -554,7 +554,7 @@ format_forward(u_int ftype, struct Forward *fwd) xasprintf(&ret, "dynamic forward %.200s:%d -> *", (fwd->listen_host == NULL) ? (options.fwd_opts.gateway_ports ? "*" : "LOCALHOST") : - fwd->listen_host, fwd->listen_port); + fwd->listen_host, fwd->listen_port); break; case MUX_FWD_REMOTE: xasprintf(&ret, "remote forward %.200s:%d -> %.200s:%d", @@ -649,7 +649,7 @@ mux_confirm_remote_forward(struct ssh *ssh, int type, u_int32_t seq, void *ctxt) rfwd->allocated_port)) != 0) fatal_fr(r, "reply"); channel_update_permission(ssh, rfwd->handle, - rfwd->allocated_port); + rfwd->allocated_port); } else { reply_ok(out, fctx->rid); } @@ -664,7 +664,7 @@ mux_confirm_remote_forward(struct ssh *ssh, int type, u_int32_t seq, void *ctxt) xasprintf(&failmsg, "remote port forwarding failed for " "listen port %d", rfwd->listen_port); - debug2_f("clearing registered forwarding for listen %d, " + debug2_f("clearing registered forwarding for listen %d, " "connect %s:%d", rfwd->listen_port, rfwd->connect_path ? rfwd->connect_path : rfwd->connect_host, rfwd->connect_port); @@ -2278,7 +2278,7 @@ muxclient(const char *path) if (strlcpy(addr.sun_path, path, sizeof(addr.sun_path)) >= sizeof(addr.sun_path)) fatal("ControlPath too long ('%s' >= %u bytes)", path, - (unsigned int)sizeof(addr.sun_path)); + (unsigned int)sizeof(addr.sun_path)); if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) == -1) fatal_f("socket(): %s", strerror(errno)); @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.299 2021/01/27 10:05:28 djm Exp $ */ +/* $OpenBSD: packet.c,v 1.300 2021/04/03 06:18:40 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -684,7 +684,7 @@ static int ssh_packet_init_compression(struct ssh *ssh) { if (!ssh->state->compression_buffer && - ((ssh->state->compression_buffer = sshbuf_new()) == NULL)) + ((ssh->state->compression_buffer = sshbuf_new()) == NULL)) return SSH_ERR_ALLOC_FAIL; return 0; } @@ -886,11 +886,11 @@ ssh_set_newkeys(struct ssh *ssh, int mode) } if (state->newkeys[mode] != NULL) { debug_f("rekeying %s, input %llu bytes %llu blocks, " - "output %llu bytes %llu blocks", dir, - (unsigned long long)state->p_read.bytes, - (unsigned long long)state->p_read.blocks, - (unsigned long long)state->p_send.bytes, - (unsigned long long)state->p_send.blocks); + "output %llu bytes %llu blocks", dir, + (unsigned long long)state->p_read.bytes, + (unsigned long long)state->p_read.blocks, + (unsigned long long)state->p_send.bytes, + (unsigned long long)state->p_send.blocks); kex_free_newkeys(state->newkeys[mode]); state->newkeys[mode] = NULL; } @@ -925,7 +925,7 @@ ssh_set_newkeys(struct ssh *ssh, int mode) explicit_bzero(mac->key, mac->key_len); */ if ((comp->type == COMP_ZLIB || (comp->type == COMP_DELAYED && - state->after_authentication)) && comp->enabled == 0) { + state->after_authentication)) && comp->enabled == 0) { if ((r = ssh_packet_init_compression(ssh)) < 0) return r; if (mode == MODE_OUT) { @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.352 2021/02/24 01:18:08 dtucker Exp $ */ +/* $OpenBSD: readconf.c,v 1.353 2021/04/03 06:18:40 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -676,7 +676,7 @@ match_cfg_line(Options *options, char **condition, struct passwd *pw, snprintf(uidstr, sizeof(uidstr), "%llu", (unsigned long long)pw->pw_uid); conn_hash_hex = ssh_connection_hash(thishost, host, - portstr, ruser); + portstr, ruser); keyalias = options->host_key_alias ? options->host_key_alias : host; @@ -1026,7 +1026,7 @@ parse_time: parse_multistate: arg = strdelim(&s); if ((value = parse_multistate_value(arg, filename, linenum, - multistate_ptr)) == -1) { + multistate_ptr)) == -1) { error("%s line %d: unsupported option \"%s\".", filename, linenum, arg); return -1; @@ -1994,7 +1994,7 @@ parse_pubkey_algos: arg = strdelim(&s); arg2 = strdelim(&s); value = parse_multistate_value(arg, filename, linenum, - multistate_yesnoaskconfirm); + multistate_yesnoaskconfirm); value2 = 0; /* unlimited lifespan by default */ if (value == 3 && arg2 != NULL) { /* allow "AddKeysToAgent confirm 5m" */ @@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.213 2020/10/18 11:32:01 djm Exp $ */ +/* $OpenBSD: scp.c,v 1.214 2021/04/03 06:18:40 djm Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -630,7 +630,7 @@ do_times(int fd, int verb, const struct stat *sb) static int parse_scp_uri(const char *uri, char **userp, char **hostp, int *portp, - char **pathp) + char **pathp) { int r; @@ -1423,8 +1423,7 @@ sink(int argc, char **argv, const char *src) if (pflag) (void) chmod(np, mode); } else { - /* Handle copying from a read-only - directory */ + /* Handle copying from a read-only directory */ mod_flag = 1; if (mkdir(np, mode | S_IRWXU) == -1) goto bad; @@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.378 2021/03/12 04:08:19 dtucker Exp $ */ +/* $OpenBSD: servconf.c,v 1.379 2021/04/03 06:18:40 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -2117,7 +2117,7 @@ process_server_config_line_depth(ServerOptions *options, char *line, case sMatch: if (cmdline) fatal("Match directive not supported as a command-line " - "option"); + "option"); value = match_cfg_line(&cp, linenum, (*inc_flags & SSHCFG_NEVERMATCH ? NULL : connectinfo)); if (value < 0) @@ -2454,7 +2454,7 @@ load_server_config(const char *filename, struct sshbuf *conf) sshbuf_reset(conf); /* grow buffer, so realloc is avoided for large config files */ if (fstat(fileno(f), &st) == 0 && st.st_size > 0 && - (r = sshbuf_allocate(conf, st.st_size)) != 0) + (r = sshbuf_allocate(conf, st.st_size)) != 0) fatal_fr(r, "allocate"); while (getline(&line, &linesize, f) != -1) { lineno++; @@ -2507,12 +2507,12 @@ int parse_server_match_testspec(struct connection_info *ci, char *spec) ci->lport = a2port(p + 6); if (ci->lport == -1) { fprintf(stderr, "Invalid port '%s' in test mode" - " specification %s\n", p+6, p); + " specification %s\n", p+6, p); return -1; } } else { fprintf(stderr, "Invalid test mode specification %s\n", - p); + p); return -1; } } @@ -2918,9 +2918,9 @@ dump_config(ServerOptions *o) dump_cfg_strarray_oneline(sAuthorizedKeysFile, o->num_authkeys_files, o->authorized_keys_files); dump_cfg_strarray(sHostKeyFile, o->num_host_key_files, - o->host_key_files); + o->host_key_files); dump_cfg_strarray(sHostCertificate, o->num_host_cert_files, - o->host_cert_files); + o->host_cert_files); dump_cfg_strarray(sAllowUsers, o->num_allow_users, o->allow_users); dump_cfg_strarray(sDenyUsers, o->num_deny_users, o->deny_users); dump_cfg_strarray(sAllowGroups, o->num_allow_groups, o->allow_groups); @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.h,v 1.153 2021/04/03 05:54:14 djm Exp $ */ +/* $OpenBSD: servconf.h,v 1.154 2021/04/03 06:18:40 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -294,13 +294,13 @@ struct connection_info *get_connection_info(struct ssh *, int, int); void initialize_server_options(ServerOptions *); void fill_default_server_options(ServerOptions *); int process_server_config_line(ServerOptions *, char *, const char *, int, - int *, struct connection_info *, struct include_list *includes); + int *, struct connection_info *, struct include_list *includes); void process_permitopen(struct ssh *ssh, ServerOptions *options); void load_server_config(const char *, struct sshbuf *); void parse_server_config(ServerOptions *, const char *, struct sshbuf *, - struct include_list *includes, struct connection_info *); + struct include_list *includes, struct connection_info *); void parse_server_match_config(ServerOptions *, - struct include_list *includes, struct connection_info *); + struct include_list *includes, struct connection_info *); int parse_server_match_testspec(struct connection_info *, char *); int server_match_spec_complete(struct connection_info *); void copy_set_server_options(ServerOptions *, ServerOptions *, int); diff --git a/serverloop.c b/serverloop.c index 306658cb..66917971 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.225 2021/01/27 10:05:28 djm Exp $ */ +/* $OpenBSD: serverloop.c,v 1.226 2021/04/03 06:18:41 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -838,7 +838,7 @@ server_input_global_request(int type, u_int32_t seq, struct ssh *ssh) options.disable_forwarding || (!want_reply && fwd.listen_port == 0) || (fwd.listen_port != 0 && - !bind_permitted(fwd.listen_port, pw->pw_uid))) { + !bind_permitted(fwd.listen_port, pw->pw_uid))) { success = 0; ssh_packet_send_debug(ssh, "Server has disabled port forwarding."); } else { @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.327 2020/12/14 03:13:12 djm Exp $ */ +/* $OpenBSD: session.c,v 1.328 2021/04/03 06:18:41 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -1388,7 +1388,7 @@ do_setusercontext(struct passwd *pw) if (!in_chroot && options.chroot_directory != NULL && strcasecmp(options.chroot_directory, "none") != 0) { - tmp = tilde_expand_filename(options.chroot_directory, + tmp = tilde_expand_filename(options.chroot_directory, pw->pw_uid); snprintf(uidst |