sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

Add NetWkstaGetInfo.

Browse Source 
Modified to include common.h entry for netapitest_wksta function by Kai
Blin <kai@samba.org>

Signed-off-by: Hans Leidekker <hans@meelstraat.net>
Reviewed-by: Kai Blin <kai@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Oct 16 07:00:45 CEST 2013 on sn-devel-104
This commit is contained in:
Hans Leidekker 2013-10-14 20:43:27 +02:00 committed by Jeremy Allison
parent a1fcd71f9a
commit a4c3553b5a
10 changed files with 332 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
source3/lib/netapi/libnetapi.c
View File

@ -373,6 +373,53 @@ NET_API_STATUS NetServerSetInfo(const char * server_name /* [in] [unique] */,
return (NET_API_STATUS)r.out.result;
}
/****************************************************************
NetWkstaGetInfo
****************************************************************/
NET_API_STATUS NetWkstaGetInfo(const char * wksta_name /* [in] [unique] */,
uint32_t level /* [in] */,
uint8_t **buffer /* [out] [ref] */)
{
struct NetWkstaGetInfo r;
struct libnetapi_ctx *ctx = NULL;
NET_API_STATUS status;
WERROR werr;
TALLOC_CTX *frame = talloc_stackframe();
status = libnetapi_getctx(&ctx);
if (status != 0) {
TALLOC_FREE(frame);
return status;
}
/* In parameters */
r.in.server_name = wksta_name;
r.in.level = level;
/* Out parameters */
r.out.buffer = buffer;
if (DEBUGLEVEL >= 10) {
NDR_PRINT_IN_DEBUG(NetWkstaGetInfo, &r);
}
if (LIBNETAPI_LOCAL_SERVER(wksta_name)) {
werr = NetWkstaGetInfo_l(ctx, &r);
} else {
werr = NetWkstaGetInfo_r(ctx, &r);
}
r.out.result = W_ERROR_V(werr);
if (DEBUGLEVEL >= 10) {
NDR_PRINT_OUT_DEBUG(NetWkstaGetInfo, &r);
}
TALLOC_FREE(frame);
return (NET_API_STATUS)r.out.result;
}
/****************************************************************
NetGetDCName
****************************************************************/

7
source3/lib/netapi/libnetapi.h
View File

@ -78,6 +78,13 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
struct NetServerSetInfo *r);
WERROR NetServerSetInfo_l(struct libnetapi_ctx *ctx,
struct NetServerSetInfo *r);
NET_API_STATUS NetWkstaGetInfo(const char * wksta_name /* [in] [unique] */,
uint32_t level /* [in] */,
uint8_t **buffer /* [out] [ref] */);
WERROR NetWkstaGetInfo_r(struct libnetapi_ctx *ctx,
struct NetWkstaGetInfo *r);
WERROR NetWkstaGetInfo_l(struct libnetapi_ctx *ctx,
struct NetWkstaGetInfo *r);
NET_API_STATUS NetGetDCName(const char * server_name /* [in] [unique] */,
const char * domain_name /* [in] [unique] */,
uint8_t **buffer /* [out] [ref] */);

17
source3/lib/netapi/netapi.h
View File

