Repository: guacamole-server Updated Branches: refs/heads/master 67680bd2d -> 35237a4f8
GUACAMOLE-445: Add settings for printer name. Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/b21f00c2 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/b21f00c2 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/b21f00c2 Branch: refs/heads/master Commit: b21f00c29dc5dd100fad1a55bf88e267ca4b0add Parents: 334849e Author: Nick Couchman <vn...@apache.org> Authored: Fri Feb 23 05:03:34 2018 -0500 Committer: Nick Couchman <vn...@apache.org> Committed: Tue Jun 26 19:23:52 2018 -0400 ---------------------------------------------------------------------- src/protocols/rdp/rdp_settings.c | 11 +++++++++++ src/protocols/rdp/rdp_settings.h | 5 +++++ 2 files changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/b21f00c2/src/protocols/rdp/rdp_settings.c ---------------------------------------------------------------------- diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c index 35f7f20..0ce3e84 100644 --- a/src/protocols/rdp/rdp_settings.c +++ b/src/protocols/rdp/rdp_settings.c @@ -52,6 +52,7 @@ const char* GUAC_RDP_CLIENT_ARGS[] = { "color-depth", "disable-audio", "enable-printing", + "printer-name", "enable-drive", "drive-path", "create-drive-path", @@ -187,6 +188,11 @@ enum RDP_ARGS_IDX { IDX_ENABLE_PRINTING, /** + * The name of the printer that will be passed through to the RDP server. + */ + IDX_PRINTER_NAME, + + /** * "true" if the virtual drive should be enabled, "false" or blank * otherwise. */ @@ -788,6 +794,11 @@ guac_rdp_settings* guac_rdp_parse_args(guac_user* user, guac_user_parse_args_boolean(user, GUAC_RDP_CLIENT_ARGS, argv, IDX_ENABLE_PRINTING, 0); + /* Name of redirected printer */ + settings->printer_name = + guac_user_parse_args_string(user, GUAC_RDP_CLIENT_ARGS, argv, + IDX_PRINTER_NAME, "Guacamole Printer"); + /* Drive enable/disable */ settings->drive_enabled = guac_user_parse_args_boolean(user, GUAC_RDP_CLIENT_ARGS, argv, http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/b21f00c2/src/protocols/rdp/rdp_settings.h ---------------------------------------------------------------------- diff --git a/src/protocols/rdp/rdp_settings.h b/src/protocols/rdp/rdp_settings.h index ad71ca0..de2bd17 100644 --- a/src/protocols/rdp/rdp_settings.h +++ b/src/protocols/rdp/rdp_settings.h @@ -178,6 +178,11 @@ typedef struct guac_rdp_settings { int printing_enabled; /** + * Name of the redirected printer. + */ + char* printer_name; + + /** * Whether the virtual drive is enabled. */ int drive_enabled;
