X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemd%2Fsd-bus.h;h=1cce9c59b91a656edac8872b1548a0395646c83c;hp=202fdb87bec389229c93dc4b692731b9f1bfb880;hb=79f8d3d2ce51e992493f2d354a5764262c9d564a;hpb=5b12334d35eadf1f45cc3d631fd1a2e72ffaea0a

diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index 202fdb87b..1cce9c59b 100644
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -42,17 +42,17 @@ typedef struct sd_bus_creds sd_bus_creds;
 typedef struct {
         const char *name;
         const char *message;
-        int need_free;
+        int _need_free;
 } sd_bus_error;
 
 /* Flags */
 
 enum {
-        SD_BUS_CREDS_UID              = 1ULL << 0,
-        SD_BUS_CREDS_GID              = 1ULL << 1,
-        SD_BUS_CREDS_PID              = 1ULL << 2,
-        SD_BUS_CREDS_PID_STARTTIME    = 1ULL << 3,
-        SD_BUS_CREDS_TID              = 1ULL << 4,
+        SD_BUS_CREDS_PID              = 1ULL << 0,
+        SD_BUS_CREDS_PID_STARTTIME    = 1ULL << 1,
+        SD_BUS_CREDS_TID              = 1ULL << 2,
+        SD_BUS_CREDS_UID              = 1ULL << 3,
+        SD_BUS_CREDS_GID              = 1ULL << 4,
         SD_BUS_CREDS_COMM             = 1ULL << 5,
         SD_BUS_CREDS_TID_COMM         = 1ULL << 6,
         SD_BUS_CREDS_EXE              = 1ULL << 7,
@@ -70,7 +70,9 @@ enum {
         SD_BUS_CREDS_SELINUX_CONTEXT  = 1ULL << 19,
         SD_BUS_CREDS_AUDIT_SESSION_ID = 1ULL << 20,
         SD_BUS_CREDS_AUDIT_LOGIN_UID  = 1ULL << 21,
-        _SD_BUS_CREDS_MAX             = (1ULL << 22) -1,
+        SD_BUS_CREDS_UNIQUE_NAME      = 1ULL << 22,
+        SD_BUS_CREDS_WELL_KNOWN_NAMES = 1ULL << 23,
+        _SD_BUS_CREDS_MAX             = (1ULL << 24) -1,
 };
 
 /* Callbacks */
@@ -161,6 +163,7 @@ int sd_bus_add_object_manager(sd_bus *bus, const char *path);
 int sd_bus_remove_object_manager(sd_bus *bus, const char *path);
 
 /* Message object */
+
 int sd_bus_message_new_signal(sd_bus *bus, const char *path, const char *interface, const char *member, sd_bus_message **m);
 int sd_bus_message_new_method_call(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_message **m);
 int sd_bus_message_new_method_return(sd_bus_message *call, sd_bus_message **m);
@@ -232,9 +235,8 @@ int sd_bus_message_rewind(sd_bus_message *m, int complete);
 int sd_bus_get_unique_name(sd_bus *bus, const char **unique);
 int sd_bus_request_name(sd_bus *bus, const char *name, int flags);
 int sd_bus_release_name(sd_bus *bus, const char *name);
-int sd_bus_list_names(sd_bus *bus, char ***l);
-int sd_bus_get_owner(sd_bus *bus, const char *name, char **owner); /* free the result! */
-int sd_bus_get_owner_creds(sd_bus *bus, const char *name, uint64_t mask, sd_bus_creds **creds); /* unref the result! */
+int sd_bus_list_names(sd_bus *bus, char ***l); /* free the results */
+int sd_bus_get_owner(sd_bus *bus, const char *name, uint64_t mask, sd_bus_creds **creds); /* unref the result! */
 int sd_bus_get_owner_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine);
 
 /* Convenience calls */
@@ -271,13 +273,11 @@ sd_bus_creds *sd_bus_creds_ref(sd_bus_creds *c);
 sd_bus_creds *sd_bus_creds_unref(sd_bus_creds *c);
 uint64_t sd_bus_creds_get_mask(sd_bus_creds *c);
 
-int sd_bus_creds_extend(sd_bus_creds *c, uint64_t creds_mask, sd_bus_creds **ret); /* unref the result */
-
-int sd_bus_creds_get_uid(sd_bus_creds *c, uid_t *uid);
-int sd_bus_creds_get_gid(sd_bus_creds *c, gid_t *gid);
 int sd_bus_creds_get_pid(sd_bus_creds *c, pid_t *pid);
 int sd_bus_creds_get_pid_starttime(sd_bus_creds *c, uint64_t *usec);
 int sd_bus_creds_get_tid(sd_bus_creds *c, pid_t *tid);
+int sd_bus_creds_get_uid(sd_bus_creds *c, uid_t *uid);
+int sd_bus_creds_get_gid(sd_bus_creds *c, gid_t *gid);
 int sd_bus_creds_get_comm(sd_bus_creds *c, const char **r);
 int sd_bus_creds_get_tid_comm(sd_bus_creds *c, const char **r);
 int sd_bus_creds_get_exe(sd_bus_creds *c, const char **r);
@@ -295,6 +295,8 @@ int sd_bus_creds_has_bounding_cap(sd_bus_creds *c, int capability);
 int sd_bus_creds_get_selinux_context(sd_bus_creds *c, const char **r);
 int sd_bus_creds_get_audit_session_id(sd_bus_creds *c, uint32_t *sessionid);
 int sd_bus_creds_get_audit_login_uid(sd_bus_creds *c, uid_t *loginuid);
+int sd_bus_creds_get_unique_name(sd_bus_creds *c, const char **name);
+int sd_bus_creds_get_well_known_names(sd_bus_creds *c, char ***names);
 
 /* Error structures */