From e9686985cbf1f5234d9e9731176b1eb4e02911e8 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Mon, 12 Oct 2009 19:09:18 +0200 Subject: s4: Changes the old occurences of "lp_realm" in "lp_dnsdomain" where needed For KERBEROS applications the realm should be upcase (function "lp_realm") but for DNS ones it should be used lowcase (function "lp_dnsdomain"). This patch implements the use of both in the right way. --- source4/ntptr/simple_ldb/ntptr_simple_ldb.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'source4/ntptr') diff --git a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c index 601f7902df..e179f52926 100644 --- a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c +++ b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c @@ -208,12 +208,14 @@ static WERROR sptr_GetPrintServerData(struct ntptr_GenericHandle *server, TALLOC r->out.data->binary = blob; return WERR_OK; } else if (strcmp("DNSMachineName", r->in.value_name) == 0) { - if (!lp_realm(server->ntptr->lp_ctx)) return WERR_INVALID_PARAM; + const char *dnsdomain = lp_dnsdomain(server->ntptr->lp_ctx); + + if (dnsdomain == NULL) return WERR_INVALID_PARAM; *r->out.type = REG_SZ; r->out.data->string = talloc_asprintf(mem_ctx, "%s.%s", - lp_netbios_name(server->ntptr->lp_ctx), - lp_realm(server->ntptr->lp_ctx)); + lp_netbios_name(server->ntptr->lp_ctx), + dnsdomain); W_ERROR_HAVE_NO_MEMORY(r->out.data->string); return WERR_OK; } -- cgit