Don't use %m in fprintf().

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 9e8b49b..01c3fcd 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -19,7 +19,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: conf.c,v 1.9.4.39 2001/01/13 16:36:20 guus Exp $
+    $Id: conf.c,v 1.9.4.42 2001/07/24 20:03:40 guus Exp $
 */
 
 #include "config.h"
@@ -35,6 +35,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <syslog.h>
+#include <string.h>
 
 #include <xalloc.h>
 #include <utils.h> /* for cp */
@@ -83,6 +84,7 @@ static internal_config_t hazahaza[] = {
   { "RestrictSubnets", config_restrictsubnets, TYPE_BOOL },
   { "Subnet",       config_subnet,         TYPE_IP },          /* Use IPv4 subnets only for now */
   { "TCPonly",      config_tcponly,        TYPE_BOOL },
+  { "Mode",         config_mode,           TYPE_NAME },
   { NULL, 0, 0 }
 };
 
@@ -236,7 +238,7 @@ cp
   if((fp = fopen (fname, "r")) == NULL)
     {
       syslog(LOG_ERR, _("Cannot open config file %s: %m"), fname);
-      return -1;
+      return -3;
     }
 
   bufsize = 100;
@@ -318,7 +320,7 @@ int read_server_config()
 cp
   asprintf(&fname, "%s/tinc.conf", confbase);
   x = read_config_file(&config, fname);
-  if(x == -1) /* System error */
+  if(x == -1) /* System error: complain */
     {
       syslog(LOG_ERR, _("Failed to read `%s': %m"),
              fname);
@@ -494,7 +496,7 @@ FILE *ask_and_safe_open(const char* filename, const char* what, const char* mode
 
       if((fn = readline(stdin, NULL, NULL)) == NULL)
        {
-         fprintf(stderr, _("Error while reading stdin: %m\n"));
+         fprintf(stderr, _("Error while reading stdin: %s\n"), strerror(errno));
          return NULL;
        }
 
@@ -520,8 +522,8 @@ FILE *ask_and_safe_open(const char* filename, const char* what, const char* mode
   /* Open it first to keep the inode busy */
   if((r = fopen(fn, mode)) == NULL)
     {
-      fprintf(stderr, _("Error opening file `%s': %m\n"),
-             fn);
+      fprintf(stderr, _("Error opening file `%s': %s\n"),
+             fn, strerror(errno));
       free(fn);
       return NULL;
     }