keyfile: merge branch 'th/libnm-keyfile-bgo744699'

System Internals / NetworkManager - Thomas Haller [redhat.com] - 12 March 2015 12:22 UTC

59eb531 keyfile: merge branch 'th/libnm-keyfile-bgo744699'

.gitignore | 1 +
clients/cli/settings.c | 11 +-
include/nm-test-utils.h | 63 +
libnm-core/Makefile.libnm-core | 5 +
libnm-core/nm-core-internal.h | 6 +
libnm-core/nm-keyfile-internal.h | 166 ++
libnm-core/nm-keyfile-reader.c | 1656 ++++++++++++++++++++
libnm-core/nm-keyfile-utils.c | 207 +++
libnm-core/nm-keyfile-utils.h | 79 +
libnm-core/nm-keyfile-writer.c | 751 +++++++++
libnm-core/nm-setting-8021x.c | 199 ++-
libnm-core/nm-setting-8021x.h | 5 +
libnm-core/nm-utils.c | 125 ++
libnm-core/tests/Makefile.am | 35 +-
libnm-core/tests/certs/test-ca-cert.pem | 27 +
libnm-core/tests/certs/test-key-and-cert.pem | 118 ++
libnm-core/tests/test-general.c | 181 +++
libnm-core/tests/test-keyfile.c | 512 ++++++
libnm-core/tests/test-setting-8021x.c | 6 +-
libnm-util/nm-setting-8021x.c | 86 +-
libnm/libnm.ver | 1 +
po/POTFILES.in | 2 +
src/NetworkManagerUtils.c | 117 --
src/NetworkManagerUtils.h | 6 -
src/dhcp-manager/nm-dhcp-listener.c | 3 +-
src/platform/nm-linux-platform.c | 7 +-
src/platform/nm-platform.c | 3 +-
src/settings/plugins/ibft/reader.c | 18 +-
src/settings/plugins/ifcfg-rh/reader.c | 6 +-
src/settings/plugins/ifcfg-rh/shvar.c | 6 +-
src/settings/plugins/ifnet/connection_parser.c | 8 +-
src/settings/plugins/keyfile/common.h | 2 -
src/settings/plugins/keyfile/reader.c | 1333 +---------------
.../keyfile/tests/keyfiles/Test_Wired_TLS_Blob | 4 +-
.../keyfile/tests/keyfiles/Test_Wired_TLS_Old | 6 +-
src/settings/plugins/keyfile/tests/test-keyfile.c | 54 +-
src/settings/plugins/keyfile/utils.c | 175 ---
src/settings/plugins/keyfile/utils.h | 51 -
src/settings/plugins/keyfile/writer.c | 736 ++-------
src/settings/plugins/keyfile/writer.h | 1 -
src/tests/test-general.c | 178 ---
41 files changed, 4336 insertions(+), 2620 deletions(-)

Upstream: cgit.freedesktop.org


  • Share