summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config.h.cmake8
-rw-r--r--tdecore/README.kiosk24
-rw-r--r--tdeio/kssl/kopenssl.cpp56
3 files changed, 51 insertions, 37 deletions
diff --git a/config.h.cmake b/config.h.cmake
index 2f382cc7..b2daa597 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1153,6 +1153,7 @@ __END_DECLS
#endif
#ifdef __cplusplus
extern "C"
+{
#endif
#if !defined(HAVE_VSNPRINTF_PROTO)
int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
@@ -1161,7 +1162,7 @@ int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
int snprintf(char *str, size_t n, char const *fmt, ...);
#endif
#ifdef __cplusplus
-extern "C"
+}
#endif
#endif
@@ -1222,7 +1223,10 @@ extern "C"
#define HAVE_SETEUID_FAKE
#ifdef __cplusplus
extern "C"
+{
#endif
int seteuid(INT32_BASETYPE euid); /* defined in fakes.c */
+#ifdef __cplusplus
+}
+#endif
#endif
-
diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk
index ae4f72d4..c914cc1d 100644
--- a/tdecore/README.kiosk
+++ b/tdecore/README.kiosk
@@ -1,25 +1,25 @@
In KDE3 a kiosk-framework has been introduced.
-One of the driving forces behind KDE is to put the user in control and
-give him or her a large amount of possibilities to adjust KDE to his or her
+One of the driving forces behind TDE is to put the user in control and
+give them a large amount of possibilities to adjust TDE to their
liking. However, in some situations it is required to reduce the possibilities
-of KDE, e.g. because the system is to be used for one or more specific
+of TDE, e.g. because the system is to be used for one or more specific
dedicated tasks only.
The kiosk-framework provides an easy way to disable certain features within
-KDE to create a more controlled environment.
+TDE to create a more controlled environment.
-KDE's kiosk-framework builds on KDE's configuration framework and adds a
+TDE's kiosk-framework builds on TDE's configuration framework and adds a
simple application API that applications can query to get authorisation
for certain operations.
-The KDE kiosk-framework should be used IN ADDITION to the standard UNIX
+The TDE kiosk-framework should be used IN ADDITION to the standard UNIX
security measures.
The configuration framework in KDE3
===================================
-Since the very beginning KDE makes use of file-hierarchy to store resources
+Since the very beginning TDE makes use of file-hierarchy to store resources
for its applications. Resources range from icons, wallpapers, fonts to
sounds, menu-descriptions and configuration files.
@@ -550,16 +550,16 @@ Some remarks:
matches "/srv" and not "/srv/www".
-KDE3 Resource Restrictions
+TDE Resource Restrictions
==========================
-Most KDE applications make use of additional resource files that are typically
-located in directories under $TDEDIR/share. By default KDE allows users to
+Most TDE applications make use of additional resource files that are typically
+located in directories under $TDEDIR/share. By default TDE allows users to
override any of these resources by placing files in the same location
under $TDEHOME/share. For example, Konsole stores profiles under
$TDEDIR/share/apps/konsole and users can add additional profiles by
installing files in $TDEHOME/share/apps/konsole.
-KDE3 Resource Restrictions make it possible to restrict the lookup of files
+TDE Resource Restrictions make it possible to restrict the lookup of files
to directories outside of $TDEHOME only.
The following resources are defined:
@@ -642,7 +642,7 @@ The following syntax is also supported:
Name[$ei]=${USER}
-KDE3 Kiosk Application API
+TDE Kiosk Application API
==========================
Three new methods have been added to TDEApplication:
diff --git a/tdeio/kssl/kopenssl.cpp b/tdeio/kssl/kopenssl.cpp
index 312c85c1..abcd7e0f 100644
--- a/tdeio/kssl/kopenssl.cpp
+++ b/tdeio/kssl/kopenssl.cpp
@@ -33,6 +33,8 @@
#include <unistd.h>
#include "kopenssl.h"
+#define STRINGIFY(x) #x
+
#define GET_CRYPTOLIB_SYMBOL(a) ((_cryptoLib->hasSymbol(a)) ? _cryptoLib->symbol(a) : NULL)
#define GET_SSLLIB_SYMBOL(a) ((_sslLib->hasSymbol(a)) ? _sslLib->symbol(a) : NULL)
@@ -345,8 +347,8 @@ TDEConfig *cfg;
<< "";
#else
libpaths
- #ifdef _AIX
- << "/opt/freeware/lib/"
+ #ifdef _AIX
+ << "/opt/freeware/lib/"
#endif
<< "/usr/" SYSTEM_LIBDIR "/"
<< "/usr/ssl/" SYSTEM_LIBDIR "/"
@@ -355,41 +357,49 @@ TDEConfig *cfg;
<< "/usr/local/ssl/" SYSTEM_LIBDIR "/"
<< "/opt/openssl/" SYSTEM_LIBDIR "/"
<< "/" SYSTEM_LIBDIR "/"
- << "";
+ << "";
// FIXME: #define here for the various OS types to optimize
libnamess
#ifdef hpux
- << "libssl.sl"
- #elif defined(_AIX)
- << "libssl.a(libssl.so.0)"
+ << "libssl.sl"
+ #elif defined(_AIX)
+ << "libssl.a(libssl.so.0)"
#elif defined(__APPLE__)
<< "libssl.dylib"
<< "libssl.0.9.dylib"
- #else
- #ifdef SHLIB_VERSION_NUMBER
- << "libssl.so." SHLIB_VERSION_NUMBER
- #endif
- << "libssl.so"
- << "libssl.so.0"
- #endif
+ #else
+ #ifdef OPENSSL_SHLIB_VERSION
+ << "libssl.so." STRINGIFY(OPENSSL_SHLIB_VERSION)
+ #endif
+ #ifdef SHLIB_VERSION_NUMBER
+ << "libssl.so." SHLIB_VERSION_NUMBER
+ #endif
+ << "libssl.so"
+ << "libssl.so.3"
+ << "libssl.so.0"
+ #endif
;
libnamesc
- #ifdef hpux
- << "libcrypto.sl"
- #elif defined(_AIX)
- << "libcrypto.a(libcrypto.so.0)"
+ #ifdef hpux
+ << "libcrypto.sl"
+ #elif defined(_AIX)
+ << "libcrypto.a(libcrypto.so.0)"
#elif defined(__APPLE__)
<< "libcrypto.dylib"
<< "libcrypto.0.9.dylib"
#else
- #ifdef SHLIB_VERSION_NUMBER
- << "libcrypto.so." SHLIB_VERSION_NUMBER
- #endif
- << "libcrypto.so"
- << "libcrypto.so.0"
- #endif
+ #ifdef OPENSSL_SHLIB_VERSION
+ << "libcrypto.so." STRINGIFY(OPENSSL_SHLIB_VERSION)
+ #endif
+ #ifdef SHLIB_VERSION_NUMBER
+ << "libcrypto.so." SHLIB_VERSION_NUMBER
+ #endif
+ << "libcrypto.so"
+ << "libcrypto.so.3"
+ << "libcrypto.so.0"
+ #endif
;
#endif