no asm/signal.h for linux as this is not portable

add auto username from LOGNAME for smbtorture

proto fix in ufc.c
(This used to be commit f13dbdf307ccffc15a74e2ffa72da666e53a72b6)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 6572b583e228de5f17ac1c054eb06c6590b94bd9..cada77e73268c9628442638cca4537cf41fd81a0 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -214,9 +214,6 @@ Here come some platform specific sections
 #include <string.h>
 #include <sys/vfs.h>
 #include <netinet/in.h>
-#ifndef NO_ASMSIGNALH
-#include <asm/signal.h>
-#endif
 #ifdef GLIBC2
 #define _LINUX_C_LIB_VERSION_MAJOR     6
 #include <termios.h>

diff --git a/source3/lib/ufc.c b/source3/lib/ufc.c
index 0fa5cfd3a0f231d2b2e7a83698d15cf0162dc651..3330111c2f53b300780a51ac8cae222f2d25c696 100644 (file)
--- a/source3/lib/ufc.c
+++ b/source3/lib/ufc.c
@@ -660,7 +660,7 @@ static char *output_conversion(v1, v2, salt)
  * UNIX crypt function
  */
 
-ufc_long *_ufc_doit(ufc_long , ufc_long, ufc_long, ufc_long, ufc_long);
+static ufc_long *_ufc_doit(ufc_long , ufc_long, ufc_long, ufc_long, ufc_long);
    
 char *ufc_crypt(char *key,char *salt)
   { ufc_long *s;

diff --git a/source3/utils/torture.c b/source3/utils/torture.c
index 0eb9a256fcc09c1b64b1a08f29af5eb20eed5816..f3d76e0ee2536006f3a30ff21eab4562ca9293cc 100644 (file)
--- a/source3/utils/torture.c
+++ b/source3/utils/torture.c
@@ -261,6 +261,10 @@ static void create_procs(int nprocs, int numops)
 
        get_myname(myname,NULL);
 
+       if (*username == 0 && getenv("LOGNAME")) {
+         strcpy(username,getenv("LOGNAME"));
+       }
+
        argc--;
        argv++;