Merge commit 'release-4-0-0alpha15' into master4-tmp

[kai/samba-autobuild/.git] / source3 / librpc / rpc / dcerpc_ep.c

diff --git a/source3/librpc/rpc/dcerpc_ep.c b/source3/librpc/rpc/dcerpc_ep.c
index 1fce63acd212105cb1696827153155c9e0e67788..3d1acbbee223e74fc5b6e95763a7d4a6fada82e3 100644 (file)
--- a/source3/librpc/rpc/dcerpc_ep.c
+++ b/source3/librpc/rpc/dcerpc_ep.c
@@ -22,6 +22,8 @@
 #include "librpc/rpc/dcerpc_ep.h"
 #include "../librpc/gen_ndr/ndr_epmapper_c.h"
 #include "rpc_client/cli_pipe.h"
+#include "auth.h"
+#include "rpc_server/rpc_ncacn_np.h"
 
 #define EPM_MAX_ANNOTATION_SIZE 64
 
@@ -76,7 +78,7 @@ NTSTATUS dcerpc_binding_vector_create(TALLOC_CTX *mem_ctx,
 
                switch (b->transport) {
                        case NCACN_NP:
-                               b->host = talloc_asprintf(b, "\\\\%s", global_myname());
+                               b->host = talloc_asprintf(b, "\\\\%s", lp_netbios_name());
                                if (b->host == NULL) {
                                        status = NT_STATUS_NO_MEMORY;
                                        goto done;
@@ -167,7 +169,7 @@ static NTSTATUS ep_register(TALLOC_CTX *mem_ctx,
                                           "rpc_server", "epmapper",
                                           "none");
 
-       if (StrCaseCmp(rpcsrv_type, "embedded") == 0) {
+       if (strcasecmp_m(rpcsrv_type, "embedded") == 0) {
                static struct client_address client_id;
 
                strlcpy(client_id.addr, "localhost", sizeof(client_id.addr));
@@ -184,7 +186,7 @@ static NTSTATUS ep_register(TALLOC_CTX *mem_ctx,
                                  "epmapper (%s)", nt_errstr(status)));
                        goto done;
                }
-       } else if (StrCaseCmp(rpcsrv_type, "daemon") == 0) {
+       } else if (strcasecmp_m(rpcsrv_type, "daemon") == 0) {
                /* Connect to the endpoint mapper locally */
                ncalrpc_sock = talloc_asprintf(tmp_ctx,
                                              "%s/%s",