external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

Enable TIRPC support for Linux

Browse source 
This is enabled by default.  To disable, add:

in the config/cf/site.def or host.def file.

You will need to have the libtirpc-dev package installed.

The benefit is that you will no longer need to run rpcbind in insecure
mode (the -i option).  There are other benefits we may be able to take
advantage of in the future, like supporting IPV6 for ToolTalk.
This commit is contained in:
Jon Trulson 2018-04-11 18:48:53 -06:00
parent 13d3e1db50
commit 17101b6f4c
25 changed files with 53 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cde/config/cf/linux.cf
View file

@ -143,20 +143,23 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
XCOMM Lets try XdmAuth instead of the ancient MIT/DES auth XCOMM Lets try XdmAuth instead of the ancient MIT/DES auth
#define HasXdmAuth YES #define HasXdmAuth YES
XCOMM If you have the tirpc library on your system, and you have the XCOMM TIRPC is enabled by default now on Linux. The libtirpc-dev package is
XCOMM libtirpc-dev installed, then define HasTIRPCLib to YES in either XCOMM required for this support. If you cannot use tirpc for some reason,
XCOMM your host.def or site.def file. Using the tirpc lib should XCOMM can disable it by defining HasTIRPCLib to NO in either
XCOMM allow running rpcbind in secure mode (ie: without the -i option). XCOMM your host.def or site.def file. Not using the TIRPC lib will require
XCOMM The default is NO. XCOMM that you run rpcbind in insecure mode (ie: with the -i option).
XCOMM The default is YES.
#ifndef HasTIRPCLib #ifndef HasTIRPCLib
# define HasTIRPCLib NO # define HasTIRPCLib YES
#endif #endif
#if HasTIRPCLib #if HasTIRPCLib
TIRPCLIB = -ltirpc TIRPCLIB = -ltirpc
TIRPCINC = -I/usr/include/tirpc
#else #else
TIRPCLIB = TIRPCLIB =
TIRPCINC =
#endif #endif
#if !defined(DefaultGcc2i386Opt) #if !defined(DefaultGcc2i386Opt)
@ -288,7 +291,8 @@ XCOMM This is needed for CDE currently
#define ArchitectureDefines -DLINUX_ARCHITECTURE #define ArchitectureDefines -DLINUX_ARCHITECTURE
#define TtClientLibs $(TTLIB) $(TIRPCLIB) $(XTOOLLIB) $(XLIB) #define TtClientLibs $(TTLIB) $(TIRPCLIB) $(XTOOLLIB) $(XLIB)
#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
#define SharedTtReqs $(TIRPCLIB) $(LDPRELIBS) SharedXReqs $(CXXLIB)
#include <lnxDep.rules> #include <lnxDep.rules>
#include <lnxLib.rules> #include <lnxLib.rules>

2
cde/lib/tt/Imakefile
View file

@ -5,5 +5,7 @@ XCOMM $TOG: Imakefile /main/7 1998/08/10 18:01:46 mgreess $
SUBDIRS = mini_isam lib slib bin SUBDIRS = mini_isam lib slib bin
LINTSUBDIRS = mini_isam lib slib bin LINTSUBDIRS = mini_isam lib slib bin
INCLUDES = $(TIRPCINC)
MakeSubdirs($(SUBDIRS)) MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS))

2
cde/lib/tt/bin/Imakefile
View file

@ -5,6 +5,8 @@ XCOMM $TOG: Imakefile /main/8 1999/08/30 14:33:22 mgreess $
SUBDIRS = dbck shell scripts tt_type_comp \ SUBDIRS = dbck shell scripts tt_type_comp \
ttauth ttdbserverd ttsession tttar tttrace ttauth ttdbserverd ttsession tttar tttrace
INCLUDES = $(TIRPCINC)
MakeSubdirs($(SUBDIRS)) MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS))
LintSubdirs($(SUBDIRS)) LintSubdirs($(SUBDIRS))

2
cde/lib/tt/bin/dbck/Imakefile
View file

@ -9,7 +9,7 @@ EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#include "../../tooltalk.tmpl" #include "../../tooltalk.tmpl"
DEFINES = DEFINES =
INCLUDES = -I. -I../../slib -I../../lib -I../../mini_isam INCLUDES = $(TIRPCINC) -I. -I../../slib -I../../lib -I../../mini_isam
DEPLIBS = ../../slib/libstt.a TtClientDepLibs ../../mini_isam/libisam.a DEPLIBS = ../../slib/libstt.a TtClientDepLibs ../../mini_isam/libisam.a
LOCAL_LIBRARIES = ../../slib/libstt.a TtClientLibs ../../mini_isam/libisam.a LOCAL_LIBRARIES = ../../slib/libstt.a TtClientLibs ../../mini_isam/libisam.a