@ -1615,6 +1615,23 @@ NET_API_STATUS NetServerSetInfo(const char * server_name /* [in] */,
uint8_t *buffer /* [in] [ref] */,
uint32_t *parm_error /* [out] [ref] */);
/************************************************************//**
*
* NetWkstaGetInfo
*
* @brief Get Information on a workstation
*
* @param[in] wksta_name The workstation name to connect to
* @param[in] level The level to define which information is requested
* @param[out] buffer The returned buffer carrying the WKSTA_INFO structure
* @return NET_API_STATUS
*
***************************************************************/
NET_API_STATUS NetWkstaGetInfo(const char * wksta_name /* [in] */,
uint32_t level /* [in] */,
uint8_t **buffer /* [out] [ref] */);
/************************************************************//**
*
* NetGetDCName

2
source3/lib/netapi/tests/common.h
View File

@ -49,6 +49,8 @@ NET_API_STATUS netapitest_file(struct libnetapi_ctx *ctx,
const char *hostname);
NET_API_STATUS netapitest_server(struct libnetapi_ctx *ctx,
const char *hostname);
NET_API_STATUS netapitest_wksta(struct libnetapi_ctx *ctx,
const char *hostname);
#ifndef ARRAY_SIZE
#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))

5
source3/lib/netapi/tests/netapitest.c
View File

@ -94,6 +94,11 @@ int main(int argc, const char **argv)
goto out;
}
status = netapitest_wksta(ctx, hostname);
if (status) {
goto out;
}
out:
if (status != 0) {
printf("testsuite failed with: %s\n",

62
source3/lib/netapi/tests/netwksta.c Normal file
View File

@ -0,0 +1,62 @@
/*
* Unix SMB/CIFS implementation.
* NetWorkstation testsuite
* Copyright (C) Guenther Deschner 2008
* Copyright (C) Hans Leidekker 2013
*
* 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"
NET_API_STATUS netapitest_wksta(struct libnetapi_ctx *ctx,
const char *hostname)
{
NET_API_STATUS status = 0;
uint32_t levels[] = { 100, 101, 102 };
int i;
printf("NetWorkstation tests\n");
/* basic queries */
for (i=0; i<ARRAY_SIZE(levels); i++) {
uint8_t *buffer = NULL;
printf("testing NetWkstaGetInfo level %d\n", levels[i]);
status = NetWkstaGetInfo(hostname, levels[i], &buffer);
if (status && status != 124) {
NETAPI_STATUS(ctx, status, "NetWkstaGetInfo");
goto out;
}
}
status = 0;
printf("NetWorkstation tests succeeded\n");
out:
if (status != 0) {
printf("NetWorkstation testsuite failed with: %s\n",
libnetapi_get_error_string(ctx, status));
}
return status;
}

2
source3/lib/netapi/tests/wscript_build
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python
bld.SAMBA_BINARY('netapitest',
source='netapitest.c netlocalgroup.c netuser.c netgroup.c netdisplay.c netshare.c netfile.c netserver.c common.c',
source='netapitest.c netlocalgroup.c netuser.c netgroup.c netdisplay.c netshare.c netfile.c netserver.c netwksta.c common.c',
deps='netapi popt',
install=False)

153
source3/lib/netapi/wkstainfo.c Normal file
View File

