9 files changed, 12 insertions, 8 deletions
diff --git a/source4/librpc/idl/atsvc.idl b/source4/librpc/idl/atsvc.idl
index e2e5d3e2c8..e9e56bfb6a 100644
--- a/source4/librpc/idl/atsvc.idl
+++ b/source4/librpc/idl/atsvc.idl
@@ -7,7 +7,8 @@
 [ uuid(1ff70682-0a51-30e8-076d-740be8cee98b),
   version(1.0),
   pointer_default(unique),
-  helpstring("Queue/List/Remove jobs for later execution")
+  helpstring("Queue/List/Remove jobs for later execution"),
+  endpoint("ncacn_np:[\\pipe\\atsvc]", "ncalrpc:")
 ] interface atsvc
 {
 	typedef struct {
diff --git a/source4/librpc/idl/browser.idl b/source4/librpc/idl/browser.idl
index 46011aa6a4..2d4784246d 100644
--- a/source4/librpc/idl/browser.idl
+++ b/source4/librpc/idl/browser.idl
@@ -1,7 +1,8 @@
 [ 
   uuid(6bffd098-a112-3610-9833-012892020162),
   version(0.0), 
-  helpstring("Browsing")
+  helpstring("Browsing"),
+  endpoint("lcalrpc:")
 ] 
 interface browser
 {
diff --git a/source4/librpc/idl/echo.idl b/source4/librpc/idl/echo.idl
index e54b3914f8..cfa6041208 100644
--- a/source4/librpc/idl/echo.idl
+++ b/source4/librpc/idl/echo.idl
@@ -3,7 +3,7 @@
 
 [
   uuid(60a15ec5-4de8-11d7-a637-005056a20182),
-  endpoint("ncacn_np:[\\pipe\\rpcecho]", "ncacn_ip_tcp:"),
+  endpoint("ncacn_np:[\\pipe\\rpcecho]", "ncacn_ip_tcp:", "ncalrpc:"),
   version(1.0),
   helpstring("Simple echo pipe")
 ]
diff --git a/source4/librpc/idl/epmapper.idl b/source4/librpc/idl/epmapper.idl
index e1e980b0fd..e0d79a0fe1 100644
--- a/source4/librpc/idl/epmapper.idl
+++ b/source4/librpc/idl/epmapper.idl
@@ -11,7 +11,8 @@ http://www.opengroup.org/onlinepubs/9629399/chap6.htm#tagcjh_11_02_03_01: bindin
 [
  uuid(e1af8308-5d1f-11c9-91a4-08002b14a0fa), 
  version(3.0), 
- endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]"),
+ endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", 
+		  "ncalrpc:[EPMAPPER]", "ncacn_unix_stream:[/tmp/epmapper]"),
  pointer_default(unique)
 ]
 interface epmapper
diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl
index ca1090545a..a404ebebff 100644
--- a/source4/librpc/idl/lsa.idl
+++ b/source4/librpc/idl/lsa.idl
@@ -6,7 +6,7 @@
 
 [ uuid(12345778-1234-abcd-ef00-0123456789ab),
   version(0.0),
-  endpoint("ncacn_np:[\\pipe\\lsarpc]","ncacn_np:[\\pipe\\lsass]","ncacn_ip_tcp:"),
+  endpoint("ncacn_np:[\\pipe\\lsarpc]","ncacn_np:[\\pipe\\lsass]", "ncacn_ip_tcp:"),
   pointer_default(unique),
   helpstring("Local Server Authentication(?)")
 ] interface lsarpc
diff --git a/source4/librpc/idl/oxidresolver.idl b/source4/librpc/idl/oxidresolver.idl
index 6354e7b380..5627c89f9e 100644
--- a/source4/librpc/idl/oxidresolver.idl
+++ b/source4/librpc/idl/oxidresolver.idl
@@ -15,7 +15,7 @@
 [ 
 	uuid(99fcfec4-5260-101b-bbcb-00aa0021347a),
 	helpstring("Object Exporter ID Resolver"),
-	endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]"),
+	endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", "ncalrpc:"),
 	pointer_default(unique)
 ]
 interface IOXIDResolver
diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index f40f71df3e..43880831f5 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -10,7 +10,7 @@
 
 [ uuid(12345778-1234-abcd-ef00-0123456789ac),
   version(1.0),
-  endpoint("ncacn_np:[\\pipe\\samr]","ncacn_ip_tcp:"),
+  endpoint("ncacn_np:[\\pipe\\samr]","ncacn_ip_tcp:", "ncalrpc:"),
   pointer_default(unique)
 ] interface samr
 {
diff --git a/source4/librpc/idl/svcctl.idl b/source4/librpc/idl/svcctl.idl
index 87b47fd6dd..7ea1fee116 100644
--- a/source4/librpc/idl/svcctl.idl
+++ b/source4/librpc/idl/svcctl.idl
@@ -7,6 +7,7 @@
 [ uuid(367abb81-9844-35f1-ad32-98f038001003),
   version(2.0),
   pointer_default(unique),
+  endpoint("ncacn_np:[\\pipe\\svcctl]", "ncalrpc:"),
   helpstring("Service Control")
 ] interface svcctl
 {
diff --git a/source4/librpc/idl/winreg.idl b/source4/librpc/idl/winreg.idl
index 1f7123f7f3..c90879f278 100644
--- a/source4/librpc/idl/winreg.idl
+++ b/source4/librpc/idl/winreg.idl
@@ -6,7 +6,7 @@
 
 [ uuid(338cd001-2244-31f1-aaaa-900038001003),
   version(1.0),
-  endpoint("ncacn_np:[\\pipe\\winreg]","ncacn_ip_tcp:"),
+  endpoint("ncacn_np:[\\pipe\\winreg]","ncacn_ip_tcp:","ncalrpc:"),
   pointer_default(unique),
   helpstring("Remote Registry Service")
 ] interface winreg