summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-12-31 03:32:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:07:48 -0500
commit72ffef24060a36071ce26ff0c39dcf44d74c6551 (patch)
treede9e3b8280445915d992c7f856252af1171700af
parent09ee8ae1deec97bb1df3c1c77d73192e63df4538 (diff)
downloadsamba-72ffef24060a36071ce26ff0c39dcf44d74c6551.tar.gz
samba-72ffef24060a36071ce26ff0c39dcf44d74c6551.tar.bz2
samba-72ffef24060a36071ce26ff0c39dcf44d74c6551.zip
r4426: fix same names
metze (This used to be commit 18bbe40fe1e400546ff3750213f6c0505895e357)
-rw-r--r--source4/librpc/idl/wkssvc.idl24
-rw-r--r--source4/rpc_server/wkssvc/dcesrv_wkssvc.c26
2 files changed, 25 insertions, 25 deletions
diff --git a/source4/librpc/idl/wkssvc.idl b/source4/librpc/idl/wkssvc.idl
index a9153e6f88..578df3b3aa 100644
--- a/source4/librpc/idl/wkssvc.idl
+++ b/source4/librpc/idl/wkssvc.idl
@@ -18,27 +18,27 @@
typedef struct {
uint32 platform_id;
- unistr *server;
- unistr *domain;
- uint32 ver_major;
- uint32 ver_minor;
+ unistr *server_name;
+ unistr *domain_name;
+ uint32 version_major;
+ uint32 version_minor;
} wkssvc_NetWkstaInfo100;
typedef struct {
uint32 platform_id;
- unistr *server;
- unistr *domain;
- uint32 ver_major;
- uint32 ver_minor;
+ unistr *server_name;
+ unistr *domain_name;
+ uint32 version_major;
+ uint32 version_minor;
unistr *lan_root;
} wkssvc_NetWkstaInfo101;
typedef struct {
uint32 platform_id;
- unistr *server;
- unistr *domain;
- uint32 ver_major;
- uint32 ver_minor;
+ unistr *server_name;
+ unistr *domain_name;
+ uint32 version_major;
+ uint32 version_minor;
unistr *lan_root;
uint32 logged_on_users;
} wkssvc_NetWkstaInfo102;
diff --git a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
index 22b13cb873..82de29e44e 100644
--- a/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
+++ b/source4/rpc_server/wkssvc/dcesrv_wkssvc.c
@@ -46,12 +46,12 @@ static WERROR wkssvc_NetWkstaGetInfo(struct dcesrv_call_state *dce_call, TALLOC_
W_ERROR_HAVE_NO_MEMORY(info100);
info100->platform_id = dcesrv_common_get_platform_id(mem_ctx, dce_ctx);
- info100->server = dcesrv_common_get_server_name(mem_ctx, dce_ctx, NULL);
- W_ERROR_HAVE_NO_MEMORY(info100->server);
- info100->domain = dcesrv_common_get_domain_name(mem_ctx, dce_ctx);
- W_ERROR_HAVE_NO_MEMORY(info100->domain);
- info100->ver_major = dcesrv_common_get_version_major(mem_ctx, dce_ctx);
- info100->ver_minor = dcesrv_common_get_version_minor(mem_ctx, dce_ctx);
+ info100->server_name = dcesrv_common_get_server_name(mem_ctx, dce_ctx, NULL);
+ W_ERROR_HAVE_NO_MEMORY(info100->server_name);
+ info100->domain_name = dcesrv_common_get_domain_name(mem_ctx, dce_ctx);
+ W_ERROR_HAVE_NO_MEMORY(info100->domain_name);
+ info100->version_major = dcesrv_common_get_version_major(mem_ctx, dce_ctx);
+ info100->version_minor = dcesrv_common_get_version_minor(mem_ctx, dce_ctx);
r->out.info.info100 = info100;
return WERR_OK;
@@ -64,12 +64,12 @@ static WERROR wkssvc_NetWkstaGetInfo(struct dcesrv_call_state *dce_call, TALLOC_
W_ERROR_HAVE_NO_MEMORY(info101);
info101->platform_id = dcesrv_common_get_platform_id(mem_ctx, dce_ctx);
- info101->server = dcesrv_common_get_server_name(mem_ctx, dce_ctx, NULL);
- W_ERROR_HAVE_NO_MEMORY(info101->server);
- info101->domain = dcesrv_common_get_domain_name(mem_ctx, dce_ctx);
- W_ERROR_HAVE_NO_MEMORY(info101->domain);
- info101->ver_major = dcesrv_common_get_version_major(mem_ctx, dce_ctx);
- info101->ver_minor = dcesrv_common_get_version_minor(mem_ctx, dce_ctx);
+ info101->server_name = dcesrv_common_get_server_name(mem_ctx, dce_ctx, NULL);
+ W_ERROR_HAVE_NO_MEMORY(info101->server_name);
+ info101->domain_name = dcesrv_common_get_domain_name(mem_ctx, dce_ctx);
+ W_ERROR_HAVE_NO_MEMORY(info101->domain_name);
+ info101->version_major = dcesrv_common_get_version_major(mem_ctx, dce_ctx);
+ info101->version_minor = dcesrv_common_get_version_minor(mem_ctx, dce_ctx);
info101->lan_root = dcesrv_common_get_lan_root(mem_ctx, dce_ctx);
r->out.info.info101 = info101;
@@ -155,7 +155,7 @@ static WERROR wkssvc_NetWkstaTransportEnum(struct dcesrv_call_state *dce_call, T
return WERR_UNKNOWN_LEVEL;
}
- return WERR_OK;
+ return WERR_UNKNOWN_LEVEL;
}