tincctl: Use replace_name to properly replace and validate input hostnames

diff --git a/src/logger.h b/src/logger.h
index 637eef8419506fae945992c267e245832623fe81..8f6902903a9ac68768ed4b9963bff46008d2caf7 100644 (file)
--- a/src/logger.h
+++ b/src/logger.h
@@ -65,6 +65,8 @@ enum {
 #endif
 #endif
 
+#include <stdbool.h>
+
 extern debug_t debug_level;
 extern bool logcontrol;
 extern void openlogger(const char *, logmode_t);

diff --git a/src/sptps_keypair.c b/src/sptps_keypair.c
index f66a77111b3fdc10ade81619c5ced6007e619cfd..399404e192f01ba639b5743d120a41405cda8262 100644 (file)
--- a/src/sptps_keypair.c
+++ b/src/sptps_keypair.c
@@ -27,6 +27,14 @@
 
 static char *program_name;
 
+void logger(int level, int priority, const char *format, ...) {
+       va_list ap;
+       va_start(ap, format);
+       vfprintf(stderr, format, ap);
+       va_end(ap);
+       fputc('\n', stderr);
+}
+
 static void usage() {
        fprintf(stderr, "Usage: %s [options] private_key_file public_key_file\n\n", program_name);
        fprintf(stderr, "Valid options are:\n"

diff --git a/src/tincctl.c b/src/tincctl.c
index 158dfed89acd3201d0b1d2084565500ffa3a0b2e..f18dc50ee2f7c919e1af4f0356c4c64a344460e6 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1305,7 +1305,7 @@ char *get_my_name(bool verbose) {
                        continue;
                if(*value) {
                        fclose(f);
-                       return strdup(value);
+                       return replace_name(value);
                }
        }
 

diff --git a/src/utils.c b/src/utils.c
index db7a8cd631949d41e2ba4a73af9b91af2d8ecf92..8fbc7108e9a3ffe8536b317e201fd5f5595566a0 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -18,11 +18,10 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "logger.h"
 #include "system.h"
-#include "xalloc.h"
-
-#include "../src/logger.h"
 #include "utils.h"
+#include "xalloc.h"
 
 static const char hexadecimals[] = "0123456789ABCDEF";
 static const char base64_original[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";