1
cde/lib/tt/bin/scripts/Imakefile
View file

@ -5,6 +5,7 @@ XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:11:31 drk $
/* Any shell scripts shipped as part of ToolTalk are collected here. */ /* Any shell scripts shipped as part of ToolTalk are collected here. */
PROGRAMS = ttce2xdr PROGRAMS = ttce2xdr
INCLUDES = $(TIRPCINC)
all:: $(PROGRAMS) all:: $(PROGRAMS)

2
cde/lib/tt/bin/shell/Imakefile
View file

@ -9,7 +9,7 @@ EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#include "../../tooltalk.tmpl" #include "../../tooltalk.tmpl"
DEFINES = DEFINES =
INCLUDES = -I. -I../../lib INCLUDES = $(TIRPCINC) -I. -I../../lib
DEPLIBS = TtClientDepLibs DEPLIBS = TtClientDepLibs
LOCAL_LIBRARIES = TtClientLibs LOCAL_LIBRARIES = TtClientLibs

2
cde/lib/tt/bin/tt_type_comp/Imakefile
View file

@ -9,7 +9,7 @@ EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#include "../../tooltalk.tmpl" #include "../../tooltalk.tmpl"
DEFINES = DEFINES =
INCLUDES = -I../../lib -I../../slib INCLUDES = $(TIRPCINC) -I../../lib -I../../slib
DEPLIBS = ../../slib/libstt.a TtClientDepLibs DEPLIBS = ../../slib/libstt.a TtClientDepLibs
LOCAL_LIBRARIES = ../../slib/libstt.a TtClientLibs LOCAL_LIBRARIES = ../../slib/libstt.a TtClientLibs

2
cde/lib/tt/bin/ttauth/Imakefile
View file

@ -5,7 +5,7 @@ XCOMM $TOG: Imakefile /main/1 1999/08/30 10:44:56 mgreess $
DEFINES = DEFINES =
CONN_DEFINES = ConnectionFlags CONN_DEFINES = ConnectionFlags
INCLUDES = -I. -I../../slib -I../../lib INCLUDES = $(TIRPCINC) -I. -I../../slib -I../../lib
DEPLIBS = TtClientDepLibs DEPLIBS = TtClientDepLibs
LOCAL_LIBRARIES = TtClientLibs LOCAL_LIBRARIES = TtClientLibs

4
cde/lib/tt/bin/ttdbserverd/Imakefile
View file

@ -8,8 +8,8 @@ EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#include "../../tooltalk.tmpl" #include "../../tooltalk.tmpl"
DEFINES = DEFINES = $(TIRPC_DEFINES)
INCLUDES = -I. -I../../slib -I../../lib -I../../mini_isam INCLUDES = $(TIRPCINC) -I. -I../../slib -I../../lib -I../../mini_isam
DEPLIBS = ../../slib/libstt.a TtClientDepLibs ../../mini_isam/libisam.a DEPLIBS = ../../slib/libstt.a TtClientDepLibs ../../mini_isam/libisam.a
LOCAL_LIBRARIES = ../../slib/libstt.a TtClientLibs ../../mini_isam/libisam.a LOCAL_LIBRARIES = ../../slib/libstt.a TtClientLibs ../../mini_isam/libisam.a

5
cde/lib/tt/bin/ttdbserverd/dm_server.C
View file

