Ignore:
Timestamp:
Nov 27, 2012, 4:43:17 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: updated trunk to 3.6.0

Location:
trunk/server
Files:
2 deleted
4 edited
2 copied

Legend:

Unmodified
Added
Removed
  • trunk/server

  • trunk/server/source4/torture/libnetapi/libnetapi.c

    r414 r745  
    6767        struct torture_suite *suite;
    6868
    69         suite = torture_suite_create(talloc_autofree_context(), "NETAPI");
     69        suite = torture_suite_create(talloc_autofree_context(), "netapi");
    7070
    71         torture_suite_add_simple_test(suite, "GROUP", torture_libnetapi_group);
    72         torture_suite_add_simple_test(suite, "USER", torture_libnetapi_user);
    73         torture_suite_add_simple_test(suite, "INITIALIZE", torture_libnetapi_initialize);
     71        torture_suite_add_simple_test(suite, "server", torture_libnetapi_server);
     72        torture_suite_add_simple_test(suite, "group", torture_libnetapi_group);
     73        torture_suite_add_simple_test(suite, "user", torture_libnetapi_user);
     74        torture_suite_add_simple_test(suite, "initialize", torture_libnetapi_initialize);
    7475
    7576        suite->description = talloc_strdup(suite, "libnetapi convenience interface tests");
  • trunk/server/source4/torture/libnetapi/libnetapi_group.c

    r414 r745  
    5252        struct GROUP_INFO_3 *info3 = NULL;
    5353
    54         torture_comment(tctx, "testing NetGroupEnum level %d\n", level);
     54        torture_comment(tctx, "Testing NetGroupEnum level %d\n", level);
    5555
    5656        do {
     
    152152        struct GROUP_USERS_INFO_1 *info1 = NULL;
    153153
    154         torture_comment(tctx, "testing NetGroupGetUsers level %d\n", level);
     154        torture_comment(tctx, "Testing NetGroupGetUsers level %d\n", level);
    155155
    156156        do {
     
    231231        struct GROUP_USERS_INFO_1 *g1 = NULL;
    232232
    233         torture_comment(tctx, "testing NetGroupSetUsers level %d\n", level);
     233        torture_comment(tctx, "Testing NetGroupSetUsers level %d\n", level);
    234234
    235235        switch (level) {
     
    314314        g0.grpi0_name = groupname;
    315315
    316         torture_comment(tctx, "testing NetGroupAdd\n");
     316        torture_comment(tctx, "Testing NetGroupAdd\n");
    317317
    318318        status = NetGroupAdd(hostname, 0, (uint8_t *)&g0, &parm_err);
     
    346346        for (i=0; i<ARRAY_SIZE(levels); i++) {
    347347
    348                 torture_comment(tctx, "testing NetGroupGetInfo level %d\n", levels[i]);
     348                torture_comment(tctx, "Testing NetGroupGetInfo level %d\n", levels[i]);
    349349
    350350                status = NetGroupGetInfo(hostname, groupname, levels[i], &buffer);
     
    359359        g0.grpi0_name = groupname2;
    360360
    361         torture_comment(tctx, "testing NetGroupSetInfo level 0\n");
     361        torture_comment(tctx, "Testing NetGroupSetInfo level 0\n");
    362362
    363363        status = NetGroupSetInfo(hostname, groupname, 0, (uint8_t *)&g0, &parm_err);
     
    413413        }
    414414
    415         torture_comment(tctx, "testing NetGroupAddUser\n");
     415        torture_comment(tctx, "Testing NetGroupAddUser\n");
    416416
    417417        status = NetGroupAddUser(hostname, groupname2, username);
     
    432432        }
    433433
    434         torture_comment(tctx, "testing NetGroupDelUser\n");
     434        torture_comment(tctx, "Testing NetGroupDelUser\n");
    435435
    436436        status = NetGroupDelUser(hostname, groupname2, username);
     
    488488        /* delete */
    489489
    490         torture_comment(tctx, "testing NetGroupDel\n");
     490        torture_comment(tctx, "Testing NetGroupDel\n");
    491491
    492492        status = NetGroupDel(hostname, groupname2);
  • trunk/server/source4/torture/libnetapi/libnetapi_user.c

    r414 r745  
    5454        struct USER_INFO_23 *info23 = NULL;
    5555
    56         torture_comment(tctx, "testing NetUserEnum level %d\n", level);
     56        torture_comment(tctx, "Testing NetUserEnum level %d\n", level);
    5757
    5858        do {
     
    193193        ZERO_STRUCT(u1);
    194194
    195         torture_comment(tctx, "testing NetUserAdd\n");
     195        torture_comment(tctx, "Testing NetUserAdd\n");
    196196
    197197        u1.usri1_name = username;
     
    221221        for (i=0; i<ARRAY_SIZE(levels); i++) {
    222222
    223                 torture_comment(tctx, "testing NetUserModalsGet level %d\n", levels[i]);
     223                torture_comment(tctx, "Testing NetUserModalsGet level %d\n", levels[i]);
    224224
    225225                status = NetUserModalsGet(hostname, levels[i], &buffer);
     
    236236        }
    237237
    238         torture_comment(tctx, "testing NetUserModalsSet\n");
     238        torture_comment(tctx, "Testing NetUserModalsSet\n");
    239239
    240240        status = NetUserModalsSet(hostname, 0, (uint8_t *)u0, &parm_err);
     
    275275        struct GROUP_USERS_INFO_1 *i1;
    276276
    277         torture_comment(tctx, "testing NetUserGetGroups level %d\n", level);
     277        torture_comment(tctx, "Testing NetUserGetGroups level %d\n", level);
    278278
    279279        do {
     
    390390        for (i=0; i<ARRAY_SIZE(levels); i++) {
    391391
    392                 torture_comment(tctx, "testing NetUserGetInfo level %d\n", levels[i]);
     392                torture_comment(tctx, "Testing NetUserGetInfo level %d\n", levels[i]);
    393393
    394394                status = NetUserGetInfo(hostname, TORTURE_TEST_USER, levels[i], &buffer);
     
    412412        /* modify description */
    413413
    414         torture_comment(tctx, "testing NetUserSetInfo level %d\n", 1007);
     414        torture_comment(tctx, "Testing NetUserSetInfo level %d\n", 1007);
    415415
    416416        u1007.usri1007_comment = "NetApi modified user";
     
    432432        }
    433433
    434         torture_comment(tctx, "testing NetUserSetInfo level 0\n");
     434        torture_comment(tctx, "Testing NetUserSetInfo level 0\n");
    435435
    436436        u0.usri0_name = TORTURE_TEST_USER2;
     
    444444        /* delete */
    445445
    446         torture_comment(tctx, "testing NetUserDel\n");
     446        torture_comment(tctx, "Testing NetUserDel\n");
    447447
    448448        status = NetUserDel(hostname, TORTURE_TEST_USER2);
Note: See TracChangeset for help on using the changeset viewer.