Print this page
1575 untangle libmlrpc from SMB server
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
        
*** 38,60 ****
   * Document Number: C706
   * The Open Group
   * ogspecs@opengroup.org
   */
  
- #if defined(_KERNEL) || defined(_FAKE_KERNEL)
- #error "not used in kernel code"
- #else /* _KERNEL */
  #include <sys/types.h>
  #include <sys/uio.h>
- #include <syslog.h>
  #include <stdlib.h>
  #include <string.h>
- #include <smbsrv/wintypes.h>
- #include <smbsrv/ndl/rpcpdu.ndl>
- #include <smbsrv/string.h>
- #endif  /* _KERNEL */
  
  #ifdef __cplusplus
  extern "C" {
  #endif
  
  /*
--- 38,56 ----
   * Document Number: C706
   * The Open Group
   * ogspecs@opengroup.org
   */
  
  #include <sys/types.h>
  #include <sys/uio.h>
  #include <stdlib.h>
  #include <string.h>
  
+ #include <smb/wintypes.h>
+ #include <libmlrpc/ndrtypes.ndl>
+ #include <libmlrpc/rpcpdu.ndl>
+ 
  #ifdef __cplusplus
  extern "C" {
  #endif
  
  /*
*** 453,464 ****
  int ndr_inner(ndr_ref_t *);
  int ndr_inner_pointer(ndr_ref_t *);
  int ndr_inner_reference(ndr_ref_t *);
  int ndr_inner_array(ndr_ref_t *);
  
! size_t ndr_mbstowcs(struct ndr_stream *, smb_wchar_t *, const char *, size_t);
! int ndr_mbtowc(struct ndr_stream *, smb_wchar_t *, const char *, size_t);
  
  void nds_bswap(void *src, void *dst, size_t len);
  
  #ifdef __cplusplus
  }
--- 449,459 ----
  int ndr_inner(ndr_ref_t *);
  int ndr_inner_pointer(ndr_ref_t *);
  int ndr_inner_reference(ndr_ref_t *);
  int ndr_inner_array(ndr_ref_t *);
  
! size_t ndr_mbstowcs(struct ndr_stream *, ndr_wchar_t *, const char *, size_t);
  
  void nds_bswap(void *src, void *dst, size_t len);
  
  #ifdef __cplusplus
  }