Hack --plugins=path

[src/app-framework-binder.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 8a4532d..dddc3e1 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -108,8 +108,8 @@ static  AFB_options cliOptions [] = {
   {SET_CONFIG_EXIT  ,0,"saveonly"        , "Save config on disk and then exit"},
 
   {SET_SMACK        ,1,"smack"           , "Set Smack Label [default demo]"},
-  {SET_PLUGINS      ,1,"mods"            , "Enable module [default all]"},
-  {SET_AUTH_TOKEN   ,1,"token"           , "Initial Secret [default=non]"},
+  {SET_PLUGINS      ,1,"plugins"         , "Load Plugins from dir [default = PLUGIN_INSTALL_DIR"},
+  {SET_AUTH_TOKEN   ,1,"token"           , "Initial Secret [default=no-session, --token="" for session without authentication]"},
   
   {DISPLAY_VERSION  ,0,"version"         , "Display version and copyright"},
   {DISPLAY_HELP     ,0,"help"            , "Display this help"},
@@ -159,7 +159,7 @@ void signalQuit (int signum) {
          fprintf (stderr,"  --%-15s %s\n", command, cliOptions[ind].help);
       }
     }
-    fprintf (stderr,"Example:\n  %s\\\n  --verbose --port=1234 --smack=xxxx --token='azerty' --mods=alsa:dbus\n", name);
+    fprintf (stderr,"Example:\n  %s\\\n  --verbose --port=1234 --smack=xxxx --token='azerty' --plugins=build/plugins\n", name);
 } // end printHelp
 
 /*----------------------------------------------------------
@@ -246,7 +246,7 @@ static void listenLoop (AFB_session *session) {
         fprintf (stderr, "hoops returned from infinite loop [report bug]\n");
   }
 }
- 
+  
 /*---------------------------------------------------------
  | main
  |   Parse option and launch action
@@ -357,7 +357,6 @@ int main(int argc, char *argv[])  {
 
     case SET_PLUGINS:
        if (optarg == 0) goto needValueForOption;
-       fprintf (stderr, "Not Implemented yet\n");
        cliconfig.plugins = optarg;
        break;
 
@@ -510,7 +509,7 @@ int main(int argc, char *argv[])  {
     }
 
     // let's not take the risk to run as ROOT
-    if (getuid() == 0)  goto errorNoRoot;
+    //if (getuid() == 0)  goto errorNoRoot;
 
     // check session dir and create if it does not exist
     if (sessionCheckdir (session) != AFB_SUCCESS) goto errSessiondir;
@@ -597,9 +596,9 @@ errorSetuid:
   fprintf (stderr,"\nERR:AFB-daemon Failed to change UID to username=[%s]\n\n", session->config->setuid);
   exit (-1);
   
-errorNoRoot:
-  fprintf (stderr,"\nERR:AFB-daemon Not allow to run as root [use --seteuid=username option]\n\n");
-  exit (-1);
+//errorNoRoot:
+//  fprintf (stderr,"\nERR:AFB-daemon Not allow to run as root [use --seteuid=username option]\n\n");
+//  exit (-1);
 
 errorPidFile:
   fprintf (stderr,"\nERR:AFB-daemon Failed to write pid file [%s]\n\n", session->config->pidfile);