- added support for TMPDIR env variable

- fixed fault.c for linux 2.1
- put back in the FIND_SELF failing code
- cleaned up casts in encryption
(This used to be commit 3af04f1580b2569c0a4f2549bf6352c7a25afa0d)

2 files changed, 16 insertions, 5 deletions

diff --git a/source3/lib/fault.c b/source3/lib/fault.c
index 20c75f7876..9bc2eca7e0 100644
--- a/source3/lib/fault.c
+++ b/source3/lib/fault.c
@@ -19,10 +19,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifdef LINUX
-#define __KERNEL__
-#endif
-
 #include "includes.h"
 extern int DEBUGLEVEL;
 
diff --git a/source3/lib/util.c b/source3/lib/util.c
index d82dbddb44..63dda489d4 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -54,7 +54,7 @@ int trans_num = 0;
 */
 int case_default = CASE_LOWER;
 
-pstring debugf = "/tmp/log.samba";
+pstring debugf = "";
 int syslog_level;
 
 /* the following control case operations - they are put here so the
@@ -271,6 +271,21 @@ va_dcl
 }
 
 /****************************************************************************
+  find a suitable temporary directory. The result should be copied immediately
+  as it may be overwritten by a subsequent call
+  ****************************************************************************/
+char *tmpdir(void)
+{
+  char *p;
+  if ((p = getenv("TMPDIR"))) {
+    return p;
+  }
+  return "/tmp";
+}
+
+
+
+/****************************************************************************
 determine if a file descriptor is in fact a socket
 ****************************************************************************/
 BOOL is_a_socket(int fd)