Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange
[ira/wip.git] / source4 / torture / rap / rap.c
index 1b98275e93f2b2f130441a70cf12651c46a29bc4..4b5f4b582c581eb3a18d32db47d2b9092d503962 100644 (file)
@@ -3,10 +3,11 @@
    test suite for various RAP operations
    Copyright (C) Volker Lendecke 2004
    Copyright (C) Tim Potter 2005
+   Copyright (C) Jelmer Vernooij 2007
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "libcli/libcli.h"
 #include "torture/torture.h"
-#include "rap.h"
+#include "torture/util.h"
+#include "libcli/rap/rap.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
+#include "librpc/ndr/libndr.h"
+#include "param/param.h"
+
+#define RAP_GOTO(call) do { \
+       NTSTATUS _status; \
+       _status = call; \
+       if (!NT_STATUS_IS_OK(_status)) { \
+               result = _status; \
+               goto done; \
+       } \
+} while (0)
+
+#define NDR_GOTO(call) do { \
+       enum ndr_err_code _ndr_err; \
+       _ndr_err = call; \
+       if (!NDR_ERR_CODE_IS_SUCCESS(_ndr_err)) { \
+               result = ndr_map_error2ntstatus(_ndr_err); \
+               goto done; \
+       } \
+} while (0)
+
+#define NDR_RETURN(call) do { \
+       enum ndr_err_code _ndr_err; \
+       _ndr_err = call; \
+       if (!NDR_ERR_CODE_IS_SUCCESS(_ndr_err)) { \
+               return ndr_map_error2ntstatus(_ndr_err); \
+       } \
+} while (0)
 
 struct rap_call {
        uint16_t callno;
@@ -42,7 +73,7 @@ struct rap_call {
 
 #define RAPNDR_FLAGS (LIBNDR_FLAG_NOALIGN|LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM);
 
-static struct rap_call *new_rap_cli_call(TALLOC_CTX *mem_ctx, uint16_t callno)
+static struct rap_call *new_rap_cli_call(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, uint16_t callno)
 {
        struct rap_call *call;
 
@@ -57,10 +88,10 @@ static struct rap_call *new_rap_cli_call(TALLOC_CTX *mem_ctx, uint16_t callno)
        call->paramdesc = NULL;
        call->datadesc = NULL;
 
-       call->ndr_push_param = ndr_push_init_ctx(mem_ctx);
+       call->ndr_push_param = ndr_push_init_ctx(mem_ctx, iconv_convenience);
        call->ndr_push_param->flags = RAPNDR_FLAGS;
 
-       call->ndr_push_data = ndr_push_init_ctx(mem_ctx);
+       call->ndr_push_data = ndr_push_init_ctx(mem_ctx, iconv_convenience);
        call->ndr_push_data->flags = RAPNDR_FLAGS;
 
        return call;
@@ -75,7 +106,7 @@ static void rap_cli_push_paramdesc(struct rap_call *call, char desc)
 
        call->paramdesc = talloc_realloc(call,
                                         call->paramdesc,
-                                        uint8_t,
+                                        char,
                                         len+2);
 
        call->paramdesc[len] = desc;
@@ -109,6 +140,12 @@ static void rap_cli_expect_multiple_entries(struct rap_call *call)
        call->rcv_paramlen += 4; /* uint16_t entry count, uint16_t total */
 }
 
+static void rap_cli_expect_word(struct rap_call *call)
+{
+       rap_cli_push_paramdesc(call, 'h');
+       call->rcv_paramlen += 2;
+}
+
 static void rap_cli_push_string(struct rap_call *call, const char *str)
 {
        if (str == NULL) {
@@ -132,8 +169,8 @@ static NTSTATUS rap_pull_string(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr,
        const char *p;
        size_t len;
 
-       NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &string_offset));
-       NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &ignore));
+       NDR_RETURN(ndr_pull_uint16(ndr, NDR_SCALARS, &string_offset));
+       NDR_RETURN(ndr_pull_uint16(ndr, NDR_SCALARS, &ignore));
 
        string_offset -= convert;
 
@@ -146,20 +183,22 @@ static NTSTATUS rap_pull_string(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr,
        if ( string_offset + len + 1 >  ndr->data_size )
                return NT_STATUS_INVALID_PARAMETER;
 
-       *dest = talloc_zero_size(mem_ctx, len+1);
-       pull_ascii(*dest, p, len+1, len, 0);
+       *dest = talloc_zero_array(mem_ctx, char, len+1);
+       pull_string(ndr->iconv_convenience, *dest, p, len+1, len, STR_ASCII);
 
        return NT_STATUS_OK;
 }
 
-static NTSTATUS rap_cli_do_call(struct smbcli_state *cli, struct rap_call *call)
+static NTSTATUS rap_cli_do_call(struct smbcli_tree *tree, 
+                               struct smb_iconv_convenience *iconv_convenience,
+                               struct rap_call *call)
 {
        NTSTATUS result;
        DATA_BLOB param_blob;
        struct ndr_push *params;
        struct smb_trans2 trans;
 
-       params = ndr_push_init_ctx(call);
+       params = ndr_push_init_ctx(call, iconv_convenience);
 
        if (params == NULL)
                return NT_STATUS_NO_MEMORY;
@@ -167,7 +206,7 @@ static NTSTATUS rap_cli_do_call(struct smbcli_state *cli, struct rap_call *call)
        params->flags = RAPNDR_FLAGS;
 
        trans.in.max_param = call->rcv_paramlen;
-       trans.in.max_data = smb_raw_max_trans_data(cli->tree, call->rcv_paramlen);
+       trans.in.max_data = smb_raw_max_trans_data(tree, call->rcv_paramlen);
        trans.in.max_setup = 0;
        trans.in.flags = 0;
        trans.in.timeout = 0;
@@ -175,40 +214,38 @@ static NTSTATUS rap_cli_do_call(struct smbcli_state *cli, struct rap_call *call)
        trans.in.setup = NULL;
        trans.in.trans_name = "\\PIPE\\LANMAN";
 
-       NDR_CHECK(ndr_push_uint16(params, NDR_SCALARS, call->callno));
+       NDR_RETURN(ndr_push_uint16(params, NDR_SCALARS, call->callno));
        if (call->paramdesc)
-               NDR_CHECK(ndr_push_string(params, NDR_SCALARS, call->paramdesc));
+               NDR_RETURN(ndr_push_string(params, NDR_SCALARS, call->paramdesc));
        if (call->datadesc)
-               NDR_CHECK(ndr_push_string(params, NDR_SCALARS, call->datadesc));
+               NDR_RETURN(ndr_push_string(params, NDR_SCALARS, call->datadesc));
 
        param_blob = ndr_push_blob(call->ndr_push_param);
-       NDR_CHECK(ndr_push_bytes(params, param_blob.data,
+       NDR_RETURN(ndr_push_bytes(params, param_blob.data,
                                 param_blob.length));
 
        trans.in.params = ndr_push_blob(params);
        trans.in.data = data_blob(NULL, 0);
 
-       result = smb_raw_trans(cli->tree, call, &trans);
+       result = smb_raw_trans(tree, call, &trans);
 
        if (!NT_STATUS_IS_OK(result))
                return result;
 
-       call->ndr_pull_param = ndr_pull_init_blob(&trans.out.params, call);
+       call->ndr_pull_param = ndr_pull_init_blob(&trans.out.params, call,
+                                                 iconv_convenience);
        call->ndr_pull_param->flags = RAPNDR_FLAGS;
 
-       call->ndr_pull_data = ndr_pull_init_blob(&trans.out.data, call);
+       call->ndr_pull_data = ndr_pull_init_blob(&trans.out.data, call,
+                                                iconv_convenience);
        call->ndr_pull_data->flags = RAPNDR_FLAGS;
 
        return result;
 }
 
-#define NDR_OK(call) do { NTSTATUS _status; \
-                             _status = call; \
-                             if (!NT_STATUS_IS_OK(_status)) \
-                               goto done; \
-                        } while (0)
 
-static NTSTATUS smbcli_rap_netshareenum(struct smbcli_state *cli,
+static NTSTATUS smbcli_rap_netshareenum(struct smbcli_tree *tree,
+                                       struct smb_iconv_convenience *iconv_convenience,
                                        TALLOC_CTX *mem_ctx,
                                        struct rap_NetShareEnum *r)
 {
@@ -216,7 +253,7 @@ static NTSTATUS smbcli_rap_netshareenum(struct smbcli_state *cli,
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        int i;
 
-       call = new_rap_cli_call(NULL, RAP_WshareEnum);
+       call = new_rap_cli_call(tree, iconv_convenience, RAP_WshareEnum);
 
        if (call == NULL)
                return NT_STATUS_NO_MEMORY;
@@ -234,15 +271,15 @@ static NTSTATUS smbcli_rap_netshareenum(struct smbcli_state *cli,
                break;
        }
 
-       result = rap_cli_do_call(cli, call);
+       result = rap_cli_do_call(tree, iconv_convenience, call);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       NDR_OK(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.status));
-       NDR_OK(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.convert));
-       NDR_OK(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.count));
-       NDR_OK(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.available));
+       NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.status));
+       NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.convert));
+       NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.count));
+       NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.available));
 
        r->out.info = talloc_array(mem_ctx, union rap_shareenum_info, r->out.count);
 
