tincctl: Use replace_name to properly replace and validate input hostnames

This commit is contained in:
William A. Kennington III 2014-08-24 22:35:25 -07:00 committed by Guus Sliepen
parent 511b51ffe6
commit 38d7e730e6
4 changed files with 13 additions and 4 deletions

View file

@ -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);

View file

@ -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"

View file

@ -1305,7 +1305,7 @@ char *get_my_name(bool verbose) {
continue;
if(*value) {
fclose(f);
return strdup(value);
return replace_name(value);
}
}

View file

@ -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+/";