sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

Merge branch 'master' of ssh://git.samba.org/data/git/samba

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-10-22 16:57:46 +02:00
commit c94f994dda
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/rpcclient/cmd_lsarpc.c
View File

@ -789,7 +789,7 @@ static NTSTATUS cmd_lsa_add_acct_rights(struct rpc_pipe_client *cli,
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
for (i=0; i<argc-1; i++) { for (i=0; i<argc-2; i++) {
init_lsa_StringLarge(&rights.names[i], argv[i+2]); init_lsa_StringLarge(&rights.names[i], argv[i+2]);
} }

9
source3/smbd/nttrans.c
View File

@ -93,9 +93,12 @@ void send_nt_replies(connection_struct *conn,
+ data_alignment_offset); + data_alignment_offset);
if (useable_space < 0) { if (useable_space < 0) {
DEBUG(0, ("send_nt_replies failed sanity useable_space " char *msg = talloc_asprintf(
"= %d!!!", useable_space)); talloc_tos(),
exit_server_cleanly("send_nt_replies: srv_send_smb failed."); "send_nt_replies failed sanity useable_space = %d!!!",
useable_space);
DEBUG(0, ("%s\n", msg));
exit_server_cleanly(msg);
} }
while (params_to_send || data_to_send) { while (params_to_send || data_to_send) {