blob: 23fb90c4d019583c4fb6fb5e7648ea2e03ebe5b8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
Try to use ulog-helper if utempter does not exist
FreeBSD does not have /usr/libexec/*/utempter.
It does however have /usr/libexec/ulog-helper [1].
It uses login instead of add and logout instead of del.
[1] https://svnweb.freebsd.org/base/head/libexec/ulog-helper/ulog-helper.c?revision=234469&view=markup
[2] https://git.reviewboard.kde.org/r/129122/
diff --git a/cmake/FindUTEMPTER.cmake b/cmake/FindUTEMPTER.cmake
index 4921e58..d3236c8 100644
--- cmake/FindUTEMPTER.cmake
+++ cmake/FindUTEMPTER.cmake
@@ -42,6 +42,16 @@ find_file (UTEMPTER_EXECUTABLE utempter PATHS
/usr/libexec/utempter
)
+# On FreeBSD for example we have to use ulog-helper
+if (NOT UTEMPTER_EXECUTABLE)
+ find_program (UTEMPTER_EXECUTABLE ulog-helper PATHS
+ /usr/libexec
+ )
+ if (UTEMPTER_EXECUTABLE)
+ add_definitions(-DUTEMPTER_ULOG=1)
+ endif ()
+endif ()
+
if (UTEMPTER_EXECUTABLE)
add_definitions(-DUTEMPTER_PATH=\"${UTEMPTER_EXECUTABLE}\")
endif ()
diff --git a/src/kpty.cpp b/src/kpty.cpp
index 7bf31c3..11006df 100644
--- src/kpty.cpp
+++ src/kpty.cpp
@@ -74,6 +74,14 @@
#endif
#ifdef UTEMPTER_PATH
+// utempter uses 'add' and 'del' whereas ulog-helper uses 'login' and 'logout'
+# ifndef UTEMPTER_ULOG
+# define UTEMPTER_ADD "add"
+# define UTEMPTER_DEL "del"
+# else
+# define UTEMPTER_ADD "login"
+# define UTEMPTER_DEL "logout"
+# endif
class UtemptProcess : public QProcess
{
public:
@@ -517,7 +525,7 @@ void KPty::login(const char *user, const char *remotehost)
UtemptProcess utemptProcess;
utemptProcess.cmdFd = d->masterFd;
utemptProcess.setProgram(d->utempterPath);
- utemptProcess.setArguments(QStringList() << QStringLiteral("add") << QString::fromLocal8Bit(remotehost));
+ utemptProcess.setArguments(QStringList() << QStringLiteral(UTEMPTER_ADD) << QString::fromLocal8Bit(remotehost));
utemptProcess.setProcessChannelMode(QProcess::ForwardedChannels);
utemptProcess.start();
utemptProcess.waitForFinished();
@@ -606,7 +614,7 @@ void KPty::logout()
UtemptProcess utemptProcess;
utemptProcess.cmdFd = d->masterFd;
utemptProcess.setProgram(d->utempterPath);
- utemptProcess.setArguments(QStringList(QStringLiteral("del")));
+ utemptProcess.setArguments(QStringList(QStringLiteral(UTEMPTER_DEL)));
utemptProcess.setProcessChannelMode(QProcess::ForwardedChannels);
utemptProcess.start();
utemptProcess.waitForFinished();
|
