Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 6 additions and 7 deletions.
  1. +5 −6 main.cpp
  2. +1 −1 modules/{ → extra}/away.cpp
View
11 main.cpp
@@ -40,9 +40,7 @@ static const struct option g_LongOpts[] = {
{ "allow-root", no_argument, 0, 'r' },
{ "makeconf", no_argument, 0, 'c' },
{ "makepass", no_argument, 0, 's' },
-#ifdef HAVE_LIBSSL
{ "makepem", no_argument, 0, 'p' },
-#endif /* HAVE_LIBSSL */
{ "datadir", required_argument, 0, 'd' },
{ 0, 0, 0, 0 }
};
@@ -131,11 +129,9 @@ int main(int argc, char** argv) {
#endif
#ifdef HAVE_LIBSSL
bool bMakePem = false;
+#endif
while ((iArg = getopt_long(argc, argv, "hvnrcspd:Df", g_LongOpts, &iOptIndex)) != -1) {
-#else
- while ((iArg = getopt_long(argc, argv, "hvnrcsd:Df", g_LongOpts, &iOptIndex)) != -1) {
-#endif /* HAVE_LIBSSL */
switch (iArg) {
case 'h':
GenerateHelp(argv[0]);
@@ -155,10 +151,13 @@ int main(int argc, char** argv) {
case 's':
bMakePass = true;
break;
-#ifdef HAVE_LIBSSL
case 'p':
+#ifdef HAVE_LIBSSL
bMakePem = true;
break;
+#else
+ CUtils::PrintError("ZNC is compiled without SSL support.");
+ return 1;
#endif /* HAVE_LIBSSL */
case 'd':
sDataDir = CString(optarg);
View
2 modules/away.cpp → modules/extra/away.cpp
@@ -463,5 +463,5 @@ void CAwayJob::RunJob()
}
}
-MODULEDEFS(CAway, "Stores messages while away, also auto away")
+MODULEDEFS(CAway, "You don't need this module, ZNC works ok without it")

No commit comments for this range

Something went wrong with that request. Please try again.