Some simple tweaks to the IDL to make it more correct ...

I am also concerned about the difference between NetShareEnum and
NetShareEnumAll. I would be interested to see a trace of NetShareEnumAll.

I also think we should stick to the names used in MSDN where possible, as
that makes it easier for people who are familiar with MSDN to help us get
this right.
(This used to be commit 580939e62e80a06b9a8ad974f6798c49dab4f78c)

diff --git a/source4/librpc/idl/srvsvc.idl b/source4/librpc/idl/srvsvc.idl
index 343e8edb93bf4cc0b8a87ffe7aa1e36b52deaae4..20e5c8958e216dc7aed4ae6f9ce1c4a5f5fda8de 100644 (file)
--- a/source4/librpc/idl/srvsvc.idl
+++ b/source4/librpc/idl/srvsvc.idl
@@ -348,15 +348,15 @@
 
        typedef struct {
                uint32 level;
-               uint32 level2;
                [switch_is(level)] srvsvc_NetShareSubCtr subctr;
        } srvsvc_NetShareCtr;
        
        WERROR srvsvc_NetShareEnumAll(
-               [in]   unistr *server_unc,
+               [in]       unistr *server_unc,
+               [in]       uint32 level,
                [in,out]   srvsvc_NetShareCtr ctr,
-               [in]   uint32 preferred_len,
-               [out]   uint32 total,
+               [in]       uint32 preferred_len,
+               [out]      uint32 totalentries,
                [in,out]   uint32 *resume_handle
                );
 
@@ -590,11 +590,15 @@
 
        /******************/
        /* Function: 0x24 */
+       /* Note, there must be some way to return entries read vs 
+          total entries ... */
        WERROR srvsvc_NetShareEnum(
-               [in]   unistr *server_unc,
+               [in]       unistr *server_unc,
+               [in]       uint32 level,
                [in,out]   srvsvc_NetShareCtr ctr,
-               [in]   uint32 preferred_len,
-               [out]   uint32 total,
+               [in]       uint32 preferred_len,
+               [out]      uint32 entriesread,  
+               [out]      uint32 totalentries,
                [in,out]   uint32 *resume_handle
                );