From fb9f90c94201210ab2fd28b59108f984965f2c48 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Fri, 23 Feb 2007 14:33:37 +0000 Subject: [PATCH] Fri Feb 23 14:32:54 IST 2007 Mark McLoughlin * qemud/conf.c: don't load config files unless they have a ".xml" suffix, e.g. backup files ... we spew a warning later if we do. --- ChangeLog | 6 ++++++ qemud/conf.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6f8ff3ed8b..acecab7518 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Feb 23 14:32:54 IST 2007 Mark McLoughlin + + * qemud/conf.c: don't load config files unless they have + a ".xml" suffix, e.g. backup files ... we spew a warning + later if we do. + Fri Feb 23 12:49:11 IST 2007 Mark McLoughlin * qemud/libvirtd.in: add init script for libvirt_qemud diff --git a/qemud/conf.c b/qemud/conf.c index e22a0e2279..68d32ba814 100644 --- a/qemud/conf.c +++ b/qemud/conf.c @@ -1750,6 +1750,19 @@ compareFileToNameSuffix(const char *file, return 0; } +static int +hasSuffix(const char *str, + const char *suffix) +{ + int len = strlen(str); + int suffixlen = strlen(suffix); + + if (len < suffixlen) + return 0; + + return strcmp(str + len - suffixlen, suffix) == 0; +} + static int checkLinkPointsTo(const char *checkLink, const char *checkDest) @@ -1945,6 +1958,9 @@ int qemudScanConfigDir(struct qemud_server *server, if (entry->d_name[0] == '.') continue; + if (!hasSuffix(entry->d_name, ".xml")) + continue; + if (qemudMakeConfigPath(configDir, entry->d_name, NULL, path, PATH_MAX) < 0) { qemudLog(QEMUD_WARN, "Config filename '%s/%s' is too long", configDir, entry->d_name);