summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>2000-04-24 08:18:26 +0000
committerLuke Leighton <lkcl@samba.org>2000-04-24 08:18:26 +0000
commitb8a2501db2a01a1e7569b6fd7d16ff655598ae56 (patch)
treebad40c4640aafb9faf46a95fd7595b39ee4fa2cf
parent7eed3de20f9837154ad95553c21a891cc58bd4dc (diff)
downloadsamba-b8a2501db2a01a1e7569b6fd7d16ff655598ae56.tar.gz
samba-b8a2501db2a01a1e7569b6fd7d16ff655598ae56.tar.xz
samba-b8a2501db2a01a1e7569b6fd7d16ff655598ae56.zip
sizeof(fstring) needed, not sizeof(arg).
-rw-r--r--source/lib/util_sid.c2
-rw-r--r--source/rpc_parse/parse_net.c2
-rw-r--r--source/rpc_server/srv_netlog.c2
-rw-r--r--source/rpc_server/srv_pipe.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/source/lib/util_sid.c b/source/lib/util_sid.c
index 1b48b0f41f6..a112328f794 100644
--- a/source/lib/util_sid.c
+++ b/source/lib/util_sid.c
@@ -39,7 +39,7 @@ char *sid_to_string(fstring sidstr_out, const DOM_SID *sid)
(sid->id_auth[3] << 16) +
(sid->id_auth[2] << 24);
- slprintf(sidstr_out, sizeof(sidstr_out) - 1, "S-%u-%lu", (unsigned int)sid->sid_rev_num, (unsigned long)ia);
+ slprintf(sidstr_out, sizeof(fstring) - 1, "S-%u-%lu", (unsigned int)sid->sid_rev_num, (unsigned long)ia);
for (i = 0; i < sid->num_auths; i++)
{
diff --git a/source/rpc_parse/parse_net.c b/source/rpc_parse/parse_net.c
index b5140d19b92..a9e3e662595 100644
--- a/source/rpc_parse/parse_net.c
+++ b/source/rpc_parse/parse_net.c
@@ -1994,7 +1994,7 @@ BOOL make_r_sam_logon(NET_R_SAM_LOGON * r_s,
else
{
r_s->ctr.ptr_user_info = 0;
- r_s->ctr.switch_value = 0;
+ r_s->ctr.switch_value = switch_value;
r_s->ctr.usr.id = NULL;
}
diff --git a/source/rpc_server/srv_netlog.c b/source/rpc_server/srv_netlog.c
index 61e6b19f032..47e1d0060a3 100644
--- a/source/rpc_server/srv_netlog.c
+++ b/source/rpc_server/srv_netlog.c
@@ -227,7 +227,7 @@ static BOOL api_net_sam_logon( prs_struct *data, prs_struct *rdata)
DOM_CRED srv_creds;
NET_USER_INFO_CTR uctr;
uint32 status;
- uint32 auth_resp;
+ uint32 auth_resp = 0;
BOOL ret;
ZERO_STRUCT(uctr);
diff --git a/source/rpc_server/srv_pipe.c b/source/rpc_server/srv_pipe.c
index 14368e3fc78..de4618e6ec2 100644
--- a/source/rpc_server/srv_pipe.c
+++ b/source/rpc_server/srv_pipe.c
@@ -122,5 +122,5 @@ int read_pipe(pipes_struct * p, char *data, int min_len, int max_len)
return -1;
}
- return read_with_timeout(p->m->fd, data, min_len, max_len, 10000);
+ return read_with_timeout(p->m->fd, data, min_len, max_len, 30000);
}