git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f5477f6
)
s3:winbind: fix bug #7894 - sporadic winbind panic in rpc query_user_list
author
Michael Adam
<obnox@samba.org>
Thu, 30 Dec 2010 10:12:42 +0000
(11:12 +0100)
committer
Karolin Seeger
<kseeger@samba.org>
Sat, 5 Mar 2011 13:34:47 +0000
(14:34 +0100)
correctly evaluate return code of rpccli_samr_QueryDisplayInfo()
before accessing results.
(cherry picked from commit
bdebae14aa646dd9f969db5b3d1aa25c971c9381
)
source3/winbindd/winbindd_rpc.c
patch
|
blob
|
history
diff --git
a/source3/winbindd/winbindd_rpc.c
b/source3/winbindd/winbindd_rpc.c
index 599c888aad862238585f4f7d93eaf38cbb5b1f8d..b65b126cf03c0c7ecc5b1021d8ce34385a7806b3 100644
(file)
--- a/
source3/winbindd/winbindd_rpc.c
+++ b/
source3/winbindd/winbindd_rpc.c
@@
-84,6
+84,13
@@
static NTSTATUS query_user_list(struct winbindd_domain *domain,
&total_size,
&returned_size,
&disp_info);
+
+ if (!NT_STATUS_IS_OK(result)) {
+ if (!NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)) {
+ return result;
+ }
+ }
+
num_dom_users = disp_info.info1.count;
start_idx += disp_info.info1.count;
loop_count++;