From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 12 Apr 2019 11:59:30 +0000 (+0200)
Subject: Merge pull request #12222 from yuwata/macsec
X-Git-Tag: v243-rc1~561
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b51629ad849cac72d4d41481e2082cdfdd0107ab;p=thirdparty%2Fsystemd.git

Merge pull request #12222 from yuwata/macsec

network: introduce MACsec
---

b51629ad849cac72d4d41481e2082cdfdd0107ab
diff --cc src/basic/fileio.h
index ffe900b486b,6fe00f456fe..eb551c7ac14
--- a/src/basic/fileio.h
+++ b/src/basic/fileio.h
@@@ -31,13 -31,9 +31,14 @@@ typedef enum 
  typedef enum {
          READ_FULL_FILE_SECURE   = 1 << 0,
          READ_FULL_FILE_UNBASE64 = 1 << 1,
+         READ_FULL_FILE_UNHEX    = 1 << 2,
  } ReadFullFileFlags;
  
 +int fopen_unlocked(const char *path, const char *options, FILE **ret);
 +int fdopen_unlocked(int fd, const char *options, FILE **ret);
 +FILE* open_memstream_unlocked(char **ptr, size_t *sizeloc);
 +FILE* fmemopen_unlocked(void *buf, size_t size, const char *mode);
 +
  int write_string_stream_ts(FILE *f, const char *line, WriteStringFileFlags flags, struct timespec *ts);
  static inline int write_string_stream(FILE *f, const char *line, WriteStringFileFlags flags) {
          return write_string_stream_ts(f, line, flags, NULL);