Skip to content

Commit

Permalink
Merge pull request #30 from Castaglia/cleanup-trailing-whitespace
Browse files Browse the repository at this point in the history
Clean up trailing whitespace.
  • Loading branch information
Castaglia committed Mar 28, 2023
2 parents 48839e3 + 9a18a38 commit e4afb16
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions mod_proxy_protocol.c
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ static int read_haproxy_v1(pool *p, conn_t *conn,
* check for this, scan the given address fields for illegal (e.g.
* alphabetic) characters, keeping in mind that IPv6 addresses can use
* hex.
*/
*/

if (have_tcp4 == TRUE) {
if (pr_netaddr_get_family(src_addr) != AF_INET) {
Expand Down Expand Up @@ -649,7 +649,7 @@ static int read_haproxy_v1(pool *p, conn_t *conn,
*proxied_dst_addr = dst_addr;
*proxied_dst_port = dst_port;
}

return 1;

bad_proto:
Expand Down Expand Up @@ -1431,7 +1431,7 @@ MODRET set_proxyprotocolengine(cmd_rec *cmd) {
if (engine == -1) {
CONF_ERROR(cmd, "expected Boolean parameter");
}

c = add_config_param(cmd->argv[0], 1, NULL);
c->argv[0] = pcalloc(c->pool, sizeof(int));
*((int *) c->argv[0]) = engine;
Expand Down Expand Up @@ -1749,7 +1749,7 @@ static int proxy_protocol_sess_init(void) {
": session requested from proxied client in unknown class");
}
}

return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion t/lib/ProFTPD/Tests/Config/MaxHostsPerUser.pm
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ sub maxhostsperuser_one {
SystemLog => $setup->{log_file},

AuthUserFile => $setup->{auth_user_file},
AuthGroupFile => $setup->{auth_group_file},
AuthGroupFile => $setup->{auth_group_file},

MaxHostsPerUser => $max_hosts,

Expand Down
2 changes: 1 addition & 1 deletion t/lib/ProFTPD/Tests/Modules/mod_proxy_protocol/sftp.pm
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ sub proxy_protocol_sftp_with_proxy {
$client->send_proxy_raw('1.1.1.1', '2.2.2.2', 111, 222);
my $banner = $client->getline();
chomp($banner);

unless ($banner =~ /^SSH\-2\.0\-mod_sftp/) {
die("Received unexpected banner from mod_sftp: '$banner'");
}
Expand Down

0 comments on commit e4afb16

Please sign in to comment.