From c68c1307242d83d441838385db8f4f8acfe3960d Mon Sep 17 00:00:00 2001
From: benrubson <ben.rubson@gmail.com>
Date: Sun, 2 Apr 2017 21:06:41 +0200
Subject: [PATCH] Add option 't' to set syslog tag

---
 encfs/encfs.pod |  5 +++++
 encfs/main.cpp  | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/encfs/encfs.pod b/encfs/encfs.pod
index 982f9b5..65414ef 100644
--- a/encfs/encfs.pod
+++ b/encfs/encfs.pod
@@ -66,6 +66,11 @@ Normally these logging messages are disabled and have no effect.  It is
 recommended that you run in foreground (B<-f>) mode when running with verbose
 enabled.
 
+=item B<-t>, B<--syslogtag>
+
+This option allows to set the syslog tag which will be used when messages are
+logged via syslog. By default the syslog tag is set to B<encfs>.
+
 =item B<-s>
 
 The B<-s> (I<single threaded>) option causes B<EncFS> to run in single threaded
diff --git a/encfs/main.cpp b/encfs/main.cpp
index 955a60f..ff6a485 100644
--- a/encfs/main.cpp
+++ b/encfs/main.cpp
@@ -80,6 +80,7 @@ struct EncFS_Args {
   int idleTimeout;  // 0 == idle time in minutes to trigger unmount
   const char *fuseArgv[MaxFuseArgs];
   int fuseArgc;
+  std::string syslogTag;  // syslog tag to use when logging using syslog
 
   std::shared_ptr<EncFS_Opts> opts;
 
@@ -190,6 +191,7 @@ static bool processArgs(int argc, char *argv[],
   out->isVerbose = false;
   out->idleTimeout = 0;
   out->fuseArgc = 0;
+  out->syslogTag = "encfs";
   out->opts->idleTracking = false;
   out->opts->checkKey = true;
   out->opts->forceDecode = false;
@@ -225,6 +227,7 @@ static bool processArgs(int argc, char *argv[],
       {"extpass", 1, 0, 'p'},           // external password program
       // {"single-thread", 0, 0, 's'},  // single-threaded mode
       {"stdinpass", 0, 0, 'S'},  // read password from stdin
+      {"syslogtag", 1, 0, 't'},         // syslog tag
       {"annotate", 0, 0,
        LONG_OPT_ANNOTATE},                  // Print annotation lines to stderr
       {"nocache", 0, 0, LONG_OPT_NOCACHE},  // disable caching
@@ -247,8 +250,9 @@ static bool processArgs(int argc, char *argv[],
     // 'm' : mount-on-demand
     // 'S' : password from stdin
     // 'o' : arguments meant for fuse
+    // 't' : syslog tag
     int res =
-        getopt_long(argc, argv, "HsSfvdmi:o:", long_options, &option_index);
+        getopt_long(argc, argv, "HsSfvdmi:o:t:", long_options, &option_index);
 
     if (res == -1) break;
 
@@ -265,6 +269,9 @@ static bool processArgs(int argc, char *argv[],
       case 'S':
         out->opts->useStdin = true;
         break;
+      case 't':
+        out->syslogTag = optarg;
+        break;
       case LONG_OPT_ANNOTATE:
         out->opts->annotate = true;
         break;
@@ -535,6 +542,7 @@ int main(int argc, char *argv[]) {
   }
 
   encfs::initLogging(encfsArgs->isVerbose, encfsArgs->isDaemon);
+  ELPP_INITIALIZE_SYSLOG(encfsArgs->syslogTag.c_str(), 0, 0);
 
   VLOG(1) << "Root directory: " << encfsArgs->opts->rootDir;
   VLOG(1) << "Fuse arguments: " << encfsArgs->toString();