diff options
| author | Andrew Tridgell <tridge@samba.org> | 2002-03-09 21:12:25 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2002-03-09 21:12:25 +0000 |
| commit | 391db465c6df87852f67dcc5daff55e5719196df (patch) | |
| tree | f3ec2e0d59c4f898a72d8a1eaf82d6ee76ad14e7 | |
| parent | e69f020d3dcba8e4dfdaba9b89ff834d43eb2afd (diff) | |
| download | samba-391db465c6df87852f67dcc5daff55e5719196df.tar.gz samba-391db465c6df87852f67dcc5daff55e5719196df.tar.bz2 samba-391db465c6df87852f67dcc5daff55e5719196df.zip | |
removed bogus prepend_domain() call which was screwing up getpwuid()
with the new default domain code
(This used to be commit 0f75b6bd5b42f745f17e2e6624d5d541a30ee897)
| -rw-r--r-- | source3/nsswitch/winbindd_cache.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c index 728d363682..999b5a5169 100644 --- a/source3/nsswitch/winbindd_cache.c +++ b/source3/nsswitch/winbindd_cache.c @@ -365,14 +365,6 @@ static void centry_end(struct cache_entry *centry, const char *format, ...) free(kstr); } -/* form a name with the domain part stuck on the front */ -static char *prepend_domain(struct winbindd_domain *domain, const char *name) -{ - static fstring s; - snprintf(s, sizeof(s), "%s%s%s", domain->name, lp_winbind_separator(), name); - return s; -} - /* form a sid from the domain plus rid */ static DOM_SID *form_sid(struct winbindd_domain *domain, uint32 rid) { @@ -487,12 +479,12 @@ do_query: if (cache->backend->consistent) { /* when the backend is consistent we can pre-prime some mappings */ wcache_save_name_to_sid(domain, NT_STATUS_OK, - prepend_domain(domain, (*info)[i].acct_name), + (*info)[i].acct_name, form_sid(domain, (*info)[i].user_rid), SID_NAME_USER); wcache_save_sid_to_name(domain, NT_STATUS_OK, form_sid(domain, (*info)[i].user_rid), - prepend_domain(domain, (*info)[i].acct_name), + (*info)[i].acct_name, SID_NAME_USER, (*info)[i].user_rid); wcache_save_user(domain, NT_STATUS_OK, &(*info)[i]); } |