@ -0,0 +1,153 @@
/*
* Unix SMB/CIFS implementation.
* NetApi Workstation Support
* Copyright (C) Guenther Deschner 2007
* Copyright (C) Hans Leidekker 2013
*
* 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 "includes.h"
#include "librpc/gen_ndr/libnetapi.h"
#include "lib/netapi/netapi.h"
#include "lib/netapi/netapi_private.h"
#include "lib/netapi/libnetapi.h"
#include "../librpc/gen_ndr/ndr_wkssvc_c.h"
#include "lib/smbconf/smbconf.h"
#include "lib/smbconf/smbconf_reg.h"
/****************************************************************
****************************************************************/
WERROR NetWkstaGetInfo_l(struct libnetapi_ctx *ctx,
struct NetWkstaGetInfo *r)
{
LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, NetWkstaGetInfo);
}
/****************************************************************
****************************************************************/
static NTSTATUS map_wksta_info_to_WKSTA_INFO_buffer(TALLOC_CTX *mem_ctx,
uint32_t level,
union wkssvc_NetWkstaInfo *i,
uint8_t **buffer)
{
struct WKSTA_INFO_100 i100;
struct WKSTA_INFO_101 i101;
struct WKSTA_INFO_102 i102;
uint32_t num_info = 0;
switch (level) {
case 100:
i100.wki100_platform_id = i->info100->platform_id;
i100.wki100_computername = talloc_strdup(mem_ctx, i->info100->server_name);
i100.wki100_langroup = talloc_strdup(mem_ctx, i->info100->domain_name);
i100.wki100_ver_major = i->info100->version_major;
i100.wki100_ver_minor = i->info100->version_minor;
ADD_TO_ARRAY(mem_ctx, struct WKSTA_INFO_100, i100,
(struct WKSTA_INFO_100 **)buffer,
&num_info);
break;
case 101:
i101.wki101_platform_id = i->info101->platform_id;
i101.wki101_computername = talloc_strdup(mem_ctx, i->info101->server_name);
i101.wki101_langroup = talloc_strdup(mem_ctx, i->info101->domain_name);
i101.wki101_ver_major = i->info101->version_major;
i101.wki101_ver_minor = i->info101->version_minor;
i101.wki101_lanroot = talloc_strdup(mem_ctx, i->info101->lan_root);
ADD_TO_ARRAY(mem_ctx, struct WKSTA_INFO_101, i101,
(struct WKSTA_INFO_101 **)buffer,
&num_info);
break;
case 102:
i102.wki102_platform_id = i->info102->platform_id;
i102.wki102_computername = talloc_strdup(mem_ctx, i->info102->server_name);
i102.wki102_langroup = talloc_strdup(mem_ctx, i->info102->domain_name);
i102.wki102_ver_major = i->info102->version_major;
i102.wki102_ver_minor = i->info102->version_minor;
i102.wki102_lanroot = talloc_strdup(mem_ctx, i->info102->lan_root);
ADD_TO_ARRAY(mem_ctx, struct WKSTA_INFO_102, i102,
(struct WKSTA_INFO_102 **)buffer,
&num_info);
break;
default:
return NT_STATUS_NOT_SUPPORTED;
}
return NT_STATUS_OK;
}
/****************************************************************
****************************************************************/
WERROR NetWkstaGetInfo_r(struct libnetapi_ctx *ctx,
struct NetWkstaGetInfo *r)
{
NTSTATUS status;
WERROR werr;
union wkssvc_NetWkstaInfo info;
struct dcerpc_binding_handle *b;
if (!r->out.buffer) {
return WERR_INVALID_PARAM;
}
switch (r->in.level) {
case 100:
case 101:
case 102:
break;
default:
return WERR_UNKNOWN_LEVEL;
}
werr = libnetapi_get_binding_handle(ctx, r->in.server_name,
&ndr_table_wkssvc,
&b);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
status = dcerpc_wkssvc_NetWkstaGetInfo(b, talloc_tos(),
r->in.server_name,
r->in.level,
&info,
&werr);
if (!NT_STATUS_IS_OK(status)) {
werr = ntstatus_to_werror(status);
goto done;
}
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
status = map_wksta_info_to_WKSTA_INFO_buffer(ctx, r->in.level, &info,
r->out.buffer);
if (!NT_STATUS_IS_OK(status)) {
werr = ntstatus_to_werror(status);
goto done;
}
done:
return werr;
}

37
source3/librpc/idl/libnetapi.idl
View File

@ -776,6 +776,43 @@ interface libnetapi
[out] uint32 *parm_error
);
/*******************************************/
/* NetWkstaGetInfo */
/*******************************************/
[public] typedef struct {
uint32 wki100_platform_id;
string wki100_computername;
string wki100_langroup;
uint32 wki100_ver_major;
uint32 wki100_ver_minor;
} WKSTA_INFO_100;
[public] typedef struct {
uint32 wki101_platform_id;
string wki101_computername;
string wki101_langroup;
uint32 wki101_ver_major;
uint32 wki101_ver_minor;
string wki101_lanroot;
} WKSTA_INFO_101;
[public] typedef struct {
uint32 wki102_platform_id;
string wki102_computername;
string wki102_langroup;
uint32 wki102_ver_major;
uint32 wki102_ver_minor;
string wki102_lanroot;
uint32 wki102_logged_on_users;
} WKSTA_INFO_102;
[nopush,nopull] NET_API_STATUS NetWkstaGetInfo(
[in,unique] string *server_name,
[in] uint32 level,
[out] uint8 **buffer
);
/*******************************************/
/* NetGetDCName */
/*******************************************/

1
source3/wscript_build
View File

@ -27,6 +27,7 @@ bld.SAMBA3_LIBRARY('netapi',
lib/netapi/libnetapi.c
lib/netapi/joindomain.c
lib/netapi/serverinfo.c
lib/netapi/wkstainfo.c
lib/netapi/getdc.c
lib/netapi/user.c
lib/netapi/group.c