@@ -254,17 +291,17 @@ static NTSTATUS smbcli_rap_netshareenum(struct smbcli_state *cli,
        for (i=0; i<r->out.count; i++) {
                switch(r->in.level) {
                case 0:
-                       NDR_OK(ndr_pull_bytes(call->ndr_pull_data,
+                       NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
                                              (uint8_t *)r->out.info[i].info0.name, 13));
                        break;
                case 1:
-                       NDR_OK(ndr_pull_bytes(call->ndr_pull_data,
+                       NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
                                              (uint8_t *)r->out.info[i].info1.name, 13));
-                       NDR_OK(ndr_pull_bytes(call->ndr_pull_data,
+                       NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
                                              (uint8_t *)&r->out.info[i].info1.pad, 1));
-                       NDR_OK(ndr_pull_uint16(call->ndr_pull_data,
+                       NDR_GOTO(ndr_pull_uint16(call->ndr_pull_data,
                                               NDR_SCALARS, &r->out.info[i].info1.type));
-                       NDR_OK(rap_pull_string(mem_ctx, call->ndr_pull_data,
+                       RAP_GOTO(rap_pull_string(mem_ctx, call->ndr_pull_data,
                                               r->out.convert,
                                               &r->out.info[i].info1.comment));
                        break;
@@ -278,17 +315,17 @@ static NTSTATUS smbcli_rap_netshareenum(struct smbcli_state *cli,
        return result;
 }
 
-static BOOL test_netshareenum(struct smbcli_state *cli)
+static bool test_netshareenum(struct torture_context *tctx, 
+                             struct smbcli_state *cli)
 {
        struct rap_NetShareEnum r;
        int i;
-       TALLOC_CTX *tmp_ctx = talloc_new(cli);
 
        r.in.level = 1;
        r.in.bufsize = 8192;
 
-       if (!NT_STATUS_IS_OK(smbcli_rap_netshareenum(cli, tmp_ctx, &r)))
-               return False;
+       torture_assert_ntstatus_ok(tctx, 
+               smbcli_rap_netshareenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r), "");
 
        for (i=0; i<r.out.count; i++) {
                printf("%s %d %s\n", r.out.info[i].info1.name,
@@ -296,12 +333,11 @@ static BOOL test_netshareenum(struct smbcli_state *cli)
                       r.out.info[i].info1.comment);
        }
 
-       talloc_free(tmp_ctx);
-
-       return True;
+       return true;
 }
 
-static NTSTATUS smbcli_rap_netserverenum2(struct smbcli_state *cli,
+static NTSTATUS smbcli_rap_netserverenum2(struct smbcli_tree *tree,
+                                         struct smb_iconv_convenience *iconv_convenience, 
                                          TALLOC_CTX *mem_ctx,
                                          struct rap_NetServerEnum2 *r)
 {
@@ -309,7 +345,7 @@ static NTSTATUS smbcli_rap_netserverenum2(struct smbcli_state *cli,
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        int i;
 
-       call = new_rap_cli_call(NULL, RAP_NetServerEnum2);
+       call = new_rap_cli_call(mem_ctx, iconv_convenience, RAP_NetServerEnum2);
 
        if (call == NULL)
                return NT_STATUS_NO_MEMORY;
@@ -329,17 +365,17 @@ static NTSTATUS smbcli_rap_netserverenum2(struct smbcli_state *cli,
                break;
        }
 
-       result = rap_cli_do_call(cli, call);
+       result = rap_cli_do_call(tree, iconv_convenience, call);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
        result = NT_STATUS_INVALID_PARAMETER;
 
-       NDR_OK(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.status));
-       NDR_OK(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.convert));
-       NDR_OK(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.count));
-       NDR_OK(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.available));
+       NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.status));
+       NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.convert));
+       NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.count));
+       NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.available));
 
        r->out.info = talloc_array(mem_ctx, union rap_server_info, r->out.count);
 
