From 5904aa5cc440d0313d81df10a68d66afbb8c2a8d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 5 Jul 2009 17:30:56 +0000 Subject: [PATCH] - drop obsolete files Changed files: VMware-server-config-pam.patch -> 1.2 VMware-server-config-rc-inetd.patch -> 1.4 --- VMware-server-config-pam.patch | 13 ----- VMware-server-config-rc-inetd.patch | 73 ----------------------------- 2 files changed, 86 deletions(-) delete mode 100644 VMware-server-config-pam.patch delete mode 100644 VMware-server-config-rc-inetd.patch diff --git a/VMware-server-config-pam.patch b/VMware-server-config-pam.patch deleted file mode 100644 index 385d2eb..0000000 --- a/VMware-server-config-pam.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- vmware-server-distrib/bin/vmware-config.pl~ 2008-04-08 08:31:09.000000000 +0300 -+++ vmware-server-distrib/bin/vmware-config.pl 2008-04-08 09:17:56.468815748 +0300 -@@ -7671,10 +7671,6 @@ - . '>/dev/null 2>&1'); - - configure_superserver(); -- if (vmware_product() ne 'server') { -- # authd pam file is automatically installed in ESX Server -- configure_wgs_pam_d(); -- } - fix_vmlist_permissions(); - } - diff --git a/VMware-server-config-rc-inetd.patch b/VMware-server-config-rc-inetd.patch deleted file mode 100644 index de95dc0..0000000 --- a/VMware-server-config-rc-inetd.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- vmware-server-distrib/bin/vmware-config.pl 2007-11-09 14:22:03.000000000 +0200 -+++ vmware-server-distrib/bin/vmware-config.pl 2008-04-07 14:56:57.510937518 +0300 -@@ -7499,6 +7500,7 @@ - my $inetd_conf = "/etc/inetd.conf"; - my $xinetd_conf = "/etc/xinetd.conf"; - my $xinetd_dir = "/etc/xinetd.d"; -+ my $rcinetd_dir = "/etc/sysconfig/rc-inetd"; - my $success = 0; - my $port; - -@@ -7550,12 +7552,16 @@ - . ' clients on other machines.' . "\n", 0); - } - -+ if (-d $rcinetd_dir) { -+ $success = configure_rcinetd($rcinetd_dir, $port); -+ } -+ - # check for xinetd - # XXX Could be a problem, as they could start xinetd with '-f config_file'. - # We could do a ps -ax, look for xinetd, parse the line, find the config - # file, parse the config file to find the xinet.d directory. Bah. Or - # parse if from the init.d script somewhere. If they use init.d. -- if (check_is_running('xinetd')) { -+ if (!$success && check_is_running('xinetd')) { - if (open(CONF, $xinetd_conf)) { - # Let's try to find it here - while () { -@@ -7732,6 +7738,17 @@ - } - } - -+#Restart rc-inetd -+sub restart_rcinetd { -+ my $rcinetd_restart = db_get_answer('INITSCRIPTSDIR') . '/rc-inetd'; -+ if (-e $rcinetd_restart) { -+ if (!system(shell_string($rcinetd_restart) . ' restart')) { -+ return; -+ } -+ } -+} -+ -+ - # Update the Internet super-server's configuration file, and make the - # super-server read it - sub configure_xinetd { -@@ -7758,6 +7775,26 @@ - restart_xinetd(); - } - -+# Update the Internet super-server's configuration file, and make the -+# super-server read it -+sub configure_rcinetd { -+ my $conf_dir = shift; -+ my $port = shift; -+ -+ my $authd_conf_file = "$conf_dir/vmware-authd"; -+ my $authd = db_get_answer('SBINDIR') . "/vmware-authd"; -+ -+ my %patch = ( '%port%' => $port, '%authd%' => $authd ); -+ -+ install_file(db_get_answer('LIBDIR') . '/configurator/authd-rc-inetd.conf', -+ $authd_conf_file, \%patch, -+ $cFlagTimestamp | $cFlagConfig); -+ -+ restart_rcinetd(); -+ return 1; -+} -+ -+ - # Setup the hostd configuration files - sub configure_hostd { - my %patch; -- 2.43.0