[webmin-devel] Patches for sshd and init

[David L. <dav...@us...>]

Hi,

Sorry for the previous posts - should have sent reply in plain-text.

I think these two patches are correct.

init-lib.patch - Upstart services should call "initctl" instead of
"service".

diff --git init/init-lib.pl init/init-lib.pl
index 89301d5..37eb8dc 100755
--- init/init-lib.pl
+++ init/init-lib.pl
@@ -1695,7 +1695,7 @@ sub start_upstart_service
 {
 my ($name) = @_;
 my $out = &backquote_logged(
-	"service ".quotemeta($name)." start 2>&1 </dev/null");
+    "initctl start ".quotemeta($name)." 2>&1 </dev/null");
 return (!$?, $out);
 }

@@ -1708,7 +1708,7 @@ sub stop_upstart_service
 {
 my ($name) = @_;
 my $out = &backquote_logged(
-	"service ".quotemeta($name)." stop 2>&1 </dev/null");
+    "initctl stop ".quotemeta($name)." 2>&1 </dev/null");
 return (!$?, $out);
 }

@@ -1721,7 +1721,7 @@ sub restart_upstart_service
 {
 my ($name) = @_;
 my $out = &backquote_logged(
-	"service ".quotemeta($name)." restart 2>&1 </dev/null");
+    "initctl restart ".quotemeta($name)." 2>&1 </dev/null");
 return (!$?, $out);
 }


webmin-sshd.patch - Fixed typo and changed "rsa" to "dsa". Added 'AUTHPRIV'
to list of syslog facility codes.

diff --git sshd/edit_users.cgi sshd/edit_users.cgi
index a72f1ff..8acb0b0 100755
--- sshd/edit_users.cgi
+++ sshd/edit_users.cgi
@@ -84,7 +84,7 @@ if ($version{'type'} ne 'ssh' || $version{'number'} < 3)
{

 # SSH 2 DSA authentication
 if ($version{'type'} eq 'openssh' && $version{'number'} >= 3) {
-	$rsa = &find_value("PubkeyAuthentication", $conf);
+	$dsa = &find_value("PubkeyAuthentication", $conf);
 	print &ui_table_row($text{'users_dsa'},
 		&ui_yesno_radio('dsa', lc($dsa) ne 'no'));
 	}
diff --git sshd/sshd-lib.pl sshd/sshd-lib.pl
index fcbd50f..bb910b1 100755
--- sshd/sshd-lib.pl
+++ sshd/sshd-lib.pl
@@ -356,7 +356,7 @@ if (&foreign_check("syslog")) {
 	@facils = map { uc($_) } split(/\s+/, $sconfig{'facilities'});
 	}
 if (!@facils) {
-	@facils = ( 'DAEMON', 'USER', 'AUTH', 'LOCAL0', 'LOCAL1', 'LOCAL2',
+	@facils = ( 'DAEMON', 'USER', 'AUTH', 'AUTHPRIV', 'LOCAL0', 'LOCAL1',
'LOCAL2',
 		    'LOCAL3', 'LOCAL4', 'LOCAL5', 'LOCAL6', 'LOCAL7' );
 	}
 return @facils;

Thanks!
-David Lam