r4426: fix same names

metze
(This used to be commit 18bbe40fe1e400546ff3750213f6c0505895e357)

diff --git a/source4/librpc/idl/wkssvc.idl b/source4/librpc/idl/wkssvc.idl
index a9153e6f882157f97bdb560515c0f9e63554173e..578df3b3aa04973a4e362c28e52877751565681e 100644 (file)
--- a/source4/librpc/idl/wkssvc.idl
+++ b/source4/librpc/idl/wkssvc.idl
@@ -18,27 +18,27 @@
 
        typedef struct {
                uint32 platform_id;
 
        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;
        } 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 *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;
                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 22b13cb873097304bae0f6834a5d16ac5a45a4c2..82de29e44e3595073420ffbcafd249fd7899f759 100644 (file)
--- 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);
                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;
 
                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);
                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;
                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_UNKNOWN_LEVEL;
        }
 

-       return WERR_OK;
+       return WERR_UNKNOWN_LEVEL;

 }
 
 
 }