Print this page
1575 untangle libmlrpc ... (libmlrpc)

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libmlrpc/common/ndr.h
          +++ new/usr/src/lib/libmlrpc/common/ndr.h
↓ open down ↓ 32 lines elided ↑ open up ↑
  33   33   * and MSRPC NDR.  NDR is used to move parameters consisting of
  34   34   * complicated trees of data constructs between an RPC client and server.
  35   35   *
  36   36   * CAE Specification (1997)
  37   37   * DCE 1.1: Remote Procedure Call
  38   38   * Document Number: C706
  39   39   * The Open Group
  40   40   * ogspecs@opengroup.org
  41   41   */
  42   42  
  43      -#if defined(_KERNEL) || defined(_FAKE_KERNEL)
  44      -#error "not used in kernel code"
  45      -#else /* _KERNEL */
  46   43  #include <sys/types.h>
  47   44  #include <sys/uio.h>
  48      -#include <syslog.h>
  49   45  #include <stdlib.h>
  50   46  #include <string.h>
  51      -#include <smbsrv/wintypes.h>
  52      -#include <smbsrv/ndl/rpcpdu.ndl>
  53      -#include <smbsrv/string.h>
  54      -#endif  /* _KERNEL */
  55   47  
       48 +#include <smb/wintypes.h>
       49 +#include <libmlrpc/ndrtypes.ndl>
       50 +#include <libmlrpc/rpcpdu.ndl>
       51 +
  56   52  #ifdef __cplusplus
  57   53  extern "C" {
  58   54  #endif
  59   55  
  60   56  /*
  61   57   * Normal sequence:
  62   58   *      - Application calls client-side stub w/ TOP-MOST arg structure
  63   59   *      - client stub performs NDR_M_OP_MARSHALL+NDR_DIR_IN
  64   60   *      - PDU conveyed (request, aka call, aka query)
  65   61   *      - server stub performs NDR_M_OP_UNMARSHALL+NDR_DIR_IN
↓ open down ↓ 382 lines elided ↑ open up ↑
 448  444  int ndr_outer_string(ndr_ref_t *);
 449  445  int ndr_outer_peek_sizing(ndr_ref_t *, unsigned, unsigned long *);
 450  446  int ndr_outer_poke_sizing(ndr_ref_t *, unsigned, unsigned long *);
 451  447  int ndr_outer_align(ndr_ref_t *);
 452  448  int ndr_outer_grow(ndr_ref_t *, unsigned);
 453  449  int ndr_inner(ndr_ref_t *);
 454  450  int ndr_inner_pointer(ndr_ref_t *);
 455  451  int ndr_inner_reference(ndr_ref_t *);
 456  452  int ndr_inner_array(ndr_ref_t *);
 457  453  
 458      -size_t ndr_mbstowcs(struct ndr_stream *, smb_wchar_t *, const char *, size_t);
 459      -int ndr_mbtowc(struct ndr_stream *, smb_wchar_t *, const char *, size_t);
      454 +size_t ndr_mbstowcs(struct ndr_stream *, ndr_wchar_t *, const char *, size_t);
 460  455  
 461  456  void nds_bswap(void *src, void *dst, size_t len);
 462  457  
 463  458  #ifdef __cplusplus
 464  459  }
 465  460  #endif
 466  461  
 467  462  #endif /* _SMBSRV_NDR_H */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX