summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-22 16:57:46 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-22 16:57:46 +0200
commitc94f994dda494f78f0ffb018632abf75d99b45d6 (patch)
tree9212b36f093b6a9f7c56135e706d5070464608d4
parent12ad92165eba14a593e0d152fbeda1e8f7d90ef8 (diff)
parentb8b0274e0351709266dc727d6ee4f857441e5d9e (diff)
downloadsamba-c94f994dda494f78f0ffb018632abf75d99b45d6.tar.gz
samba-c94f994dda494f78f0ffb018632abf75d99b45d6.tar.bz2
samba-c94f994dda494f78f0ffb018632abf75d99b45d6.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
-rw-r--r--source3/rpcclient/cmd_lsarpc.c2
-rw-r--r--source3/smbd/nttrans.c9
2 files changed, 7 insertions, 4 deletions
diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index aa8662ce9d..6424f1b3af 100644
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -789,7 +789,7 @@ static NTSTATUS cmd_lsa_add_acct_rights(struct rpc_pipe_client *cli,
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]);
}
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 69ddcdae8d..b78c946388 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -93,9 +93,12 @@ void send_nt_replies(connection_struct *conn,
+ data_alignment_offset);
if (useable_space < 0) {
- DEBUG(0, ("send_nt_replies failed sanity useable_space "
- "= %d!!!", useable_space));
- exit_server_cleanly("send_nt_replies: srv_send_smb failed.");
+ char *msg = talloc_asprintf(
+ talloc_tos(),
+ "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) {