diff --git a/src/core/msystem.cpp b/src/core/msystem.cpp index 025442d..e122fd1 100644 --- a/src/core/msystem.cpp +++ b/src/core/msystem.cpp @@ -94,6 +94,13 @@ #include #include "msystem.h" +#if IS_REDOX +#define setuid(x) sleep(0) +#define setgid(x) sleep(0) +#endif + + + /* * signal type */ diff --git a/src/core/unixfsservices.cpp b/src/core/unixfsservices.cpp index 2229b62..83b576c 100644 --- a/src/core/unixfsservices.cpp +++ b/src/core/unixfsservices.cpp @@ -77,6 +77,10 @@ #include +#if IS_REDOX +#define restrict __restrict__ +#endif + #if HAVE_SYS_SOCKET_H # include # include @@ -538,7 +542,8 @@ bool cUnixFSServices::GetUserName( uid_t user_id, TSTRING& tstrUser ) const bool cUnixFSServices::GetGroupName( gid_t group_id, TSTRING& tstrGroup ) const { bool fSuccess = true; - + +#if !IS_REDOX if( mResolveNames ) { struct group* pg = getgrgid( group_id ); @@ -552,10 +557,13 @@ bool cUnixFSServices::GetGroupName( gid_t group_id, TSTRING& tstrGroup ) const } else { +#endif std::stringstream sstr; sstr << group_id; tstrGroup = sstr.str(); +#if !IS_REDOX } +#endif return( fSuccess ); } diff --git a/src/tripwire/mailmessage.h b/src/tripwire/mailmessage.h index 734119a..5e86aac 100644 --- a/src/tripwire/mailmessage.h +++ b/src/tripwire/mailmessage.h @@ -36,7 +36,11 @@ #include "core/error.h" #endif -#if HAVE_SYS_SOCKET_H +#if IS_REDOX +#define restrict __restrict__ +#endif + +#if SUPPORTS_NETWORKING && HAVE_SYS_SOCKET_H # include #endif #define SOCKET int @@ -207,7 +211,7 @@ public: }; - +#if SUPPORTS_NETWORKING /////////////////////////////////////////////////////////////////////////////// // // This class implements sending a message via SMTP @@ -245,7 +249,7 @@ private: TSTRING mstrServerName; unsigned short mPortNumber; }; - +#endif /////////////////////////////////////////////////////////////////////////////// // diff --git a/src/tripwire/smtpmailmessage.cpp b/src/tripwire/smtpmailmessage.cpp index 695b649..1d04fe5 100644 --- a/src/tripwire/smtpmailmessage.cpp +++ b/src/tripwire/smtpmailmessage.cpp @@ -42,6 +42,8 @@ #include +#if SUPPORTS_NETWORKING + //All the spleck that it takes to run sockets in Unix... #include #if HAVE_SYS_SOCKET_H @@ -564,3 +566,5 @@ void cSMTPMailMessage::DecodeError() #endif // defined(_DEBUG) } +#endif // SUPPORTS_NETWORKING + diff --git a/src/tripwire/twcmdlineutil.cpp b/src/tripwire/twcmdlineutil.cpp index 98e95c5..68fb7b2 100644 --- a/src/tripwire/twcmdlineutil.cpp +++ b/src/tripwire/twcmdlineutil.cpp @@ -536,15 +536,16 @@ static bool EmailReportTo(const TSTRING &toAddress, const cFCOReportHeader& head // allocate the right kind of emailer object based on what came out of the config file. switch (modeCommon->mMailMethod) { - default: - ASSERT(false); - return false; +#if SUPPORTS_NETWORKING case cMailMessage::MAIL_BY_SMTP: reportMail = TW_UNIQUE_PTR(new cSMTPMailMessage(modeCommon->mSmtpHost, modeCommon->mSmtpPort)); break; +#endif case cMailMessage::MAIL_BY_PIPE: reportMail = TW_UNIQUE_PTR(new cPipedMailMessage(modeCommon->mMailProgram)); break; + default: + return false; } TSTRING strTempFilename; @@ -690,15 +691,16 @@ bool cTWCmdLineUtil::SendEmailTestMessage(const TSTRING &mAddress, const cTWMode // allocate the right kind of emailer object based on what came out of the config file. switch (modeCommon->mMailMethod) { - default: - ASSERT(false); - return false; +#if SUPPORTS_NETWORKING case cMailMessage::MAIL_BY_SMTP: reportMail = TW_UNIQUE_PTR(new cSMTPMailMessage(modeCommon->mSmtpHost, modeCommon->mSmtpPort)); break; +#endif case cMailMessage::MAIL_BY_PIPE: reportMail = TW_UNIQUE_PTR(new cPipedMailMessage(modeCommon->mMailProgram)); break; + default: + return false; }