summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/error.c2
-rw-r--r--source3/smbd/lanman.c2
-rw-r--r--source3/smbd/negprot.c2
-rw-r--r--source3/smbd/reply.c6
4 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index 92a7c11b15..2f993fb41e 100644
--- a/source3/smbd/error.c
+++ b/source3/smbd/error.c
@@ -107,7 +107,7 @@ int error_packet(char *outbuf,NTSTATUS ntstatus,
file, line,
(int)CVAL(outbuf,smb_com),
smb_fn_name(CVAL(outbuf,smb_com)),
- get_nt_error_msg(ntstatus)));
+ nt_errstr(ntstatus)));
return outsize;
}
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index a218a04962..666bbb5f61 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -1632,7 +1632,7 @@ static BOOL api_RNetShareEnum(connection_struct *conn,uint16 vuid, char *param,c
*rdata = REALLOC(*rdata,*rdata_len);
memset(*rdata,0,*rdata_len);
- p2 = (*rdata) + fixed_len; /* auxillery data (strings) will go here */
+ p2 = (*rdata) + fixed_len; /* auxiliary data (strings) will go here */
p = *rdata;
f_len = fixed_len;
s_len = string_len;
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index f4ed360845..18682e6c9f 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -41,7 +41,7 @@ static void get_challenge(char buff[8])
DEBUG(10, ("get challenge: creating negprot_global_auth_context\n"));
if (!NT_STATUS_IS_OK(nt_status = make_auth_context_subsystem(&negprot_global_auth_context))) {
- DEBUG(0, ("make_auth_context_subsystem returned %s", get_nt_error_msg(nt_status)));
+ DEBUG(0, ("make_auth_context_subsystem returned %s", nt_errstr(nt_status)));
smb_panic("cannot make_negprot_global_auth_context!\n");
}
DEBUG(10, ("get challenge: getting challenge\n"));
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index e72b6a7319..1b7db5f0a7 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3120,7 +3120,7 @@ directory = %s, newname = %s, newname_last_component = %s, is_8_3 = %d\n",
}
error = map_nt_error_from_unix(errno);
DEBUG(3,("rename_internals: Error %s rename %s -> %s\n",
- get_nt_error_msg(error), directory,newname));
+ nt_errstr(error), directory,newname));
return error;
}
@@ -3129,7 +3129,7 @@ directory = %s, newname = %s, newname_last_component = %s, is_8_3 = %d\n",
if (!NT_STATUS_IS_OK(error)) {
DEBUG(3,("rename_internals: Error %s rename %s -> %s\n",
- get_nt_error_msg(error), directory,newname));
+ nt_errstr(error), directory,newname));
return error;
}
@@ -3161,7 +3161,7 @@ directory = %s, newname = %s, newname_last_component = %s, is_8_3 = %d\n",
error = map_nt_error_from_unix(errno);
DEBUG(3,("rename_internals: Error %s rename %s -> %s\n",
- get_nt_error_msg(error), directory,newname));
+ nt_errstr(error), directory,newname));
return error;
} else {