Browse Source

Completed SENDMAIL-08 (on OpenSuse).


git-svn-id: https://svn.microneil.com/svn/SNFUtility/trunk@40 aa37657e-1934-4a5f-aa6d-2d8eab27ff7c
master
adeniz 12 years ago
parent
commit
45b9580624
2 changed files with 6 additions and 6 deletions
  1. 1
    1
      SNFMilterConfig/SNFMilterConfigTests.txt
  2. 5
    5
      SNFMilterConfig/SendmailIntegrate.cpp

+ 1
- 1
SNFMilterConfig/SNFMilterConfigTests.txt View File

@@ -640,7 +640,7 @@ SENDMAIL-07: Repeat SENDMAIL-01 and SENDMAIL-04 on Fedora.

SENDMAIL-08: Repeat SENDMAIL-01 and SENDMAIL-04 on OpenSuse.

Result:
Result: Pass.

SENDMAIL-09: Repeat SENDMAIL-01 and SENDMAIL-04 on CentOS.


+ 5
- 5
SNFMilterConfig/SendmailIntegrate.cpp View File

@@ -60,7 +60,7 @@ SendmailIntegrate::SetOperatingSystem(std::string OperatingSystemType) {
SendmailSendmailMcPath = "/etc/mail/sendmail.mc";
SendmailSendmailCfPath = "/etc/mail/sendmail.cf";
BuildInstallSendmailCfFile = "(cd /etc/mail; make)";
BuildInstallSendmailCfFile = "(cd /etc/mail && make)";
ReloadMtaCommand = "/usr/sbin/service sendmail reload";
FileToBackup.push_back(SendmailSendmailMcPath);
@@ -70,7 +70,7 @@ SendmailIntegrate::SetOperatingSystem(std::string OperatingSystemType) {
SendmailSendmailMcPath = "/etc/mail/sendmail.mc";
SendmailSendmailCfPath = "/etc/mail/sendmail.cf";
BuildInstallSendmailCfFile = "(cd /etc/mail; make)";
BuildInstallSendmailCfFile = "(cd /etc/mail && make)";
ReloadMtaCommand = "/sbin/service sendmail reload";
FileToBackup.push_back(SendmailSendmailMcPath);
@@ -80,8 +80,8 @@ SendmailIntegrate::SetOperatingSystem(std::string OperatingSystemType) {
SendmailSendmailMcPath = "/etc/mail/linux.mc";
SendmailSendmailCfPath = "/etc/mail/sendmail.cf";
BuildInstallSendmailCfFile = "(cd /etc/mail; rm sendmail.cf; m4 /etc/mail/linux.mc > sendmail.cf)";
ReloadMtaCommand = "/usr/sbin/postfix reload";
BuildInstallSendmailCfFile = "(cd /etc/mail && rm -f sendmail.cf && m4 /etc/mail/linux.mc > sendmail.cf)";
ReloadMtaCommand = "/sbin/service sendmail reload";
FileToBackup.push_back(SendmailSendmailMcPath);
FileToBackup.push_back(SendmailSendmailCfPath);
@@ -195,7 +195,7 @@ SendmailIntegrate::Unintegrate(FileBackup *SaveFile) {
std::cout << "Remove integration in sendmail file " << SendmailSendmailMcPath
<< " and generate new " << SendmailSendmailCfPath << " file with the command '"
<< BuildInstallSendmailCfFile << "'...";
<< BuildInstallSendmailCfFile << "'--\n";
}

Loading…
Cancel
Save