rpc: use symbolic constant to replace /root/ncalrpc_as_system

Modified to use constant AS_SYSTEM_MAGIC_PATH_TOKEN instead of string literal
"/root/ncalrpc_as_system"

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12865

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

diff --git a/auth/gensec/ncalrpc.c b/auth/gensec/ncalrpc.c
index f28a1c43b49f994748c638abe9ecd5473d213f7f..70b3bb5ea39d8cff84ac8f546a2d9b190a697f62 100644 (file)
--- a/auth/gensec/ncalrpc.c
+++ b/auth/gensec/ncalrpc.c
@@ -203,7 +203,7 @@ static NTSTATUS gensec_ncalrpc_update_internal(
                        return NT_STATUS_LOGON_FAILURE;
                }
 
-               cmp = strcmp(unix_path, "/root/ncalrpc_as_system");
+               cmp = strcmp(unix_path, AS_SYSTEM_MAGIC_PATH_TOKEN);
                TALLOC_FREE(unix_path);
                if (cmp != 0) {
                        state->step = GENSEC_NCALRPC_ERROR;

diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index 81cc6756891e73dc896b3bca3f4cf1aa97fbfddc..e15cd205cdc8b659e628aa27ca963aa776d51a47 100644 (file)
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -1044,7 +1044,7 @@ void dcerpc_ncacn_accept(struct tevent_context *ev_ctx,
                                        TALLOC_FREE(ncacn_conn->remote_client_addr);
 
                                        rc = tsocket_address_unix_from_path(ncacn_conn,
-                                                                           "/root/ncalrpc_as_system",
+                                                                           AS_SYSTEM_MAGIC_PATH_TOKEN,
                                                                            &ncacn_conn->remote_client_addr);
                                        if (rc < 0) {
                                                DEBUG(0, ("Out of memory building magic ncalrpc_as_system path!\n"));

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index de919e263ffece6c91e15ac34b7b7f23815828b6..ef02e324ca8f5472614ca95d567fa66377af0dab 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -2692,7 +2692,7 @@ static void dcesrv_sock_accept(struct stream_connection *srv_conn)
                        struct tsocket_address *r = NULL;
 
                        ret = tsocket_address_unix_from_path(dcesrv_conn,
-                                                            "/root/ncalrpc_as_system",
+                                                            AS_SYSTEM_MAGIC_PATH_TOKEN,
                                                             &r);
                        if (ret == -1) {
                                status = map_nt_error_from_unix_common(errno);