summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1997-11-06 23:34:51 +0000
committerJeremy Allison <jra@samba.org>1997-11-06 23:34:51 +0000
commit36e5b646d9d6f40b44a9c851c5f8caa499eb2237 (patch)
treec1f8f920a081a37bdce4ee08804cd1e672b53417 /source3
parentbd529d7a83c35be233baca09bc79aa911ad443ce (diff)
downloadsamba-36e5b646d9d6f40b44a9c851c5f8caa499eb2237.tar.gz
samba-36e5b646d9d6f40b44a9c851c5f8caa499eb2237.tar.bz2
samba-36e5b646d9d6f40b44a9c851c5f8caa499eb2237.zip
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. (This used to be commit ff94f97cf2b0f62cbbddbfd3d126df7f4d649334)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/ipc.c2
-rw-r--r--source3/smbd/uid.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index ce14ccd9bc..604cf24d8f 100644
--- a/source3/smbd/ipc.c
+++ b/source3/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/source3/smbd/uid.c b/source3/smbd/uid.c
index 645d078979..b36fa4df06 100644
--- a/source3/smbd/uid.c
+++ b/source3/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
{