r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies for the

[nivanova/samba-autobuild/.git] / source4 / torture / rap / rap.c

diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index dd0654f90f2cbd12b4f05c72704f2b7248be041e..b68564aa2ed14d70872b251f4b98512301e24ed7 100644 (file)
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -44,7 +44,7 @@ static struct rap_call *new_rap_cli_call(TALLOC_CTX *mem_ctx, uint16 callno)
 {
        struct rap_call *call;
 
-       call = talloc_p(mem_ctx, struct rap_call);
+       call = talloc(mem_ctx, struct rap_call);
 
        if (call == NULL)
                return NULL;
@@ -213,7 +213,7 @@ static NTSTATUS smbcli_rap_netshareenum(struct smbcli_state *cli,
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        int i;
 
-       call = new_rap_cli_call(NULL, 0);
+       call = new_rap_cli_call(NULL, RAP_WshareEnum);
 
        if (call == NULL)
                return NT_STATUS_NO_MEMORY;
@@ -241,7 +241,7 @@ static NTSTATUS smbcli_rap_netshareenum(struct smbcli_state *cli,
        NDR_OK(ndr_pull_uint16(call->ndr_pull_param, &r->out.count));
        NDR_OK(ndr_pull_uint16(call->ndr_pull_param, &r->out.available));
 
-       r->out.info = talloc_array_p(call, union rap_shareenum_info,
+       r->out.info = talloc_array(call, union rap_shareenum_info,
                                     r->out.count);
 
        if (r->out.info == NULL) {
@@ -272,7 +272,7 @@ static NTSTATUS smbcli_rap_netshareenum(struct smbcli_state *cli,
        result = NT_STATUS_OK;
 
  done:
-       talloc_destroy(call);
+       talloc_free(call);
        return result;
 }
 
@@ -303,7 +303,7 @@ static NTSTATUS smbcli_rap_netserverenum2(struct smbcli_state *cli,
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        int i;
 
-       call = new_rap_cli_call(NULL, 104);
+       call = new_rap_cli_call(NULL, RAP_NetServerEnum2);
 
        if (call == NULL)
                return NT_STATUS_NO_MEMORY;
@@ -335,7 +335,7 @@ static NTSTATUS smbcli_rap_netserverenum2(struct smbcli_state *cli,
        NDR_OK(ndr_pull_uint16(call->ndr_pull_param, &r->out.count));
        NDR_OK(ndr_pull_uint16(call->ndr_pull_param, &r->out.available));
 
-       r->out.info = talloc_array_p(call, union rap_server_info,
+       r->out.info = talloc_array(call, union rap_server_info,
                                     r->out.count);
 
        if (r->out.info == NULL) {
@@ -367,7 +367,7 @@ static NTSTATUS smbcli_rap_netserverenum2(struct smbcli_state *cli,
        result = NT_STATUS_OK;
 
  done:
-       talloc_destroy(call);
+       talloc_free(call);
        return result;
 }
 
@@ -433,7 +433,7 @@ BOOL torture_raw_rap(void)
        }
 
        torture_close_connection(cli);
-       talloc_destroy(mem_ctx);
+       talloc_free(mem_ctx);
 
        return ret;
 }
@@ -442,7 +442,7 @@ BOOL torture_rap_scan(void)
 {
        TALLOC_CTX *mem_ctx;
        struct smbcli_state *cli;
-       uint16 callno;
+       int callno;
 
        mem_ctx = talloc_init("torture_rap_scan");
 
@@ -456,12 +456,13 @@ BOOL torture_rap_scan(void)
 
                result = rap_cli_do_call(cli, call);
 
-               if (NT_STATUS_EQUAL(result, NT_STATUS_INVALID_PARAMETER))
-                       printf("callno %d is RAP call\n", callno);
+               if (!NT_STATUS_EQUAL(result, NT_STATUS_INVALID_PARAMETER))
+                       continue;
+
+               printf("callno %d is RAP call\n", callno);
        }
 
        torture_close_connection(cli);
 
-
        return True;
 }