diff options
| author | Ivo De Decker <ivo.dedecker@ugent.be> | 2013-05-10 13:33:02 +0200 |
|---|---|---|
| committer | Ivo De Decker <ivo.dedecker@ugent.be> | 2013-05-10 13:33:02 +0200 |
| commit | 31202ad025bcdeb2585d18dc3f4641b5cf9c0ec4 (patch) | |
| tree | 32c20d66684ac97b86e55495146e9a676bfae85a /source3/auth/server_info_sam.c | |
| parent | 2865eba17fddda6c49f1209ca92d539111e7ff93 (diff) | |
| download | samba-31202ad025bcdeb2585d18dc3f4641b5cf9c0ec4.tar.gz | |
Imported Upstream version 4.0.0+dfsg1upstream/4.0.0+dfsg1
Diffstat (limited to 'source3/auth/server_info_sam.c')
| -rw-r--r-- | source3/auth/server_info_sam.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source3/auth/server_info_sam.c b/source3/auth/server_info_sam.c index 31fd9f9926..5d657f90c8 100644 --- a/source3/auth/server_info_sam.c +++ b/source3/auth/server_info_sam.c @@ -49,7 +49,7 @@ static bool is_our_machine_account(const char *username) return false; } truncname[ulen-1] = '\0'; - ret = strequal(truncname, global_myname()); + ret = strequal(truncname, lp_netbios_name()); SAFE_FREE(truncname); return ret; } @@ -77,7 +77,7 @@ NTSTATUS make_server_info_sam(struct auth_serversupplied_info **server_info, return NT_STATUS_NO_SUCH_USER; } - status = samu_to_SamInfo3(result, sampass, global_myname(), + status = samu_to_SamInfo3(result, sampass, lp_netbios_name(), &result->info3, &result->extra); if (!NT_STATUS_IS_OK(status)) { TALLOC_FREE(result); @@ -92,13 +92,6 @@ NTSTATUS make_server_info_sam(struct auth_serversupplied_info **server_info, TALLOC_FREE(pwd); - result->sanitized_username = sanitize_username(result, - result->unix_name); - if (result->sanitized_username == NULL) { - TALLOC_FREE(result); - return NT_STATUS_NO_MEMORY; - } - if (IS_DC && is_our_machine_account(username)) { /* * This is a hack of monstrous proportions. |