1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-14 01:57:53 +03:00

Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel

This commit is contained in:
Andrew Bartlett 2008-09-22 14:23:40 -07:00
commit b18449dbd5
8 changed files with 162 additions and 1 deletions

@ -95,6 +95,7 @@ int main(int argc, const char **argv)
case 1:
case 2:
case 3:
break;
case 1001:
u1001.usrmod1001_min_passwd_len = 0;
buffer = (uint8_t *)&u1001;

@ -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/netapitest@EXEEXT@: $(BINARY_PREREQS) $(NETAPITEST_OBJ)
@echo Linking $@

@ -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]))

@ -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",

@ -0,0 +1,143 @@
/*
* Unix SMB/CIFS implementation.
* NetFile 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_netfileenum(const char *hostname,
uint32_t level)
{
NET_API_STATUS status;
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;
struct FILE_INFO_3 *i3;
printf("testing NetFileEnum level %d\n", level);
do {
status = NetFileEnum(hostname,
NULL,
NULL,
level,
&buffer,
(uint32_t)-1,
&entries_read,
&total_entries,
&resume_handle);
if (status == 0 || status == ERROR_MORE_DATA) {
switch (level) {
case 2:
i2 = (struct FILE_INFO_2 *)buffer;
break;
case 3:
i3 = (struct FILE_INFO_3 *)buffer;
break;
default:
return -1;
}
for (i=0; i<entries_read; i++) {
switch (level) {
case 2:
case 3:
break;
default:
break;
}
switch (level) {
case 2:
i2++;
break;
case 3:
i3++;
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("NetFile testsuite failed with: %s\n",
libnetapi_get_error_string(ctx, status));
}
return status;
}

@ -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 {

@ -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--;
}

@ -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(