Fri Feb 23 14:32:54 IST 2007 Mark McLoughlin <markmc@redhat.com>

        * 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.

diff --git a/ChangeLog b/ChangeLog
index 6f8ff3ed8bc54ea5548982f0f17f7d8cf2c25495..acecab7518e3854ae63cde8f36029d06c7d9b67e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 23 14:32:54 IST 2007 Mark McLoughlin <markmc@redhat.com>
+
+       * 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 <markmc@redhat.com>
 
        * qemud/libvirtd.in: add init script for libvirt_qemud

diff --git a/qemud/conf.c b/qemud/conf.c
index e22a0e22795aa39bff54cfacac7481e6326853d1..68d32ba814cb4a03874060c1c2ab96d5a8817cc8 100644 (file)
--- 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);