diff options
| author | Derrell Lipman <derrell.lipman@unwireduniverse.com> | 2008-03-03 18:27:41 -0500 |
|---|---|---|
| committer | Derrell Lipman <derrell.lipman@unwireduniverse.com> | 2008-03-03 18:27:41 -0500 |
| commit | b6595bd38b01158bcfcff935254218204873c4ee (patch) | |
| tree | 88765055797d971487af9a87efd47e8529892406 /source3 | |
| parent | ee45d0d6630624b735a7ea07639ffa0d774a337c (diff) | |
| parent | 4aa0bfc9853fd0b6d2882c40c53d20e65fe2fa48 (diff) | |
| download | samba-b6595bd38b01158bcfcff935254218204873c4ee.tar.gz samba-b6595bd38b01158bcfcff935254218204873c4ee.tar.bz2 samba-b6595bd38b01158bcfcff935254218204873c4ee.zip | |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 8927b50d6051fcefd87f19dc90c5826378d03e4e)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libgpo/gpo_util.c | 7 | ||||
| -rw-r--r-- | source3/rpc_server/srv_lsa_nt.c | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source3/libgpo/gpo_util.c b/source3/libgpo/gpo_util.c index f2d7c6924a..f41bbc1817 100644 --- a/source3/libgpo/gpo_util.c +++ b/source3/libgpo/gpo_util.c @@ -738,8 +738,11 @@ NTSTATUS gp_find_file(TALLOC_CTX *mem_ctx, return NT_STATUS_OK; } - tmp = talloc_asprintf_strupper_m(mem_ctx, "%s/%s/%s", filename, path, - suffix); + path = talloc_strdup_upper(mem_ctx, path); + NT_STATUS_HAVE_NO_MEMORY(path); + + tmp = talloc_asprintf(mem_ctx, "%s/%s/%s", filename, + path, suffix); NT_STATUS_HAVE_NO_MEMORY(tmp); if (sys_stat(tmp, &sbuf) == 0) { diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c index 1333d656d4..ce3fd1a44f 100644 --- a/source3/rpc_server/srv_lsa_nt.c +++ b/source3/rpc_server/srv_lsa_nt.c @@ -1216,6 +1216,7 @@ NTSTATUS _lsa_Close(pipes_struct *p, struct lsa_Close *r) } close_policy_hnd(p, r->in.handle); + ZERO_STRUCTP(r->out.handle); return NT_STATUS_OK; } |