The branch, master has been updated
via 92ebd6afc9a1979d5a08af1f7964032763d8fc5b (commit)
via bd7d2fa017832f509905ff48838660d9f732064a (commit)
via b47953ea105a04a3d62259f1cbf5aea2f7910173 (commit)
from ba58d17e6981dcf6775c1706ff21afa6c5849ede (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 92ebd6afc9a1979d5a08af1f7964032763d8fc5b
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Sep 16 16:04:43 2008 +0200
re-run make idl.
Guenther
commit bd7d2fa017832f509905ff48838660d9f732064a
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Tue Sep 16 16:04:31 2008 +0200
netapi: add more fields to USER_INFO_X.
Guenther
commit b47953ea105a04a3d62259f1cbf5aea2f7910173
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Fri Sep 12 17:24:37 2008 +0200
netapi: add NetFile testsuite.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/lib/netapi/tests/Makefile.in | 2 +-
source3/lib/netapi/tests/common.h | 2 +
source3/lib/netapi/tests/netapitest.c | 5 +
.../{examples/file/file_enum.c => tests/netfile.c} | 139 ++++++++++----------
source3/librpc/gen_ndr/libnetapi.h | 2 +
source3/librpc/gen_ndr/ndr_libnetapi.c | 6 +
source3/librpc/idl/libnetapi.idl | 2 +
7 files changed, 86 insertions(+), 72 deletions(-)
copy source3/lib/netapi/{examples/file/file_enum.c => tests/netfile.c} (54%)
Changeset truncated at 500 lines:
diff --git a/source3/lib/netapi/tests/Makefile.in
b/source3/lib/netapi/tests/Makefile.in
index 0145753..659f82c 100644
--- a/source3/lib/netapi/tests/Makefile.in
+++ b/source3/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 netshare.o $(CMDLINE_OBJ)
+NETAPITEST_OBJ = netapitest.o netlocalgroup.o netuser.o netgroup.o
netdisplay.o netshare.o netfile.o $(CMDLINE_OBJ)
bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(NETAPITEST_OBJ)
@echo Linking $@
diff --git a/source3/lib/netapi/tests/common.h
b/source3/lib/netapi/tests/common.h
index 5a32032..9320840 100644
--- a/source3/lib/netapi/tests/common.h
+++ b/source3/lib/netapi/tests/common.h
@@ -41,6 +41,8 @@ NET_API_STATUS netapitest_display(struct libnetapi_ctx *ctx,
const char *hostname);
NET_API_STATUS netapitest_share(struct libnetapi_ctx *ctx,
const char *hostname);
+NET_API_STATUS netapitest_file(struct libnetapi_ctx *ctx,
+ const char *hostname);
#ifndef ARRAY_SIZE
#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
diff --git a/source3/lib/netapi/tests/netapitest.c
b/source3/lib/netapi/tests/netapitest.c
index 8714402..4a38f72 100644
--- a/source3/lib/netapi/tests/netapitest.c
+++ b/source3/lib/netapi/tests/netapitest.c
@@ -84,6 +84,11 @@ int main(int argc, const char **argv)
goto out;
}
+ status = netapitest_file(ctx, hostname);
+ if (status) {
+ goto out;
+ }
+
out:
if (status != 0) {
printf("testsuite failed with: %s\n",
diff --git a/source3/lib/netapi/examples/file/file_enum.c
b/source3/lib/netapi/tests/netfile.c
similarity index 54%
copy from source3/lib/netapi/examples/file/file_enum.c
copy to source3/lib/netapi/tests/netfile.c
index 5fbb285..36ee828 100644
--- a/source3/lib/netapi/examples/file/file_enum.c
+++ b/source3/lib/netapi/tests/netfile.c
@@ -1,6 +1,6 @@
/*
* Unix SMB/CIFS implementation.
- * NetFileEnum query
+ * NetFile testsuite
* Copyright (C) Guenther Deschner 2008
*
* This program is free software; you can redistribute it and/or modify
@@ -27,72 +27,25 @@
#include "common.h"
-int main(int argc, const char **argv)
+static NET_API_STATUS test_netfileenum(const char *hostname,
+ uint32_t level)
{
NET_API_STATUS status;
- struct libnetapi_ctx *ctx = NULL;
- const char *hostname = NULL;
- const char *basepath = NULL;
- const char *username = NULL;
- uint32_t level = 3;
- uint8_t *buffer = NULL;
uint32_t entries_read = 0;
uint32_t total_entries = 0;
uint32_t resume_handle = 0;
+ uint8_t *buffer = NULL;
int i;
- struct FILE_INFO_2 *i2 = NULL;
- struct FILE_INFO_3 *i3 = NULL;
-
- poptContext pc;
- int opt;
-
- struct poptOption long_options[] = {
- POPT_AUTOHELP
- POPT_COMMON_LIBNETAPI_EXAMPLES
- POPT_TABLEEND
- };
-
- status = libnetapi_init(&ctx);
- if (status != 0) {
- return status;
- }
-
- pc = poptGetContext("file_enum", argc, argv, long_options, 0);
-
- poptSetOtherOptionHelp(pc, "hostname basepath username level");
- while((opt = poptGetNextOpt(pc)) != -1) {
- }
-
- if (!poptPeekArg(pc)) {
- poptPrintHelp(pc, stderr, 0);
- goto out;
- }
- hostname = poptGetArg(pc);
-
- if (!poptPeekArg(pc)) {
- poptPrintHelp(pc, stderr, 0);
- goto out;
- }
- basepath = poptGetArg(pc);
-
- if (!poptPeekArg(pc)) {
- poptPrintHelp(pc, stderr, 0);
- goto out;
- }
- username = poptGetArg(pc);
+ struct FILE_INFO_2 *i2;
+ struct FILE_INFO_3 *i3;
- if (poptPeekArg(pc)) {
- level = atoi(poptGetArg(pc));
- }
-
- /* NetFileEnum */
+ printf("testing NetFileEnum level %d\n", level);
do {
-
status = NetFileEnum(hostname,
- basepath,
- username,
+ NULL,
+ NULL,
level,
&buffer,
(uint32_t)-1,
@@ -100,7 +53,6 @@ int main(int argc, const char **argv)
&total_entries,
&resume_handle);
if (status == 0 || status == ERROR_MORE_DATA) {
- printf("total entries: %d\n", total_entries);
switch (level) {
case 2:
i2 = (struct FILE_INFO_2 *)buffer;
@@ -109,38 +61,83 @@ int main(int argc, const char **argv)
i3 = (struct FILE_INFO_3 *)buffer;
break;
default:
- break;
+ return -1;
}
+
for (i=0; i<entries_read; i++) {
+
+ switch (level) {
+ case 2:
+ case 3:
+ break;
+ default:
+ break;
+ }
+
switch (level) {
case 2:
- printf("file_id: %d\n",
i2->fi2_id);
i2++;
break;
case 3:
- printf("file_id: %d\n",
i3->fi3_id);
- printf("permissions: %d\n",
i3->fi3_permissions);
- printf("num_locks: %d\n",
i3->fi3_num_locks);
- printf("pathname: %s\n",
i3->fi3_pathname);
- printf("username: %s\n",
i3->fi3_username);
i3++;
break;
- default:
- break;
}
}
NetApiBufferFree(buffer);
}
} while (status == ERROR_MORE_DATA);
+ if (status) {
+ return status;
+ }
+
+ return 0;
+}
+
+NET_API_STATUS netapitest_file(struct libnetapi_ctx *ctx,
+ const char *hostname)
+{
+ NET_API_STATUS status = 0;
+ uint8_t *buffer = NULL;
+ uint32_t levels[] = { 2, 3 };
+ uint32_t enum_levels[] = { 2, 3 };
+ int i;
+
+ printf("NetFile tests\n");
+
+ /* test enum */
+
+ for (i=0; i<ARRAY_SIZE(enum_levels); i++) {
+
+ status = test_netfileenum(hostname, enum_levels[i]);
+ if (status) {
+ NETAPI_STATUS(ctx, status, "NetFileEnum");
+ goto out;
+ }
+ }
+
+ /* basic queries */
+#if 0
+ for (i=0; i<ARRAY_SIZE(levels); i++) {
+
+ printf("testing NetFileGetInfo level %d\n", levels[i]);
+
+ status = NetFileGetInfo(hostname, fid, levels[i], &buffer);
+ if (status && status != 124) {
+ NETAPI_STATUS(ctx, status, "NetFileGetInfo");
+ goto out;
+ }
+ }
+#endif
+
+ status = 0;
+
+ printf("NetFile tests succeeded\n");
+ out:
if (status != 0) {
- printf("NetFileEnum failed with: %s\n",
+ printf("NetFile testsuite failed with: %s\n",
libnetapi_get_error_string(ctx, status));
- goto out;
}
- out:
- libnetapi_free(ctx);
- poptFreeContext(pc);
return status;
}
diff --git a/source3/librpc/gen_ndr/libnetapi.h
b/source3/librpc/gen_ndr/libnetapi.h
index 98da9e1..ae7acbf 100644
--- a/source3/librpc/gen_ndr/libnetapi.h
+++ b/source3/librpc/gen_ndr/libnetapi.h
@@ -413,7 +413,9 @@ struct USER_INFO_X {
uint32_t usriX_code_page;
const char * usriX_profile;
const char * usriX_home_dir_drive;
+ uint32_t usriX_user_id;
uint32_t usriX_primary_group_id;
+ uint32_t usriX_password_expired;
};
struct GROUP_USERS_INFO_0 {
diff --git a/source3/librpc/gen_ndr/ndr_libnetapi.c
b/source3/librpc/gen_ndr/ndr_libnetapi.c
index a526682..d7bf63e 100644
--- a/source3/librpc/gen_ndr/ndr_libnetapi.c
+++ b/source3/librpc/gen_ndr/ndr_libnetapi.c
@@ -1895,7 +1895,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_USER_INFO_X(struct
ndr_push *ndr, int ndr_fl
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r->usriX_code_page));
NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->usriX_profile));
NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS,
r->usriX_home_dir_drive));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->usriX_user_id));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r->usriX_primary_group_id));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r->usriX_password_expired));
}
if (ndr_flags & NDR_BUFFERS) {
if (r->usriX_logon_hours) {
@@ -1942,7 +1944,9 @@ _PUBLIC_ enum ndr_err_code ndr_pull_USER_INFO_X(struct
ndr_pull *ndr, int ndr_fl
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->usriX_code_page));
NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->usriX_profile));
NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS,
&r->usriX_home_dir_drive));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->usriX_user_id));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->usriX_primary_group_id));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->usriX_password_expired));
}
if (ndr_flags & NDR_BUFFERS) {
if (r->usriX_logon_hours) {
@@ -1990,7 +1994,9 @@ _PUBLIC_ void ndr_print_USER_INFO_X(struct ndr_print
*ndr, const char *name, con
ndr_print_uint32(ndr, "usriX_code_page", r->usriX_code_page);
ndr_print_string(ndr, "usriX_profile", r->usriX_profile);
ndr_print_string(ndr, "usriX_home_dir_drive", r->usriX_home_dir_drive);
+ ndr_print_uint32(ndr, "usriX_user_id", r->usriX_user_id);
ndr_print_uint32(ndr, "usriX_primary_group_id",
r->usriX_primary_group_id);
+ ndr_print_uint32(ndr, "usriX_password_expired",
r->usriX_password_expired);
ndr->depth--;
}
diff --git a/source3/librpc/idl/libnetapi.idl b/source3/librpc/idl/libnetapi.idl
index 039dcf4..f2f4a16 100644
--- a/source3/librpc/idl/libnetapi.idl
+++ b/source3/librpc/idl/libnetapi.idl
@@ -517,7 +517,9 @@ interface libnetapi
uint32 usriX_code_page;
string usriX_profile;
string usriX_home_dir_drive;
+ uint32 usriX_user_id;
uint32 usriX_primary_group_id;
+ uint32 usriX_password_expired;
} USER_INFO_X;
[nopush,nopull] NET_API_STATUS NetUserAdd(
--
Samba Shared Repository
