fix the order of become_uid() and become_gid() in become_root(). This

was a harmless bug but left log entries

code cleanup in reply_lanman2()

diff --git a/source/smbd/server.c b/source/smbd/server.c
index f6a43a536da336236e4c4de3d738eadd38200814..6fe89b8e958129c29676697c46fbd9cc2ca1d0c0 100644 (file)
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -3546,11 +3546,6 @@ int reply_lanman1(char *outbuf)
   int secword=0;
   BOOL doencrypt = SMBENCRYPT();
   time_t t = time(NULL);
-  /* We need to save and restore this as it can be destroyed
-     if we call another server if security=server
-     Thanks to Paul Nelson @ Thursby for pointing this out.
-   */
-  uint16 mid = SVAL(outbuf, smb_mid);
 
   if (lp_security()>=SEC_USER) secword |= 1;
   if (doencrypt) secword |= 2;
@@ -3564,7 +3559,6 @@ int reply_lanman1(char *outbuf)
   Protocol = PROTOCOL_LANMAN1;
 
   CVAL(outbuf,smb_flg) = 0x81; /* Reply, SMBlockread, SMBwritelock supported */
-  SSVAL(outbuf,smb_mid,mid); /* Restore possibly corrupted mid */
   SSVAL(outbuf,smb_vwv2,max_recv);
   SSVAL(outbuf,smb_vwv3,lp_maxmux()); /* maxmux */
   SSVAL(outbuf,smb_vwv4,1);
@@ -3616,11 +3610,10 @@ int reply_lanman2(char *outbuf)
 
   set_message(outbuf,13,crypt_len,True);
   SSVAL(outbuf,smb_vwv1,secword); 
+  SIVAL(outbuf,smb_vwv6,getpid());
   if (doencrypt) 
          memcpy(smb_buf(outbuf), cryptkey, 8);
 
-  SIVAL(outbuf,smb_vwv6,getpid());
-
   Protocol = PROTOCOL_LANMAN2;
 
   CVAL(outbuf,smb_flg) = 0x81; /* Reply, SMBlockread, SMBwritelock supported */

diff --git a/source/smbd/uid.c b/source/smbd/uid.c
index 42ade7e4da1f075c9b183d70064df7337c93d8c9..28bf4b421acf52f22d8d0b7ce6f1b2ed7a2a75aa 100644 (file)
--- a/source/smbd/uid.c
+++ b/source/smbd/uid.c
@@ -505,8 +505,8 @@ void become_root(BOOL save_dir)
        current_user_saved = current_user;
        become_root_depth = 1;
 
-       become_gid(0);
        become_uid(0);
+       become_gid(0);
 }
 
 /****************************************************************************