Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show OpenSSL version to --version #1096

Merged
merged 3 commits into from Apr 13, 2018
Merged

Conversation

metalefty
Copy link
Member

@metalefty metalefty commented Apr 10, 2018

If multiple versions of OpenSSL installed to the system, it is helpful to know which OpenSSL xrdp uses in case OpenSSL have vulnerability. Also, some cleanups and improvements.

  • add OpenSSL version to --version
  • use GitHub URL rather than xrdp.org, it should be more helpful
  • exit with error code when unknown CLI option given
  • show which CLI option is unknown to xrdp

--version

before

$ xrdp --version

xrdp: A Remote Desktop Protocol server.
Copyright (C) Jay Sorg 2004-2014
See http://www.xrdp.org for more information.
Version 0.9.5

after

$ xrdp --version
xrdp 0.9.6
  A Remote Desktop Protocol Server.
  Copyright (C) 2004-2018 Jay Sorg, Neutrino Labs, and all contributors.
  See https://github.com/neutrinolabs/xrdp for more information.

  Compiled with OpenSSL 1.0.2o  27 Mar 2018

--help

before

$ xrdp --help

xrdp: A Remote Desktop Protocol server.
Copyright (C) Jay Sorg 2004-2014
See http://www.xrdp.org for more information.

Usage: xrdp [options]
   -h, --help       show help
   -n, --nodaemon   don't fork into background
   -k, --kill       shut down xrdp
   -p, --port       tcp listen port
   -f, --fork       fork on new connection

after

$ xrdp --help
xrdp 0.9.6
  A Remote Desktop Protocol Server.
  Copyright (C) 2004-2018 Jay Sorg, Neutrino Labs, and all contributors.
  See https://github.com/neutrinolabs/xrdp for more information.

  Compiled with OpenSSL 1.0.2o  27 Mar 2018

Usage: xrdp [options]
   -h, --help       show help
   -n, --nodaemon   don't fork into background
   -k, --kill       shut down xrdp
   -p, --port       tcp listen port
   -f, --fork       fork on new connection

--unknown-option

before

$ xrdp --nodaemon --unknown-option; echo $?
Unknown Parameter
xrdp -h for help

0

after

$ xrdp --nodaemon --unknown-option; echo $?
xrdp 0.9.6
  A Remote Desktop Protocol Server.
  Copyright (C) 2004-2018 Jay Sorg, Neutrino Labs, and all contributors.
  See https://github.com/neutrinolabs/xrdp for more information.

  Compiled with OpenSSL 1.0.2o  27 Mar 2018

Usage: xrdp [options]
   -h, --help       show help
   -n, --nodaemon   don't fork into background
   -k, --kill       shut down xrdp
   -p, --port       tcp listen port
   -f, --fork       fork on new connection

Unknown option: --unknown-option
1

@jsorg71
Copy link
Contributor

jsorg71 commented Apr 12, 2018

+1 nice

@metalefty metalefty merged commit f52f632 into neutrinolabs:devel Apr 13, 2018
@metalefty metalefty deleted the version_info branch April 13, 2018 05:49
@speidy
Copy link
Member

speidy commented Apr 13, 2018

+1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants