[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  1dbe970 librpc: fix buildwarning in NDR_WMI.
      from  68a8c58 s3: Add debug level 0 warnings to make_new_server_info_guest

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1dbe9706bc34c960fd2664508736b5a71d80433d
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jun 14 11:31:43 2011 +0200

    librpc: fix buildwarning in NDR_WMI.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed Jun 15 17:23:49 CEST 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 librpc/ndr/ndr_wmi.c                          |    1 +
 source4/lib/com/rot.c => librpc/ndr/ndr_wmi.h |   27 +++++++-----------------
 2 files changed, 9 insertions(+), 19 deletions(-)
 copy source4/lib/com/rot.c => librpc/ndr/ndr_wmi.h (61%)


Changeset truncated at 500 lines:

diff --git a/librpc/ndr/ndr_wmi.c b/librpc/ndr/ndr_wmi.c
index 87f3e96..4748888 100644
--- a/librpc/ndr/ndr_wmi.c
+++ b/librpc/ndr/ndr_wmi.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_dcom.h"
 #include "librpc/gen_ndr/ndr_wmi.h"
+#include "librpc/ndr/ndr_wmi.h"
 
 // Just for debugging
 int NDR_CHECK_depth = 0;
diff --git a/source4/lib/com/rot.c b/librpc/ndr/ndr_wmi.h
similarity index 61%
copy from source4/lib/com/rot.c
copy to librpc/ndr/ndr_wmi.h
index 0180a92..62d2c53 100644
--- a/source4/lib/com/rot.c
+++ b/librpc/ndr/ndr_wmi.h
@@ -1,35 +1,24 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
-   Running object table functions
+   routines for marshalling/unmarshalling DCOM string arrays
+
+   Copyright (C) Jelmer Vernooij 2004
 
-   Copyright (C) Jelmer Vernooij 2004-2005
-   
    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 2 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, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "includes.h"
-#include "lib/com/com.h"
-
-struct dcom_interface_p *dcom_get_local_iface_p(struct GUID *ipid)
-{
-	/* FIXME: Call the local ROT and do a 
-	 * rot_get_interface_pointer call */
-
-	/* FIXME: Perhaps have a local (thread-local) table with 
-	 * local DCOM objects so that not every DCOM call requires a lookup 
-	 * to the ROT? */
-	return NULL; 
-}
+enum ndr_err_code ndr_push_BSTR(struct ndr_push *ndr, int ndr_flags, const struct BSTR *r);
+enum ndr_err_code ndr_pull_BSTR(struct ndr_pull *ndr, int ndr_flags, struct BSTR *r);


-- 
Samba Shared Repository