The branch, v3-devel has been updated via fc1b04df78fc0fb5bc59fa0120c0e29bbb3978a1 (commit) via 07cf13e43d03803a5f039fa6df3c9a35c701d43a (commit) from f48e0cacdf7ed458e0e89ab151e3d233fb89240b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel - Log ----------------------------------------------------------------- commit fc1b04df78fc0fb5bc59fa0120c0e29bbb3978a1 Author: Günther Deschner <[EMAIL PROTECTED]> Date: Fri Sep 5 17:06:24 2008 +0200 netapi: expand NetUser testsuite a little. Guenther commit 07cf13e43d03803a5f039fa6df3c9a35c701d43a Author: Günther Deschner <[EMAIL PROTECTED]> Date: Fri Sep 5 15:13:13 2008 +0200 netapi: add NetShare testsuite. Guenther ----------------------------------------------------------------------- Summary of changes: source/lib/netapi/tests/Makefile.in | 2 +- source/lib/netapi/tests/common.h | 2 + source/lib/netapi/tests/netapitest.c | 5 + source/lib/netapi/tests/netshare.c | 232 ++++++++++++++++++++++++++++++++++ source/lib/netapi/tests/netuser.c | 148 +++++++++++++++++++++- 5 files changed, 386 insertions(+), 3 deletions(-) create mode 100644 source/lib/netapi/tests/netshare.c Changeset truncated at 500 lines: diff --git a/source/lib/netapi/tests/Makefile.in b/source/lib/netapi/tests/Makefile.in index f13281e..d3f0663 100644 --- a/source/lib/netapi/tests/Makefile.in +++ b/source/lib/netapi/tests/Makefile.in @@ -44,7 +44,7 @@ bin/.dummy: CMDLINE_OBJ = common.o NETAPIBUFFER_OBJ = netapibuffer.o -NETAPITEST_OBJ = netapitest.o netlocalgroup.o netuser.o netgroup.o netdisplay.o $(CMDLINE_OBJ) +NETAPITEST_OBJ = netapitest.o netlocalgroup.o netuser.o netgroup.o netdisplay.o netshare.o $(CMDLINE_OBJ) bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(NETAPITEST_OBJ) @echo Linking $@ diff --git a/source/lib/netapi/tests/common.h b/source/lib/netapi/tests/common.h index ed073c0..5a32032 100644 --- a/source/lib/netapi/tests/common.h +++ b/source/lib/netapi/tests/common.h @@ -39,6 +39,8 @@ NET_API_STATUS netapitest_group(struct libnetapi_ctx *ctx, const char *hostname); NET_API_STATUS netapitest_display(struct libnetapi_ctx *ctx, const char *hostname); +NET_API_STATUS netapitest_share(struct libnetapi_ctx *ctx, + const char *hostname); #ifndef ARRAY_SIZE #define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0])) diff --git a/source/lib/netapi/tests/netapitest.c b/source/lib/netapi/tests/netapitest.c index de81f5e..8714402 100644 --- a/source/lib/netapi/tests/netapitest.c +++ b/source/lib/netapi/tests/netapitest.c @@ -79,6 +79,11 @@ int main(int argc, const char **argv) goto out; } + status = netapitest_share(ctx, hostname); + if (status) { + goto out; + } + out: if (status != 0) { printf("testsuite failed with: %s\n", diff --git a/source/lib/netapi/tests/netshare.c b/source/lib/netapi/tests/netshare.c new file mode 100644 index 0000000..9446c30 --- /dev/null +++ b/source/lib/netapi/tests/netshare.c @@ -0,0 +1,232 @@ +/* + * Unix SMB/CIFS implementation. + * NetShare testsuite + * Copyright (C) Guenther Deschner 2008 + * + * 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 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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, see <http://www.gnu.org/licenses/>. + */ + +#include <sys/types.h> +#include <inttypes.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include <netapi.h> + +#include "common.h" + +static NET_API_STATUS test_netshareenum(const char *hostname, + uint32_t level, + const char *sharename) +{ + NET_API_STATUS status; + uint32_t entries_read = 0; + uint32_t total_entries = 0; + uint32_t resume_handle = 0; + int found_share = 0; + const char *current_name; + uint8_t *buffer = NULL; + int i; + + struct SHARE_INFO_0 *i0; + struct SHARE_INFO_1 *i1; + struct SHARE_INFO_2 *i2; + + printf("testing NetShareEnum level %d\n", level); + + do { + status = NetShareEnum(hostname, + level, + &buffer, + (uint32_t)-1, + &entries_read, + &total_entries, + &resume_handle); + if (status == 0 || status == ERROR_MORE_DATA) { + switch (level) { + case 0: + i0 = (struct SHARE_INFO_0 *)buffer; + break; + case 1: + i1 = (struct SHARE_INFO_1 *)buffer; + break; + case 2: + i2 = (struct SHARE_INFO_2 *)buffer; + break; + default: + return -1; + } + + for (i=0; i<entries_read; i++) { + + switch (level) { + case 0: + current_name = i0->shi0_netname; + break; + case 1: + current_name = i1->shi1_netname; + break; + case 2: + current_name = i2->shi2_netname; + break; + default: + break; + } + + if (strcasecmp(current_name, sharename) == 0) { + found_share = 1; + } + + switch (level) { + case 0: + i0++; + break; + case 1: + i1++; + break; + case 2: + i2++; + break; + } + } + NetApiBufferFree(buffer); + } + } while (status == ERROR_MORE_DATA); + + if (status) { + return status; + } + + if (!found_share) { + printf("failed to get share\n"); + return -1; + } + + return 0; +} + +NET_API_STATUS netapitest_share(struct libnetapi_ctx *ctx, + const char *hostname) +{ + NET_API_STATUS status = 0; + const char *sharename, *comment; + uint8_t *buffer = NULL; + struct SHARE_INFO_2 i2; + struct SHARE_INFO_1004 i1004; + struct SHARE_INFO_501 *i501 = NULL; + uint32_t parm_err = 0; + uint32_t levels[] = { 0, 1, 2, 501, 1005 }; + uint32_t enum_levels[] = { 0, 1, 2 }; + int i; + + printf("NetShare tests\n"); + + sharename = "torture_test_share"; + + /* cleanup */ + NetShareDel(hostname, sharename, 0); + + /* add a share */ + + printf("testing NetShareAdd\n"); + + ZERO_STRUCT(i2); + + i2.shi2_netname = sharename; + i2.shi2_path = "c:\\"; + + status = NetShareAdd(hostname, 2, (uint8_t *)&i2, &parm_err); + if (status) { + NETAPI_STATUS(ctx, status, "NetShareAdd"); + goto out; + }; + + /* test enum */ + + for (i=0; i<ARRAY_SIZE(enum_levels); i++) { + + status = test_netshareenum(hostname, enum_levels[i], sharename); + if (status) { + NETAPI_STATUS(ctx, status, "NetShareEnum"); + goto out; + } + } + + /* basic queries */ + + for (i=0; i<ARRAY_SIZE(levels); i++) { + + printf("testing NetShareGetInfo level %d\n", levels[i]); + + status = NetShareGetInfo(hostname, sharename, levels[i], &buffer); + if (status && status != 124) { + NETAPI_STATUS(ctx, status, "NetShareGetInfo"); + goto out; + } + } + + + comment = "NetApi generated comment"; + + i1004.shi1004_remark = comment; + + printf("testing NetShareSetInfo level 1004\n"); + + status = NetShareSetInfo(hostname, sharename, 1004, (uint8_t *)&i1004, &parm_err); + if (status) { + NETAPI_STATUS(ctx, status, "NetShareSetInfo"); + goto out; + } + + status = NetShareGetInfo(hostname, sharename, 501, (uint8_t **)&i501); + if (status) { + NETAPI_STATUS(ctx, status, "NetShareGetInfo"); + goto out; + } + + if (strcasecmp(i501->shi501_remark, comment) != 0) { + NETAPI_STATUS(ctx, status, "NetShareGetInfo"); + goto out; + } + + /* delete */ + + printf("testing NetShareDel\n"); + + status = NetShareDel(hostname, sharename, 0); + if (status) { + NETAPI_STATUS(ctx, status, "NetShareDel"); + goto out; + }; + + /* should not exist anymore */ + + status = NetShareGetInfo(hostname, sharename, 0, &buffer); + if (status == 0) { + NETAPI_STATUS(ctx, status, "NetShareGetInfo"); + goto out; + }; + + status = 0; + + printf("NetShare tests succeeded\n"); + out: + if (status != 0) { + printf("NetShare testsuite failed with: %s\n", + libnetapi_get_error_string(ctx, status)); + } + + return status; +} diff --git a/source/lib/netapi/tests/netuser.c b/source/lib/netapi/tests/netuser.c index c50e384..f1622e4 100644 --- a/source/lib/netapi/tests/netuser.c +++ b/source/lib/netapi/tests/netuser.c @@ -41,7 +41,12 @@ static NET_API_STATUS test_netuserenum(const char *hostname, int i; struct USER_INFO_0 *info0; + struct USER_INFO_1 *info1; + struct USER_INFO_2 *info2; + struct USER_INFO_3 *info3; + struct USER_INFO_4 *info4; struct USER_INFO_10 *info10; + struct USER_INFO_11 *info11; struct USER_INFO_20 *info20; struct USER_INFO_23 *info23; @@ -61,9 +66,24 @@ static NET_API_STATUS test_netuserenum(const char *hostname, case 0: info0 = (struct USER_INFO_0 *)buffer; break; + case 1: + info1 = (struct USER_INFO_1 *)buffer; + break; + case 2: + info2 = (struct USER_INFO_2 *)buffer; + break; + case 3: + info3 = (struct USER_INFO_3 *)buffer; + break; + case 4: + info4 = (struct USER_INFO_4 *)buffer; + break; case 10: info10 = (struct USER_INFO_10 *)buffer; break; + case 11: + info11 = (struct USER_INFO_11 *)buffer; + break; case 20: info20 = (struct USER_INFO_20 *)buffer; break; @@ -80,9 +100,24 @@ static NET_API_STATUS test_netuserenum(const char *hostname, case 0: current_name = info0->usri0_name; break; + case 1: + current_name = info1->usri1_name; + break; + case 2: + current_name = info2->usri2_name; + break; + case 3: + current_name = info3->usri3_name; + break; + case 4: + current_name = info4->usri4_name; + break; case 10: current_name = info10->usri10_name; break; + case 11: + current_name = info11->usri11_name; + break; case 20: current_name = info20->usri20_name; break; @@ -101,9 +136,24 @@ static NET_API_STATUS test_netuserenum(const char *hostname, case 0: info0++; break; + case 1: + info1++; + break; + case 2: + info2++; + break; + case 3: + info3++; + break; + case 4: + info4++; + break; case 10: info10++; break; + case 11: + info11++; + break; case 20: info20++; break; @@ -202,14 +252,97 @@ static NET_API_STATUS test_netusermodals(struct libnetapi_ctx *ctx, return 0; } +static NET_API_STATUS test_netusergetgroups(const char *hostname, + uint32_t level, + const char *username, + const char *groupname) +{ + NET_API_STATUS status; + uint32_t entries_read = 0; + uint32_t total_entries = 0; + const char *current_name; + int found_group = 0; + uint8_t *buffer = NULL; + int i; + + struct GROUP_USERS_INFO_0 *i0; + struct GROUP_USERS_INFO_1 *i1; + + printf("testing NetUserGetGroups level %d\n", level); + + do { + status = NetUserGetGroups(hostname, + username, + level, + &buffer, + 120, //(uint32_t)-1, + &entries_read, + &total_entries); + if (status == 0 || status == ERROR_MORE_DATA) { + switch (level) { + case 0: + i0 = (struct GROUP_USERS_INFO_0 *)buffer; + break; + case 1: + i1 = (struct GROUP_USERS_INFO_1 *)buffer; + break; + default: + return -1; + } + + for (i=0; i<entries_read; i++) { + + switch (level) { + case 0: + current_name = i0->grui0_name; + break; + case 1: + current_name = i1->grui1_name; + break; + default: + return -1; + } + + if (groupname && strcasecmp(current_name, groupname) == 0) { + found_group = 1; + } + + switch (level) { + case 0: + i0++; + break; + case 1: + i1++; + break; + default: + break; + } + } + NetApiBufferFree(buffer); + } + } while (status == ERROR_MORE_DATA); + + if (status) { + return status; + } + + if (groupname && !found_group) { + printf("failed to get membership\n"); + return -1; + } + + return 0; +} + NET_API_STATUS netapitest_user(struct libnetapi_ctx *ctx, const char *hostname) { NET_API_STATUS status = 0; const char *username, *username2; uint8_t *buffer = NULL; - uint32_t levels[] = { 0, 10, 20, 23 }; - uint32_t enum_levels[] = { 0, 10, 20, 23 }; + uint32_t levels[] = { 0, 1, 2, 3, 4, 10, 11, 20, 23 }; + uint32_t enum_levels[] = { 0, 1, 2, 3, 4, 10, 11, 20, 23 }; + uint32_t getgr_levels[] = { 0, 1 }; int i; struct USER_INFO_1007 u1007; @@ -256,6 +389,17 @@ NET_API_STATUS netapitest_user(struct libnetapi_ctx *ctx, } } + /* testing getgroups */ + + for (i=0; i<ARRAY_SIZE(getgr_levels); i++) { + + status = test_netusergetgroups(hostname, getgr_levels[i], username, NULL); + if (status) { + NETAPI_STATUS(ctx, status, "NetUserGetGroups"); + goto out; + } + } + /* modify description */ printf("testing NetUserSetInfo level %d\n", 1007); -- Samba Shared Repository