r25224: Fix a potential segfault in lsa_lookupsids client code due to
authorMichael Adam <obnox@samba.org>
Wed, 19 Sep 2007 12:03:02 +0000 (12:03 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:30:51 +0000 (12:30 -0500)
uninitialized data.

Michael

source/rpc_client/cli_lsarpc.c

index 1f0677ee03137de59a1f03b0581c4d52821e2dc2..bb1b67ce1a605b00008b95ff8029b1448767ab92 100644 (file)
@@ -172,6 +172,7 @@ static NTSTATUS rpccli_lsa_lookup_sids_noalloc(struct rpc_pipe_client *cli,
                        NT_STATUS_UNSUCCESSFUL );
 
        if (!NT_STATUS_IS_OK(r.status) &&
+           !NT_STATUS_EQUAL(r.status, NT_STATUS_NONE_MAPPED) &&
            !NT_STATUS_EQUAL(r.status, STATUS_SOME_UNMAPPED)) 
        {
                /* An actual error occured */
@@ -181,7 +182,9 @@ static NTSTATUS rpccli_lsa_lookup_sids_noalloc(struct rpc_pipe_client *cli,
 
        /* Return output parameters */
 
-       if (r.mapped_count == 0) {
+       if (NT_STATUS_EQUAL(r.status, NT_STATUS_NONE_MAPPED) ||
+           (r.mapped_count == 0))
+       {
                for (i = 0; i < num_sids; i++) {
                        (names)[i] = NULL;
                        (domains)[i] = NULL;