ipc.c: Changing back arbitrary alignment change until I know *why*

luke changed it.
proto.h: The usual.
uid.c: Fix crash bug when attaching with smbclient -mCORE. A vuid
pointer was being used when it was null.
Jeremy.

diff --git a/source/smbd/ipc.c b/source/smbd/ipc.c
index ce14ccd9bc003086e05151e0278e4690717f55a2..604cf24d8f5cf38af8ac6b70fe46ab5a10d78f3f 100644 (file)
--- a/source/smbd/ipc.c
+++ b/source/smbd/ipc.c
@@ -144,7 +144,7 @@ static void send_trans_reply(char *outbuf,char *data,char *param,uint16 *setup,
   this_lparam = MIN(lparam,max_send - (500+lsetup*SIZEOFWORD)); /* hack */
   this_ldata = MIN(ldata,max_send - (500+lsetup*SIZEOFWORD+this_lparam));
 
-  align = (this_lparam%4)+1;
+  align = (this_lparam%4);
 
   set_message(outbuf,10+lsetup,align+this_ldata+this_lparam,True);
   if (this_lparam)

diff --git a/source/smbd/uid.c b/source/smbd/uid.c
index 645d078979ca18b038ab9ad061b99244df7d9f26..b36fa4df067336278dfc6c2605e9fe0fa478843d 100644 (file)
--- a/source/smbd/uid.c
+++ b/source/smbd/uid.c
@@ -232,7 +232,7 @@ BOOL become_user(connection_struct *conn, int cnum, uint16 vuid)
     current_user.groups = conn->groups;
     current_user.igroups = conn->igroups;
     current_user.ngroups = conn->ngroups;
-    current_user.attrs   = vuser->attrs;
+    current_user.attrs   = conn->attrs;
   }
   else
   {