nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 09:27:59 +00:00
Code Issues Projects Releases Wiki Activity

Log when -restrict-acl is in use.

Browse Source 
Partly to reassure the user that they got what they asked for, and
partly so that's a clue for us in the logs when we get bug reports.

This involved repurposing platform_psftp_post_option_setup() (no longer
used since e22120fe) as platform_psftp_pre_conn_setup(), and moving it
to after logging is set up.
This commit is contained in:
Jacob Nevins 2017-02-11 00:44:00 +00:00
parent 415224eab5
commit 9a2730806c
7 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pscp.c
View File

@ -517,6 +517,8 @@ static void do_cmd(char *host, char *user, char *cmd)
logctx = log_init(NULL, conf);
console_provide_logctx(logctx);
platform_psftp_pre_conn_setup();
err = back->init(NULL, &backhandle, conf,
conf_get_str(conf, CONF_host),
conf_get_int(conf, CONF_port),
@ -2357,8 +2359,6 @@ int psftp_main(int argc, char *argv[])
argv += i;
back = NULL;
platform_psftp_post_option_setup();
if (list) {
if (argc != 1)
usage();

4
psftp.c
View File

@ -2840,6 +2840,8 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
logctx = log_init(NULL, conf);
console_provide_logctx(logctx);
platform_psftp_pre_conn_setup();
err = back->init(NULL, &backhandle, conf,
conf_get_str(conf, CONF_host),
conf_get_int(conf, CONF_port),
@ -2954,8 +2956,6 @@ int psftp_main(int argc, char *argv[])
argv += i;
back = NULL;
platform_psftp_post_option_setup();
/*
* If the loaded session provides a hostname, and a hostname has not
* otherwise been specified, pop it in `userhost' so that

7
psftp.h
View File

@ -48,11 +48,10 @@ int ssh_sftp_loop_iteration(void);
char *ssh_sftp_get_cmdline(const char *prompt, int backend_required);
/*
* Platform-specific function called after the command line has been
* processed, so that any per-platform initialisation such as process
* ACL setup can be done.
* Platform-specific function called when we're about to make a
* network connection.
*/
void platform_psftp_post_option_setup(void);
void platform_psftp_pre_conn_setup(void);
/*
* The main program in psftp.c. Called from main() in the platform-

2
unix/uxsftp.c
View File

@ -620,7 +620,7 @@ char *ssh_sftp_get_cmdline(const char *prompt, int no_fds_ok)
void frontend_net_error_pending(void) {}
void platform_psftp_post_option_setup(void) {}
void platform_psftp_pre_conn_setup(void) {}
/*
* Main program: do platform-specific initialisation and then call

4
windows/window.c
View File

@ -840,6 +840,10 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
}
}
if (restricted_acl) {
logevent(NULL, "Running with restricted process ACL");
}
start_backend();
/*

4
windows/winplink.c
View File

@ -633,6 +633,10 @@ int main(int argc, char **argv)
return 1;
}
if (restricted_acl) {
logevent(NULL, "Running with restricted process ACL");
}
/*
* Start up the connection.
*/

5
windows/winsftp.c
View File

@ -747,8 +747,11 @@ char *ssh_sftp_get_cmdline(const char *prompt, int no_fds_ok)
return ctx->line;
}
void platform_psftp_post_option_setup(void)
void platform_psftp_pre_conn_setup(void)
{
if (restricted_acl) {
logevent(NULL, "Running with restricted process ACL");
}
}
/* ----------------------------------------------------------------------