Changeset 745 for trunk/server/source4/rpc_server/wkssvc

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/rpc_server/wkssvc/dcesrv_wkssvc.c (modified) (7 diffs)

trunk/server/source4/rpc_server/wkssvc/dcesrv_wkssvc.c

@@ -23 +23 @@
 #include "rpc_server/dcerpc_server.h"
 #include "librpc/gen_ndr/ndr_wkssvc.h"
+#include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "rpc_server/common/common.h"
+#include "rpc_server/common/share.h"
 #include "param/param.h"
 
@@ -33 +35 @@
 {
         struct dcesrv_context *dce_ctx = dce_call->conn->dce_ctx;
-        struct dcerpc_server_info *server_info = lp_dcerpc_server_info(mem_ctx, dce_ctx->lp_ctx);
-
-        ZERO_STRUCT(r->out);
-        r->out.info = talloc_zero(mem_ctx, union wkssvc_NetWkstaInfo);
-        W_ERROR_HAVE_NO_MEMORY(r->out.info);
+        struct dcerpc_server_info *server_info = lpcfg_dcerpc_server_info(mem_ctx, dce_ctx->lp_ctx);
 
         /* NOTE: win2k3 ignores r->in.server_name completly so we do --metze */
@@ -52 +50 @@
                 info100->server_name    = dcesrv_common_get_server_name(mem_ctx, dce_ctx, NULL);
                 W_ERROR_HAVE_NO_MEMORY(info100->server_name);
-                info100->domain_name    = talloc_reference(mem_ctx, server_info->domain_name);
-                W_ERROR_HAVE_NO_MEMORY(info100->domain_name);
+                info100->domain_name    = server_info->domain_name;
                 info100->version_major  = server_info->version_major;
                 info100->version_minor  = server_info->version_minor;
@@ -70 +67 @@
                 info101->server_name    = dcesrv_common_get_server_name(mem_ctx, dce_ctx, NULL);
                 W_ERROR_HAVE_NO_MEMORY(info101->server_name);
-                info101->domain_name    = talloc_reference(mem_ctx, server_info->domain_name);
-                W_ERROR_HAVE_NO_MEMORY(info101->domain_name);
+                info101->domain_name    = server_info->domain_name;
                 info101->version_major  = server_info->version_major;
                 info101->version_minor  = server_info->version_minor;
@@ -90 +86 @@
                 return WERR_UNKNOWN_LEVEL;
         }
-
-        return WERR_UNKNOWN_LEVEL;
 }
 
@@ -141 +135 @@
                        struct wkssvc_NetWkstaTransportEnum *r)
 {
-        r->out.total_entries = 0;
-        r->out.resume_handle = NULL;
-
         switch (r->in.info->level) {
         case 0:
-                r->out.info = talloc(mem_ctx, struct wkssvc_NetWkstaTransportInfo);
-                W_ERROR_HAVE_NO_MEMORY(r->out.info);
-                r->out.info->level = r->in.info->level;
                 r->out.info->ctr.ctr0 = talloc(mem_ctx, struct wkssvc_NetWkstaTransportCtr0);
                 W_ERROR_HAVE_NO_MEMORY(r->out.info->ctr.ctr0);
@@ -160 +148 @@
                 return WERR_UNKNOWN_LEVEL;
         }
-
-        return WERR_UNKNOWN_LEVEL;
 }