diff options
| author | OBATA Akio <[email protected]> | 2019-04-06 16:49:26 +0900 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2019-08-18 15:36:50 +0200 |
| commit | 4741832142e091d641fb8a90607b4595accb905d (patch) | |
| tree | 31f31b6389635adc523c7a33f873a9562e1adadb /tdm | |
| parent | 0aaebc24cd00c9dd833c16dd14d1814948baac38 (diff) | |
| download | tdebase-4741832142e091d641fb8a90607b4595accb905d.tar.gz tdebase-4741832142e091d641fb8a90607b4595accb905d.zip | |
Revive NetBSD support
Catch up to TDE and OS changes
Signed-off-by: OBATA Akio <[email protected]>
(cherry picked from commit 2a88ec3c02ab46c8b816cfa348ea53075f57a59c)
Diffstat (limited to 'tdm')
| -rw-r--r-- | tdm/backend/getfd.c | 2 | ||||
| -rw-r--r-- | tdm/backend/sessreg.c | 2 | ||||
| -rw-r--r-- | tdm/config.def | 10 |
3 files changed, 10 insertions, 4 deletions
diff --git a/tdm/backend/getfd.c b/tdm/backend/getfd.c index d4f4d8352..aaad616b6 100644 --- a/tdm/backend/getfd.c +++ b/tdm/backend/getfd.c @@ -22,7 +22,7 @@ is_a_console(int fd) { char arg; arg = 0; -#if defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) return arg; #else return (ioctl(fd, KDGKBTYPE, &arg) == 0 diff --git a/tdm/backend/sessreg.c b/tdm/backend/sessreg.c index 4167a16e3..a65c6cd87 100644 --- a/tdm/backend/sessreg.c +++ b/tdm/backend/sessreg.c @@ -70,7 +70,7 @@ from The Open Group. #endif #ifdef BSD -# if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) +# if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) /* *BSD doesn't like a ':0' type entry in utmp */ # define NO_UTMP # endif diff --git a/tdm/config.def b/tdm/config.def index 5cfc56ed5..4209c8212 100644 --- a/tdm/config.def +++ b/tdm/config.def @@ -79,6 +79,12 @@ #else # define DEF_SERVER_CMD XBINDIR "/X" #endif + +#if defined(__NetBSD__) && !defined(__powerpc__) +# define DEF_SERVER_ARGS "-nolisten tcp vt05" +#else +# define DEF_SERVER_ARGS "-nolisten tcp" +#endif </code> # The contents of this section are copied mostly verbatim to the @@ -1368,9 +1374,9 @@ Description: Key: ServerArgsLocal Type: string -Default: "-nolisten tcp" +Default: DEF_SERVER_ARGS User: core -Instance: :*/"-deferglyphs 16 -nolisten tcp" +Instance: :*/"-deferglyphs 16 " DEF_SERVER_ARGS Comment: & Description: Additional arguments for the &X-Server;s for local sessions. |