From 80f920181f8d2d58bd3b341aac57de0c71e21374 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 22 Oct 1998 18:51:16 +0000 Subject: server/srv_samr.c smbd/ipc.c: Changed global_myworkgroup back to fstring (as it is everywhere else). smbwrapper/smbsh.c: For IRIX n32 binaries, set _RLDN32_LIST not _RLD32_LIST. Exec users preferred shell is SHELL environment variable is set. tests/fcntl_lock.c: Added sys/types.h for systems that need this. Jeremy. (This used to be commit 50413d0d819d4f13e760ca8439c5bdde0898d63e) --- source3/smbwrapper/smbsh.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'source3/smbwrapper/smbsh.c') 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; } -- cgit