summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/rpc_server/srv_samr.c2
-rw-r--r--source3/smbd/ipc.c2
-rw-r--r--source3/smbwrapper/smbsh.c10
-rw-r--r--source3/tests/fcntl_lock.c1
4 files changed, 11 insertions, 4 deletions
diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index 3a656b5a3b..74d06d1bca 100644
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -30,7 +30,7 @@ extern int DEBUGLEVEL;
extern BOOL sam_logon_in_ssb;
extern pstring samlogon_user;
-extern pstring global_myworkgroup;
+extern fstring global_myworkgroup;
extern pstring global_myname;
extern DOM_SID global_sam_sid;
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index d359bc3500..d9ef53e70f 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -38,7 +38,7 @@ extern int DEBUGLEVEL;
extern int max_send;
extern pstring local_machine;
-extern pstring global_myworkgroup;
+extern fstring global_myworkgroup;
#define NERR_Success 0
#define NERR_badpass 86
diff --git a/source3/smbwrapper/smbsh.c b/source3/smbwrapper/smbsh.c
index 8df82e702d..b677707741 100644
--- a/source3/smbwrapper/smbsh.c
+++ b/source3/smbwrapper/smbsh.c
@@ -104,13 +104,19 @@ int main(int argc, char *argv[])
slprintf(line,sizeof(line)-1,"%s/smbwrapper.32.so:DEFAULT", libd);
smbw_setenv("_RLD_LIST", line);
slprintf(line,sizeof(line)-1,"%s/smbwrapper.so:DEFAULT", libd);
- smbw_setenv("_RLD32_LIST", line);
+ smbw_setenv("_RLDN32_LIST", line);
} else {
slprintf(line,sizeof(line)-1,"%s/smbwrapper.so:DEFAULT", libd);
smbw_setenv("_RLD_LIST", line);
}
- execl("/bin/sh","smbsh",NULL);
+ {
+ char *shellpath = getenv("SHELL");
+ if(shellpath)
+ execl(shellpath,"smbsh",NULL);
+ else
+ execl("/bin/sh","smbsh",NULL);
+ }
printf("launch failed!\n");
return 1;
}
diff --git a/source3/tests/fcntl_lock.c b/source3/tests/fcntl_lock.c
index c54479434e..a90e00aa00 100644
--- a/source3/tests/fcntl_lock.c
+++ b/source3/tests/fcntl_lock.c
@@ -2,6 +2,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <sys/types.h>
#ifdef HAVE_FCNTL_H
#include <fcntl.h>