diff --git a/makedebian.pl b/makedebian.pl index 045447f9a..e78f061f8 100755 --- a/makedebian.pl +++ b/makedebian.pl @@ -105,7 +105,7 @@ if ($product eq "webmin") { # Create the control file $size = int(`du -sk $tmp_dir`); -@deps = ( "perl", "libnet-ssleay-perl", "openssl", "libauthen-pam-perl", "libpam-runtime", "libio-pty-perl", "unzip", "shared-mime-info", "tar", "libdigest-sha-perl", "libdigest-md5-perl" ); +@deps = ( "perl", "libnet-ssleay-perl", "openssl", "libauthen-pam-perl", "libpam-runtime", "libio-pty-perl", "unzip", "shared-mime-info", "tar", "libdigest-sha-perl", "libdigest-md5-perl", "gzip" ); $deps = join(", ", @deps); @recommends = ( "libdatetime-perl", "libdatetime-timezone-perl", "libdatetime-locale-perl", "libtime-piece-perl", "lynx" ); $recommends = join(", ", @recommends); diff --git a/makerpm.pl b/makerpm.pl index fa776f55c..334731ac1 100755 --- a/makerpm.pl +++ b/makerpm.pl @@ -86,7 +86,7 @@ Version: $ver Release: $rel Provides: %{name}-%{version} perl(WebminCore) Requires(pre): /usr/bin/perl -Requires: /bin/sh /usr/bin/perl /bin/rm perl(lib) perl(open) perl(Net::SSLeay) perl(Time::Local) perl(Encode::Detect) perl(Data::Dumper) perl(File::Path) perl(File::Basename) perl(Digest::SHA) perl(Digest::MD5) openssl unzip tar +Requires: /bin/sh /usr/bin/perl /bin/rm perl(lib) perl(open) perl(Net::SSLeay) perl(Time::Local) perl(Encode::Detect) perl(Data::Dumper) perl(File::Path) perl(File::Basename) perl(Digest::SHA) perl(Digest::MD5) openssl unzip tar gzip Recommends: perl(DateTime) perl(DateTime::TimeZone) perl(DateTime::Locale) perl(Time::Piece) lynx AutoReq: 0 License: BSD-3-clause diff --git a/miniserv.pl b/miniserv.pl index 729e0635d..6e1b0ed77 100755 --- a/miniserv.pl +++ b/miniserv.pl @@ -1693,6 +1693,10 @@ if ($use_ssl && $verified_client) { Net::SSLeay::get_peer_certificate( $ssl_con))); $u = &find_user_by_cert($peername); + if ($config{'trust_real_ip'} && !$u && $header{'x-ssl-client-dn'}) { + # Use proxied client cert + $u = &find_user_by_cert($header{'x-ssl-client-dn'}); + } if ($u) { $authuser = $u; $validated = 2;