X-Git-Url: https://git.realraum.at/?p=svn42.git;a=blobdiff_plain;f=door_daemon%2Foptions.c;h=f5835a2d6ad52dcfd661ee32e42c2ce1919b85ad;hp=b438808217fd6a7305f3ea01d135dfe4a7d66831;hb=4ee2501ff864b8e15202ee814e8bafcc0c2adf6c;hpb=b99e674aa19b8ca1043cd31705df21318ac04b47

diff --git a/door_daemon/options.c b/door_daemon/options.c
index b438808..f5835a2 100644
--- a/door_daemon/options.c
+++ b/door_daemon/options.c
@@ -6,8 +6,9 @@
  *  This file is part of door_daemon.
  *
  *  door_daemon is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
  *
  *  door_daemon is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -200,7 +201,7 @@ void options_default(options_t* opt)
   string_list_init(&opt->log_targets_);
 
   opt->door_dev_ = strdup("/dev/door");
-  opt->command_sock_ = strdup("/var/run/door_daemon");
+  opt->command_sock_ = strdup("/var/run/door_daemon/cmd.sock");
 }
 
 void options_clear(options_t* opt)
@@ -238,8 +239,8 @@ void options_print_usage()
   printf("            [-L|--log] <target>:<level>[,<param1>[,<param2>..]]\n");
   printf("                                                add a log target, can be invoked several times\n");
 
-  printf("            [-d|--device] <tty device>          the device file e.g. /dev/ttyUSB0\n");
-  printf("            [-s|--command-sock] <unix sock>     the command socket e.g. /var/run/door_daemon\n");
+  printf("            [-d|--device] <tty device>          the device file e.g. /dev/door\n");
+  printf("            [-s|--command-sock] <unix sock>     the command socket e.g. /var/run/door_daemon/cmd.sock\n");
 }
 
 void options_print(options_t* opt)