sd-bus: add support for new InteractiveAuthorizationRequired error from dbus spec

diff --git a/src/libsystemd/sd-bus/bus-error-mapping.gperf b/src/libsystemd/sd-bus/bus-error-mapping.gperf
index df2c4d407de7bb3464e984134ab93a3e4901659f..59eaa3554bcc2660d5b380a62cc4abacfab0a91a 100644 (file)
--- a/src/libsystemd/sd-bus/bus-error-mapping.gperf
+++ b/src/libsystemd/sd-bus/bus-error-mapping.gperf
@@ -13,37 +13,38 @@ name_error_mapping;
 %struct-type
 %includes
 %%
 %struct-type
 %includes
 %%

-org.freedesktop.DBus.Error.Failed,                        EACCES
-org.freedesktop.DBus.Error.NoMemory,                      ENOMEM
-org.freedesktop.DBus.Error.ServiceUnknown,                EHOSTUNREACH
-org.freedesktop.DBus.Error.NameHasNoOwner,                ENXIO
-org.freedesktop.DBus.Error.NoReply,                       ETIMEDOUT
-org.freedesktop.DBus.Error.IOError,                       EIO
-org.freedesktop.DBus.Error.BadAddress,                    EADDRNOTAVAIL
-org.freedesktop.DBus.Error.NotSupported,                  ENOTSUP
-org.freedesktop.DBus.Error.LimitsExceeded,                ENOBUFS
-org.freedesktop.DBus.Error.AccessDenied,                  EACCES
-org.freedesktop.DBus.Error.AuthFailed,                    EACCES
-org.freedesktop.DBus.Error.NoServer,                      EHOSTDOWN
-org.freedesktop.DBus.Error.Timeout,                       ETIMEDOUT
-org.freedesktop.DBus.Error.NoNetwork,                     ENONET
-org.freedesktop.DBus.Error.AddressInUse,                  EADDRINUSE
-org.freedesktop.DBus.Error.Disconnected,                  ECONNRESET
-org.freedesktop.DBus.Error.InvalidArgs,                   EINVAL
-org.freedesktop.DBus.Error.FileNotFound,                  ENOENT
-org.freedesktop.DBus.Error.FileExists,                    EEXIST
-org.freedesktop.DBus.Error.UnknownMethod,                 EBADR
-org.freedesktop.DBus.Error.UnknownObject,                 EBADR
-org.freedesktop.DBus.Error.UnknownInterface,              EBADR
-org.freedesktop.DBus.Error.UnknownProperty,               EBADR
-org.freedesktop.DBus.Error.PropertyReadOnly,              EROFS
-org.freedesktop.DBus.Error.UnixProcessIdUnknown,          ESRCH
-org.freedesktop.DBus.Error.InvalidSignature,              EINVAL
-org.freedesktop.DBus.Error.InconsistentMessage,           EBADMSG
+org.freedesktop.DBus.Error.Failed,                          EACCES
+org.freedesktop.DBus.Error.NoMemory,                        ENOMEM
+org.freedesktop.DBus.Error.ServiceUnknown,                  EHOSTUNREACH
+org.freedesktop.DBus.Error.NameHasNoOwner,                  ENXIO
+org.freedesktop.DBus.Error.NoReply,                         ETIMEDOUT
+org.freedesktop.DBus.Error.IOError,                         EIO
+org.freedesktop.DBus.Error.BadAddress,                      EADDRNOTAVAIL
+org.freedesktop.DBus.Error.NotSupported,                    ENOTSUP
+org.freedesktop.DBus.Error.LimitsExceeded,                  ENOBUFS
+org.freedesktop.DBus.Error.AccessDenied,                    EACCES
+org.freedesktop.DBus.Error.AuthFailed,                      EACCES
+org.freedesktop.DBus.Error.InteractiveAuthorizationRequired EACCES
+org.freedesktop.DBus.Error.NoServer,                        EHOSTDOWN
+org.freedesktop.DBus.Error.Timeout,                         ETIMEDOUT
+org.freedesktop.DBus.Error.NoNetwork,                       ENONET
+org.freedesktop.DBus.Error.AddressInUse,                    EADDRINUSE
+org.freedesktop.DBus.Error.Disconnected,                    ECONNRESET
+org.freedesktop.DBus.Error.InvalidArgs,                     EINVAL
+org.freedesktop.DBus.Error.FileNotFound,                    ENOENT
+org.freedesktop.DBus.Error.FileExists,                      EEXIST
+org.freedesktop.DBus.Error.UnknownMethod,                   EBADR
+org.freedesktop.DBus.Error.UnknownObject,                   EBADR
+org.freedesktop.DBus.Error.UnknownInterface,                EBADR
+org.freedesktop.DBus.Error.UnknownProperty,                 EBADR
+org.freedesktop.DBus.Error.PropertyReadOnly,                EROFS
+org.freedesktop.DBus.Error.UnixProcessIdUnknown,            ESRCH
+org.freedesktop.DBus.Error.InvalidSignature,                EINVAL
+org.freedesktop.DBus.Error.InconsistentMessage,             EBADMSG

 #
 #

-org.freedesktop.DBus.Error.TimedOut,                      ETIMEDOUT
-org.freedesktop.DBus.Error.MatchRuleInvalid,              EINVAL
-org.freedesktop.DBus.Error.InvalidFileContent,            EINVAL
-org.freedesktop.DBus.Error.MatchRuleNotFound,             ENOENT
-org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown, ESRCH
-org.freedesktop.DBus.Error.ObjectPathInUse,               EBUSY
+org.freedesktop.DBus.Error.TimedOut,                        ETIMEDOUT
+org.freedesktop.DBus.Error.MatchRuleInvalid,                EINVAL
+org.freedesktop.DBus.Error.InvalidFileContent,              EINVAL
+org.freedesktop.DBus.Error.MatchRuleNotFound,               ENOENT
+org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown,   ESRCH
+org.freedesktop.DBus.Error.ObjectPathInUse,                 EBUSY

diff --git a/src/systemd/sd-bus-protocol.h b/src/systemd/sd-bus-protocol.h
index 439a77961e9caf179297a5e2a41ea62e30a028c9..5185a48b31ea422bfcf01ad415c489f5103c0711 100644 (file)
--- a/src/systemd/sd-bus-protocol.h
+++ b/src/systemd/sd-bus-protocol.h
@@ -96,6 +96,8 @@ enum {
 #define SD_BUS_ERROR_INCONSISTENT_MESSAGE       "org.freedesktop.DBus.Error.InconsistentMessage"
 #define SD_BUS_ERROR_MATCH_RULE_NOT_FOUND       "org.freedesktop.DBus.Error.MatchRuleNotFound"
 #define SD_BUS_ERROR_MATCH_RULE_INVALID         "org.freedesktop.DBus.Error.MatchRuleInvalid"
 #define SD_BUS_ERROR_INCONSISTENT_MESSAGE       "org.freedesktop.DBus.Error.InconsistentMessage"
 #define SD_BUS_ERROR_MATCH_RULE_NOT_FOUND       "org.freedesktop.DBus.Error.MatchRuleNotFound"
 #define SD_BUS_ERROR_MATCH_RULE_INVALID         "org.freedesktop.DBus.Error.MatchRuleInvalid"

+#define SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED \
+                                                "org.freedesktop.DBus.Error.InteractiveAuthorizationRequired"

 
 _SD_END_DECLARATIONS;
 
 
 _SD_END_DECLARATIONS;