Add an invalid state in DBusAuthState to use for invalid lines in auth scripts.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=93909
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

diff --git a/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c
index aaaed30d35e40aefdb53cde2156f8bb49e89dc06..e42c8e518892345a861abb5c216a8f68084ed908 100644 (file)
--- a/dbus/dbus-auth-script.c
+++ b/dbus/dbus-auth-script.c
@@ -146,7 +146,7 @@ auth_state_from_string (const DBusString *str)
   else if (_dbus_string_starts_with_c_str (str, "AUTHENTICATED"))
     return DBUS_AUTH_STATE_AUTHENTICATED;
   else
-    return -1;
+    return DBUS_AUTH_STATE_INVALID;
 }
 
 static const char*
@@ -164,6 +164,8 @@ auth_state_to_string (DBusAuthState state)
       return "NEED_DISCONNECT";
     case DBUS_AUTH_STATE_AUTHENTICATED:
       return "AUTHENTICATED";
+    default:
+      break;
     }
 
   return "unknown";

diff --git a/dbus/dbus-auth.h b/dbus/dbus-auth.h
index e0323023d891131b3a0e9c707e45c9a7abb9758d..c62bcd18fcdda99497a150ee5f19fd94dca0bae4 100644 (file)
--- a/dbus/dbus-auth.h
+++ b/dbus/dbus-auth.h
@@ -38,7 +38,8 @@ typedef enum
   DBUS_AUTH_STATE_WAITING_FOR_MEMORY,
   DBUS_AUTH_STATE_HAVE_BYTES_TO_SEND,
   DBUS_AUTH_STATE_NEED_DISCONNECT,
-  DBUS_AUTH_STATE_AUTHENTICATED
+  DBUS_AUTH_STATE_AUTHENTICATED,
+  DBUS_AUTH_STATE_INVALID = -1
 } DBusAuthState;
 
 DBUS_PRIVATE_EXPORT

diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c
index dce5c7d31f04a4893442560d0883c0c3baa49518..88fde42bd4b2839d580da80ab5839ebeba4674cd 100644 (file)
--- a/dbus/dbus-transport-socket.c
+++ b/dbus/dbus-transport-socket.c
@@ -476,6 +476,8 @@ do_authentication (DBusTransport *transport,
           _dbus_verbose (" %s auth state: authenticated\n",
                          TRANSPORT_SIDE (transport));
           break;
+        default:
+          _dbus_assert_not_reached ("invalid auth state");
         }
     }