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)

diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index 3a656b5a3b1f8ba41c9cd1df45acf33ff401f6b8..74d06d1bcae02901c17b248abb4157c1e3e2c727 100644 (file)
--- 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 d359bc3500064623fe9cae2dd083e0f2abd901f1..d9ef53e70f20f28875702bece9a520f185c3a1f3 100644 (file)
--- 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 8df82e702d401da634cb2a14057daf49cd387f91..b677707741a92d2bff9a4a67432515de408efb30 100644 (file)
--- 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 c54479434e8ae65f348b1438bf90ed80518eb6a8..a90e00aa000acc32cedb6191fed84f244d01571f 100644 (file)
--- 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>