Fix compile issues when SASL is disabled

diff --git a/ChangeLog b/ChangeLog
index 3fd97b6b930b0c7ddd1dd46690e87f641b44b81f..b087153f01457f8893588ca46b1e20f818907798 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec  5 14:16:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+       * qemud/qemud.c: Disable saslUsernameWhitelist config file
+       handling if SASL is disabled. (Rich Jones)
+       * src/remote_internal.c: Enable remoteDebug() API when SASL
+       is disabled too
+
 Wed Dec  5 14:16:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
        * docs/libvir.html: Add page about authentication setup options

diff --git a/qemud/qemud.c b/qemud/qemud.c
index 43305f1227c96cae1243ace02563f011fcbd0074..657b6ffa076e62c776f83a4898d5a14b4e4bdf47 100644 (file)
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -1644,6 +1644,7 @@ static void qemudCleanup(struct qemud_server *server) {
         sock = next;
     }
 
+#ifdef HAVE_SASL
     if (server->saslUsernameWhitelist) {
         char **list = server->saslUsernameWhitelist;
         while (*list) {
@@ -1652,6 +1653,7 @@ static void qemudCleanup(struct qemud_server *server) {
             list++;
         }
     }
+#endif
 
     virStateCleanup();
 
@@ -1817,6 +1819,27 @@ static int remoteConfigGetAuth(virConfPtr conf, const char *key, int *auth, cons
     return 0;
 }
 
+#ifdef HAVE_SASL
+static inline int
+remoteReadSaslAllowedUsernameList (virConfPtr conf,
+                                   struct qemud_server *server,
+                                   const char *filename)
+{
+    return
+        remoteConfigGetStringList (conf, "sasl_allowed_username_list",
+                                   &server->saslUsernameWhitelist, filename);
+}
+#else
+static inline int
+remoteReadSaslAllowedUsernameList (virConfPtr conf ATTRIBUTE_UNUSED,
+                                   struct qemud_server *server ATTRIBUTE_UNUSED,
+                                   const char *filename ATTRIBUTE_UNUSED)
+{
+    return 0;
+}
+#endif
+
+
 /* Read the config file if it exists.
  * Only used in the remote case, hence the name.
  */
@@ -1913,8 +1936,7 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename)
                                    &tls_allowed_dn_list, filename) < 0)
         goto free_and_fail;
 
-    if (remoteConfigGetStringList (conf, "sasl_allowed_username_list",
-                                   &server->saslUsernameWhitelist, filename) < 0)
+    if (remoteReadSaslAllowedUsernameList (conf, server, filename) < 0)
         goto free_and_fail;
 
     virConfFree (conf);

diff --git a/src/remote_internal.c b/src/remote_internal.c
index 068f46674d57805fcc8fb3bcecd50963df57eb6e..edadc5622fabe67073aaf93641da41b9b1d54488 100644 (file)
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -163,7 +163,7 @@ remoteStartup(void)
     return 0;
 }
 
-#if HAVE_SASL
+#if HAVE_SASL || HAVE_POLKIT
 static void
 remoteDebug(struct private_data *priv, const char *msg,...)
 {