1575 untangle libmlrpc ... (smbsrv)

@@ -29,11 +29,11 @@
 
 /*
  * Security Accounts Manager RPC (SAMR) interface definition.
  */
 
-#include "ndrtypes.ndl"
+#include <libmlrpc/ndrtypes.ndl>
 
 /* Windows NT */
 #define SAMR_OPNUM_Connect                      0x00    /* SamrConnect */
 #define SAMR_OPNUM_CloseHandle                  0x01
 #define SAMR_OPNUM_SetSecObject                 0x02

@@ -361,11 +361,11 @@
  * and for the benefit of our client-side code.
  */
 #ifndef NDRGEN
 #define SAMR_USER_PWLEN 256
 struct samr_user_password {
-        smb_wchar_t     Buffer[SAMR_USER_PWLEN];
+        ndr_wchar_t     Buffer[SAMR_USER_PWLEN];
         DWORD Length;
 };
 #endif  /* NDRGEN */
 
 /* SAMPR_ENCRYPTED_USER_PASSWORD */