From: Sven Eden Date: Thu, 19 Jan 2017 13:05:12 +0000 (+0100) Subject: Remove sd_is_mq X-Git-Tag: v226.4~1^2~45 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=bec1345672f400faca26c4d231c0b6a7360801ed Remove sd_is_mq * src/systemd/sd-daemon.h: * src/libelogind/sd-daemon/sd-daemon.c (sd_is_mq): Remove unused function that depended on librt. Ultimately we should remove this header at some point. --- diff --git a/Makefile-man.am b/Makefile-man.am index d862b3bba..c481f8342 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -22,7 +22,6 @@ MANPAGES_ALIAS += \ man/logind.8 \ man/sd_id128_from_string.3 \ man/sd_id128_get_boot.3 \ - man/sd_is_mq.3 \ man/sd_is_socket.3 \ man/sd_is_socket_inet.3 \ man/sd_is_socket_unix.3 \ @@ -35,7 +34,6 @@ MANPAGES_ALIAS += \ man/logind.8: man/logind.service.8 man/sd_id128_from_string.3: man/sd_id128_to_string.3 man/sd_id128_get_boot.3: man/sd_id128_get_machine.3 -man/sd_is_mq.3: man/sd_is_fifo.3 man/sd_is_socket.3: man/sd_is_fifo.3 man/sd_is_socket_inet.3: man/sd_is_fifo.3 man/sd_is_socket_unix.3: man/sd_is_fifo.3 @@ -54,9 +52,6 @@ man/sd_id128_from_string.html: man/sd_id128_to_string.html man/sd_id128_get_boot.html: man/sd_id128_get_machine.html $(html-alias) -man/sd_is_mq.html: man/sd_is_fifo.html - $(html-alias) - man/sd_is_socket.html: man/sd_is_fifo.html $(html-alias) @@ -194,6 +189,15 @@ man/sd_session_is_remote.html: man/sd_session_is_active.html endif +if HAVE_PYTHON +MANPAGES += \ + man/elogind.index.7 +MANPAGES_ALIAS += \ + # + + +endif + # Really, do not edit this file. EXTRA_DIST += \ @@ -201,6 +205,7 @@ EXTRA_DIST += \ man/libelogind-pkgconfig.xml \ man/loginctl.xml \ man/logind.conf.xml \ + man/logind.service.xml \ man/logind.xml \ man/pam_elogind.xml \ man/sd_get_seats.xml \ diff --git a/Makefile.am b/Makefile.am index 6a19521b0..4cee67380 100644 --- a/Makefile.am +++ b/Makefile.am @@ -374,7 +374,6 @@ libbasic_la_LIBADD = \ $(SELINUX_LIBS) \ $(CAP_LIBS) \ -ldl \ - -lrt \ -lm # ----------------------------------------------------------------------------- diff --git a/man/logind.service.xml b/man/logind.service.xml new file mode 100644 index 000000000..404c45632 --- /dev/null +++ b/man/logind.service.xml @@ -0,0 +1,119 @@ + + + + + + + + + logind.service + elogind + + + + Developer + Lennart + Poettering + lennart@poettering.net + + + + + + logind.service + 8 + + + + logind.service + logind + Login manager + + + + logind.service + /usr/lib/systemd/logind + + + + Description + + logind is a system service that + manages user logins. It is responsible for: + + + Keeping track of users and sessions, their + processes and their idle state + + Providing PolicyKit-based access for users to + operations such as system shutdown or sleep + + Implementing a shutdown/sleep inhibition logic + for applications + + Handling of power/sleep hardware + keys + + Multi-seat management + + Session switch management + + Device access management for + users + + Automatic spawning of text logins (gettys) on + virtual console activation and user runtime directory + management + + + User sessions are registered in logind via the + pam_elogind8 + PAM module. + + See + logind.conf5 + for information about the configuration of this service. + + See Multi-Seat + on Linux for an introduction into basic concepts of logind + such as users, sessions and seats. + + See the + logind D-Bus API Documentation for information about the + APIs logind provides. + + For more information on the inhibition logic see the Inhibitor + Lock Developer Documentation. + + + + See Also + + loginctl1, + logind.conf5, + pam_elogind8 + + + + diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml index 83c204d0c..f5ca8580e 100644 --- a/man/sd_is_fifo.xml +++ b/man/sd_is_fifo.xml @@ -48,7 +48,6 @@ sd_is_socket sd_is_socket_inet sd_is_socket_unix - sd_is_mq sd_is_special Check the type of a file descriptor @@ -89,12 +88,6 @@ size_t length - - int sd_is_mq - int fd - const char *path - - int sd_is_special int fd @@ -151,12 +144,6 @@ path to the initial 0 byte of the socket address. - sd_is_mq() may be called to check - whether the specified file descriptor refers to a POSIX message - queue. If the path parameter is not - NULL, it is checked whether the message queue - is bound to the specified name. - sd_is_special() may be called to check whether the specified file descriptor refers to a special file. If the path parameter is not diff --git a/src/libelogind/sd-daemon/sd-daemon.c b/src/libelogind/sd-daemon/sd-daemon.c index d230a48da..9a696cd22 100644 --- a/src/libelogind/sd-daemon/sd-daemon.c +++ b/src/libelogind/sd-daemon/sd-daemon.c @@ -307,6 +307,8 @@ _public_ int sd_is_socket_unix(int fd, int type, int listening, const char *path return 1; } +/// UNNEEDED by elogind +#if 0 _public_ int sd_is_mq(int fd, const char *path) { struct mq_attr attr; @@ -337,6 +339,7 @@ _public_ int sd_is_mq(int fd, const char *path) { return 1; } +#endif // 0 _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char *state, const int *fds, unsigned n_fds) { union sockaddr_union sockaddr = { diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym index d5ad127bc..b4e52dd37 100644 --- a/src/libsystemd/libsystemd.sym +++ b/src/libsystemd/libsystemd.sym @@ -66,7 +66,7 @@ global: /* sd-daemon */ sd_booted; sd_is_fifo; - sd_is_mq; + /* sd_is_mq; */ sd_is_socket; sd_is_socket_inet; sd_is_socket_unix; diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h index 861dc8f1f..1f093f3ca 100644 --- a/src/systemd/sd-daemon.h +++ b/src/systemd/sd-daemon.h @@ -154,7 +154,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t See sd_is_mq(3) for more information. */ -int sd_is_mq(int fd, const char *path); +/// UNNEEDED int sd_is_mq(int fd, const char *path); /* Informs systemd about changed daemon state. This takes a number of