@@ -351,19 +387,19 @@ static NTSTATUS smbcli_rap_netserverenum2(struct smbcli_state *cli,
        for (i=0; i<r->out.count; i++) {
                switch(r->in.level) {
                case 0:
-                       NDR_OK(ndr_pull_bytes(call->ndr_pull_data,
+                       NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
                                              (uint8_t *)r->out.info[i].info0.name, 16));
                        break;
                case 1:
-                       NDR_OK(ndr_pull_bytes(call->ndr_pull_data,
+                       NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
                                              (uint8_t *)r->out.info[i].info1.name, 16));
-                       NDR_OK(ndr_pull_bytes(call->ndr_pull_data,
+                       NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
                                              &r->out.info[i].info1.version_major, 1));
-                       NDR_OK(ndr_pull_bytes(call->ndr_pull_data,
+                       NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
                                              &r->out.info[i].info1.version_minor, 1));
-                       NDR_OK(ndr_pull_uint32(call->ndr_pull_data,
+                       NDR_GOTO(ndr_pull_uint32(call->ndr_pull_data,
                                               NDR_SCALARS, &r->out.info[i].info1.servertype));
-                       NDR_OK(rap_pull_string(mem_ctx, call->ndr_pull_data,
+                       RAP_GOTO(rap_pull_string(mem_ctx, call->ndr_pull_data,
                                               r->out.convert,
                                               &r->out.info[i].info1.comment));
                }
@@ -376,11 +412,11 @@ static NTSTATUS smbcli_rap_netserverenum2(struct smbcli_state *cli,
        return result;
 }
 
-static BOOL test_netserverenum(struct smbcli_state *cli)
+static bool test_netserverenum(struct torture_context *tctx, 
+                              struct smbcli_state *cli)
 {
        struct rap_NetServerEnum2 r;
        int i;
-       TALLOC_CTX *tmp_ctx = talloc_new(cli);
 
        r.in.level = 0;
        r.in.bufsize = 8192;
@@ -388,8 +424,8 @@ static BOOL test_netserverenum(struct smbcli_state *cli)
        r.in.servertype = 0x80000000;
        r.in.domain = NULL;
 
-       if (!NT_STATUS_IS_OK(smbcli_rap_netserverenum2(cli, tmp_ctx, &r)))
-               return False;
+       torture_assert_ntstatus_ok(tctx, 
+                  smbcli_rap_netserverenum2(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r), "");
 
        for (i=0; i<r.out.count; i++) {
                switch (r.in.level) {
@@ -404,65 +440,94 @@ static BOOL test_netserverenum(struct smbcli_state *cli)
                }
        }
 
-       talloc_free(tmp_ctx);
-
-       return True;
+       return true;
 }
 
+NTSTATUS smbcli_rap_netservergetinfo(struct smbcli_tree *tree,
+                                             struct smb_iconv_convenience *iconv_convenience, 
+                                    TALLOC_CTX *mem_ctx,
+                                    struct rap_WserverGetInfo *r)
+{
+       struct rap_call *call;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 
+       if (!(call = new_rap_cli_call(mem_ctx, iconv_convenience, RAP_WserverGetInfo))) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
-static BOOL test_rap(struct smbcli_state *cli)
-{
-       BOOL res = True;
+       rap_cli_push_word(call, r->in.level);
+       rap_cli_push_rcvbuf(call, r->in.bufsize);
+       rap_cli_expect_word(call);
 
-       if (!test_netserverenum(cli))
-               res = False;
+       switch(r->in.level) {
+       case 0:
+               rap_cli_expect_format(call, "B16");
+               break;
+       case 1:
+               rap_cli_expect_format(call, "B16BBDz");
+               break;
+       default:
+               result = NT_STATUS_INVALID_PARAMETER;
+               goto done;
+       }
 
-       if (!test_netshareenum(cli))
-               res = False;
+       result = rap_cli_do_call(tree, iconv_convenience, call);
 
-       return res;
-}
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
 
-BOOL torture_raw_rap(void)
-{
-       struct smbcli_state *cli;
-       BOOL ret = True;
-       TALLOC_CTX *mem_ctx;
+       NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.status));
+       NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.convert));
+       NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.available));
 
-       if (!torture_open_connection(&cli)) {
-               return False;
+       switch(r->in.level) {
+       case 0:
+               NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
+                                     (uint8_t *)r->out.info.info0.name, 16));
+               break;
+       case 1:
+               NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
+                                     (uint8_t *)r->out.info.info1.name, 16));
+               NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
+                                     &r->out.info.info1.version_major, 1));
+               NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
+                                     &r->out.info.info1.version_minor, 1));
+               NDR_GOTO(ndr_pull_uint32(call->ndr_pull_data,
+                                      NDR_SCALARS, &r->out.info.info1.servertype));
+               RAP_GOTO(rap_pull_string(mem_ctx, call->ndr_pull_data,
+                                      r->out.convert,
+                                      &r->out.info.info1.comment));
        }
