summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/rpc_server/samr/srv_samr_nt.c56
1 files changed, 12 insertions, 44 deletions
diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
index 475a204d55..3325f15ecb 100644
--- a/source3/rpc_server/samr/srv_samr_nt.c
+++ b/source3/rpc_server/samr/srv_samr_nt.c
@@ -1849,19 +1849,11 @@ NTSTATUS _samr_ChangePasswordUser2(struct pipes_struct *p,
return NT_STATUS_NO_MEMORY;
}
- rc = get_remote_hostname(p->remote_address,
- &rhost,
- talloc_tos());
- if (rc < 0) {
+ rhost = tsocket_address_inet_addr_string(p->remote_address,
+ talloc_tos());
+ if (rhost == NULL) {
return NT_STATUS_NO_MEMORY;
}
- if (strequal(rhost,"UNKNOWN")) {
- rhost = tsocket_address_inet_addr_string(p->remote_address,
- talloc_tos());
- if (rhost == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
- }
/*
* UNIX username case mangling not required, pass_oem_change
@@ -1928,19 +1920,11 @@ NTSTATUS _samr_OemChangePasswordUser2(struct pipes_struct *p,
return NT_STATUS_INVALID_PARAMETER;
}
- rc = get_remote_hostname(p->remote_address,
- &rhost,
- talloc_tos());
- if (rc < 0) {
+ rhost = tsocket_address_inet_addr_string(p->remote_address,
+ talloc_tos());
+ if (rhost == NULL) {
return NT_STATUS_NO_MEMORY;
}
- if (strequal(rhost,"UNKNOWN")) {
- rhost = tsocket_address_inet_addr_string(p->remote_address,
- talloc_tos());
- if (rhost == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
- }
status = pass_oem_change(user_name,
rhost,
@@ -1997,19 +1981,11 @@ NTSTATUS _samr_ChangePasswordUser3(struct pipes_struct *p,
return NT_STATUS_NO_MEMORY;
}
- rc = get_remote_hostname(p->remote_address,
- &rhost,
- talloc_tos());
- if (rc < 0) {
+ rhost = tsocket_address_inet_addr_string(p->remote_address,
+ talloc_tos());
+ if (rhost == NULL) {
return NT_STATUS_NO_MEMORY;
}
- if (strequal(rhost,"UNKNOWN")) {
- rhost = tsocket_address_inet_addr_string(p->remote_address,
- talloc_tos());
- if (rhost == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
- }
/*
* UNIX username case mangling not required, pass_oem_change
@@ -5137,19 +5113,11 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p,
return NT_STATUS_NO_SUCH_USER;
}
- rc = get_remote_hostname(p->remote_address,
- &rhost,
- talloc_tos());
- if (rc < 0) {
+ rhost = tsocket_address_inet_addr_string(p->remote_address,
+ talloc_tos());
+ if (rhost == NULL) {
return NT_STATUS_NO_MEMORY;
}
- if (strequal(rhost,"UNKNOWN")) {
- rhost = tsocket_address_inet_addr_string(p->remote_address,
- talloc_tos());
- if (rhost == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
- }
/* ================ BEGIN Privilege BLOCK ================ */