@ -2105,12 +2105,13 @@ bool_t msg_q_lock(int isfd, const char *record, int length, SVCXPRT *transp)
// (with a 16 byte key, the rec length must be at least 31) // (with a 16 byte key, the rec length must be at least 31)
if ((length > 30) && !memcmp(record+16, "_TT_QUEUED_MSGS", 15)) { if ((length > 30) && !memcmp(record+16, "_TT_QUEUED_MSGS", 15)) {
// Get the address of the client // Get the address of the client
#if defined(OPT_TLI) #if defined(OPT_TLI) || defined(OPT_TIRPC)
netbuf *client_address = svc_getrpccaller(transp); netbuf *client_address = svc_getrpccaller(transp);
_Tt_string client_id(client_address->len); _Tt_string client_id(client_address->len);
memcpy((char *)client_id, client_address->buf, client_address->len); memcpy((char *)client_id, client_address->buf, client_address->len);
#else #else
struct sockaddr_in *client_address = svc_getcaller(transp); struct sockaddr_in *client_address = svc_getcaller(transp);
_Tt_string client_id(sizeof(struct in_addr)); _Tt_string client_id(sizeof(struct in_addr));
memcpy( (char *)client_id, &client_address->sin_addr, memcpy( (char *)client_id, &client_address->sin_addr,
sizeof(struct in_addr) ); sizeof(struct in_addr) );
@ -2129,7 +2130,7 @@ bool_t msg_q_lock(int isfd, const char *record, int length, SVCXPRT *transp)
// (with a 16 byte key, the rec length must be at least 27) // (with a 16 byte key, the rec length must be at least 27)
else if ((length > 26) && !memcmp(record+16, "_TT_MSG_", 8)) { else if ((length > 26) && !memcmp(record+16, "_TT_MSG_", 8)) {
// Get the address of the client // Get the address of the client
#if defined(OPT_TLI) #if defined(OPT_TLI) || defined(OPT_TIRPC)
netbuf *client_address = svc_getrpccaller(transp); netbuf *client_address = svc_getrpccaller(transp);
_Tt_string client_id(client_address->len); _Tt_string client_id(client_address->len);
(void)memcpy((char *)client_id, client_address->buf, client_address->len); (void)memcpy((char *)client_id, client_address->buf, client_address->len);

2
cde/lib/tt/bin/ttsession/Imakefile
View file

@ -9,7 +9,7 @@ EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#include "../../tooltalk.tmpl" #include "../../tooltalk.tmpl"
DEFINES = DEFINES =
INCLUDES = -I. -I../../slib -I../../lib INCLUDES = $(TIRPCINC) -I. -I../../slib -I../../lib
DEPLIBS = ../../slib/libstt.a TtClientDepLibs DEPLIBS = ../../slib/libstt.a TtClientDepLibs
LOCAL_LIBRARIES = ../../slib/libstt.a TtClientLibs LOCAL_LIBRARIES = ../../slib/libstt.a TtClientLibs

2
cde/lib/tt/bin/tttar/Imakefile
View file

@ -9,7 +9,7 @@ EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#include "../../tooltalk.tmpl" #include "../../tooltalk.tmpl"
DEFINES = DEFINES =
INCLUDES = -I. -I../../lib INCLUDES = $(TIRPCINC) -I. -I../../lib
DEPLIBS = ../../slib/libstt.a TtClientDepLibs ../../mini_isam/libisam.a DEPLIBS = ../../slib/libstt.a TtClientDepLibs ../../mini_isam/libisam.a
LOCAL_LIBRARIES = ../../slib/libstt.a TtClientLibs ../../mini_isam/libisam.a LOCAL_LIBRARIES = ../../slib/libstt.a TtClientLibs ../../mini_isam/libisam.a

2
cde/lib/tt/bin/tttrace/Imakefile
View file

@ -9,7 +9,7 @@ EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#include "../../tooltalk.tmpl" #include "../../tooltalk.tmpl"
DEFINES = DEFINES =
INCLUDES = -I. -I../../lib INCLUDES = $(TIRPCINC) -I. -I../../lib
DEPLIBS = TtClientDepLibs DEPLIBS = TtClientDepLibs
LOCAL_LIBRARIES = TtClientLibs LOCAL_LIBRARIES = TtClientLibs

2
cde/lib/tt/lib/Imakefile
View file

@ -31,7 +31,7 @@ DependSubdirs($(SUBDIRS))
#include "../tooltalk.tmpl" #include "../tooltalk.tmpl"
DEFINES = DEFINES =
INCLUDES = -I. INCLUDES = $(TIRPCINC) -I.
#ifdef RsArchitecture #ifdef RsArchitecture
REALPATHC = realpath.c REALPATHC = realpath.c

2
cde/lib/tt/lib/api/Imakefile
View file

@ -5,6 +5,8 @@ XCOMM $TOG: Imakefile /main/6 1998/08/10 18:00:37 mgreess $
SUBDIRS = c dnd SUBDIRS = c dnd
DONES = c/DONE dnd/DONE DONES = c/DONE dnd/DONE
INCLUDES = $(TIRPCINC)
MakeSubdirs($(SUBDIRS)) MakeSubdirs($(SUBDIRS))
ForceSubdirs($(SUBDIRS)) ForceSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS))

2
cde/lib/tt/lib/api/c/Imakefile
View file

@ -19,7 +19,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#include "../../../tooltalk.tmpl" #include "../../../tooltalk.tmpl"
DEFINES = DEFINES =
INCLUDES = -I../../../lib INCLUDES = $(TIRPCINC) -I../../../lib
/*** NOTE! /*** NOTE!
*** Every time a .o is added below it needs to be added to *** Every time a .o is added below it needs to be added to

2
cde/lib/tt/lib/api/dnd/Imakefile
View file

@ -13,7 +13,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/04/21 19:12:16 drk $
#include "../../../tooltalk.tmpl" #include "../../../tooltalk.tmpl"
DEFINES = DEFINES =
INCLUDES = -I../.. INCLUDES = $(TIRPCINC) -I../..
/*** NOTE! /*** NOTE!
*** Every time a .o is added below it needs to be added to *** Every time a .o is added below it needs to be added to

2
cde/lib/tt/lib/db/Imakefile
View file

@ -16,7 +16,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(ISAM_INCLUDES) $(DEPENDDEFINES)
#include "../../tooltalk.tmpl" #include "../../tooltalk.tmpl"
DEFINES = DEFINES =
INCLUDES = -I../../lib INCLUDES = $(TIRPCINC) -I../../lib
ISAM_INCLUDES = -I../../mini_isam ISAM_INCLUDES = -I../../mini_isam
/*** NOTE! /*** NOTE!

2
cde/lib/tt/lib/mp/Imakefile
View file

@ -16,7 +16,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(ISAM_INCLUDES) $(DEPENDDEFINES)
#include "../../tooltalk.tmpl" #include "../../tooltalk.tmpl"
DEFINES = DEFINES =
INCLUDES = -I../../lib INCLUDES = $(TIRPCINC) -I../../lib
ISAM_INCLUDES = -I../../mini_isam ISAM_INCLUDES = -I../../mini_isam
/* Use BSD-compatible accept() call */ /* Use BSD-compatible accept() call */

2
cde/lib/tt/lib/tttk/Imakefile
View file

@ -19,7 +19,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#include "../../tooltalk.tmpl" #include "../../tooltalk.tmpl"
DEFINES = DEFINES =
INCLUDES = -I../../lib INCLUDES = $(TIRPCINC) -I../../lib
/*** NOTE! /*** NOTE!
*** Every time a .o is added below it needs to be added to *** Every time a .o is added below it needs to be added to

2
cde/lib/tt/lib/util/Imakefile
View file

@ -16,7 +16,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#include "../../tooltalk.tmpl" #include "../../tooltalk.tmpl"
DEFINES = DEFINES =
INCLUDES = -I../../lib INCLUDES = $(TIRPCINC) -I../../lib
#ifdef RsArchitecture #ifdef RsArchitecture
/* To get definitions of iswprint and iswspace */ /* To get definitions of iswprint and iswspace */

2
cde/lib/tt/mini_isam/Imakefile
View file

@ -12,7 +12,7 @@ XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:12:37 drk $
#include "../tooltalk.tmpl" #include "../tooltalk.tmpl"
DEPEND_DEFINES = $(DEPENDDEFINES) DEPEND_DEFINES = $(DEPENDDEFINES)
INCLUDES = -I. INCLUDES = $(TIRPCINC) -I.
SRCS = isaddindex.c isamaddindex.c isopen.c isamopen.c \ SRCS = isaddindex.c isamaddindex.c isopen.c isamopen.c \
isdelcurr.c isdelrec.c isamdelrec.c isbuild.c \ isdelcurr.c isdelrec.c isamdelrec.c isbuild.c \

2
cde/lib/tt/slib/Imakefile
View file

@ -15,7 +15,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#include "../tooltalk.tmpl" #include "../tooltalk.tmpl"
DEFINES = DEFINES =
INCLUDES = -I. -I../lib INCLUDES = $(TIRPCINC) -I. -I../lib
SRCS = \ SRCS = \
mp_ce_attrs.C mp_observer.C mp_observer_utils.C \ mp_ce_attrs.C mp_observer.C mp_observer_utils.C \

11
cde/lib/tt/tooltalk.tmpl
View file

@ -19,6 +19,17 @@ DEPTTLIB_AND_MAYBE_XLIB = $(DEPTTLIB)
/* put EXTRA_DEFINES and EXTRA_INCLUDES below */ /* put EXTRA_DEFINES and EXTRA_INCLUDES below */
/* For linux with TIRPC, set this so the right bits can/will be used. */
XCOMM Enable TIRPC for linux hosts with the option enabled
#ifdef LinuxArchitecture
# if HasTIRPCLib
TIRPC_DEFINES = -DOPT_TIRPC
# else
TIRPC_DEFINES =
# endif
#endif
#ifdef SunArchitecture #ifdef SunArchitecture
LAST_LOAD_FLAGS = -Bstatic -lC -Bdynamic -lm -lc -Bstatic LAST_LOAD_FLAGS = -Bstatic -lC -Bdynamic -lm -lc -Bstatic
#endif #endif

3
cde/programs/dtsession/Imakefile
View file

@ -74,7 +74,8 @@ SYS_LIBRARIES = -lelf -lm -ldl -lgen
#if defined(LinuxArchitecture) #if defined(LinuxArchitecture)
EXTRA_DEFINES = -D${PROGRAMS} $(XINOPT) -DUSE_X11SSEXT EXTRA_DEFINES = -D${PROGRAMS} $(XINOPT) -DUSE_X11SSEXT
SYS_LIBRARIES = $(XINLIB) -lXss -ldl -lcrypt -lm SYS_LIBRARIES = $(XINLIB) $(TIRPCLIB) -lXss -ldl -lcrypt -lm
INCLUDES = $(TIRPCINC)
#endif #endif
#if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) #if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture)