diff options
| -rw-r--r-- | source3/include/includes.h | 3 | ||||
| -rw-r--r-- | source3/lib/ufc.c | 2 | ||||
| -rw-r--r-- | source3/utils/torture.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 6572b583e2..cada77e732 100644 --- 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 0fa5cfd3a0..3330111c2f 100644 --- 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 0eb9a256fc..f3d76e0ee2 100644 --- 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++; |