svn commit: samba r4426 - in branches/SAMBA_4_0/source: librpc/idl rpc_server/wkssvc

[metze at samba.org]

Author: metze
Date: 2004-12-31 03:32:36 +0000 (Fri, 31 Dec 2004)
New Revision: 4426

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4426

Log:
fix same names

metze

Modified:
   branches/SAMBA_4_0/source/librpc/idl/wkssvc.idl
   branches/SAMBA_4_0/source/rpc_server/wkssvc/dcesrv_wkssvc.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/wkssvc.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/wkssvc.idl	2004-12-31 02:48:11 UTC (rev 4425)
+++ branches/SAMBA_4_0/source/librpc/idl/wkssvc.idl	2004-12-31 03:32:36 UTC (rev 4426)
@@ -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;

Modified: branches/SAMBA_4_0/source/rpc_server/wkssvc/dcesrv_wkssvc.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/wkssvc/dcesrv_wkssvc.c	2004-12-31 02:48:11 UTC (rev 4425)
+++ branches/SAMBA_4_0/source/rpc_server/wkssvc/dcesrv_wkssvc.c	2004-12-31 03:32:36 UTC (rev 4426)
@@ -46,12 +46,12 @@
 		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 @@
 		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 @@
 		return WERR_UNKNOWN_LEVEL;
 	}
 
-	return WERR_OK;
+	return WERR_UNKNOWN_LEVEL;
 }