+ done:
+       talloc_free(call);
+       return result;
+}
 
-       mem_ctx = talloc_init("torture_raw_rap");
+static bool test_netservergetinfo(struct torture_context *tctx, 
+                                 struct smbcli_state *cli)
+{
+       struct rap_WserverGetInfo r;
+       bool res = true;
 
-       if (!test_rap(cli)) {
-               ret = False;
-       }
+       r.in.bufsize = 0xffff;
 
-       torture_close_connection(cli);
-       talloc_free(mem_ctx);
+       r.in.level = 0;
+       torture_assert_ntstatus_ok(tctx, smbcli_rap_netservergetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r), "");
+       r.in.level = 1;
+       torture_assert_ntstatus_ok(tctx, smbcli_rap_netservergetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r), "");
 
-       return ret;
+       return res;
 }
 
-BOOL torture_rap_scan(void)
+bool torture_rap_scan(struct torture_context *torture, struct smbcli_state *cli)
 {
-       TALLOC_CTX *mem_ctx;
-       struct smbcli_state *cli;
        int callno;
 
-       mem_ctx = talloc_init("torture_rap_scan");
-
-       if (!torture_open_connection(&cli)) {
-               return False;
-       }
-       
        for (callno = 0; callno < 0xffff; callno++) {
-               struct rap_call *call = new_rap_cli_call(mem_ctx, callno);
+               struct rap_call *call = new_rap_cli_call(torture, lp_iconv_convenience(torture->lp_ctx), callno);
                NTSTATUS result;
 
-               result = rap_cli_do_call(cli, call);
+               result = rap_cli_do_call(cli->tree, lp_iconv_convenience(torture->lp_ctx), call);
 
                if (!NT_STATUS_EQUAL(result, NT_STATUS_INVALID_PARAMETER))
                        continue;
@@ -470,7 +535,29 @@ BOOL torture_rap_scan(void)
                printf("callno %d is RAP call\n", callno);
        }
 
-       torture_close_connection(cli);
+       return true;
+}
+
+NTSTATUS torture_rap_init(void)
+{
+       struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "RAP");
+       struct torture_suite *suite_basic = torture_suite_create(suite, "BASIC");
 
-       return True;
+       torture_suite_add_suite(suite, suite_basic);
+
+       torture_suite_add_1smb_test(suite_basic, "netserverenum", 
+                                   test_netserverenum);
+       torture_suite_add_1smb_test(suite_basic, "netshareenum",
+                                   test_netshareenum);
+       torture_suite_add_1smb_test(suite_basic, "netservergetinfo",
+                                   test_netservergetinfo);
+
+       torture_suite_add_1smb_test(suite, "SCAN", torture_rap_scan);
+
+       suite->description = talloc_strdup(suite, 
+                                               "Remote Administration Protocol tests");
+
+       torture_register_suite(suite);
+
+       return NT_STATUS_OK;
 }