diff options
| author | Günther Deschner <gd@samba.org> | 2018-05-08 11:19:42 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2018-06-20 09:22:24 +0200 |
| commit | 35de20bd3c7f5f4e73dda5070da05b0d081c3090 (patch) | |
| tree | 2eac8982f6ae7c795c97963dca6ebd072124f1ba | |
| parent | c70a0d52afbfb600ce2c060379c66d3280b7d5fc (diff) | |
| download | samba-35de20bd3c7f5f4e73dda5070da05b0d081c3090.tar.gz | |
s3-winbindd: remove unused fill_domain_username()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13437
Guenther
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit b24d4eb7afad82afc3a9bab65e1d799edc4b5172)
| -rw-r--r-- | source3/winbindd/winbindd_proto.h | 1 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_util.c | 20 |
2 files changed, 0 insertions, 21 deletions
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index 95f24d2c279..85cd50b8ed7 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -485,7 +485,6 @@ bool canonicalize_username(fstring username_inout, fstring namespace, fstring domain, fstring user); -void fill_domain_username(fstring name, const char *domain, const char *user, bool can_assume); char *fill_domain_username_talloc(TALLOC_CTX *ctx, const char *domain, const char *user, diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index c2ec164e143..aa633419c9a 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -1650,26 +1650,6 @@ bool canonicalize_username(fstring username_inout, We always canonicalize as UPPERCASE DOMAIN, lowercase username. */ -void fill_domain_username(fstring name, const char *domain, const char *user, bool can_assume) -{ - fstring tmp_user; - - if (lp_server_role() == ROLE_ACTIVE_DIRECTORY_DC) { - can_assume = false; - } - - fstrcpy(tmp_user, user); - (void)strlower_m(tmp_user); - - if (can_assume && assume_domain(domain)) { - strlcpy(name, tmp_user, sizeof(fstring)); - } else { - slprintf(name, sizeof(fstring) - 1, "%s%c%s", - domain, *lp_winbind_separator(), - tmp_user); - } -} - /** * talloc version of fill_domain_username() * return NULL on talloc failure. |