auth: Allow the netbios name and domain to be set from winbindd in ntlm_auth3

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Feb 17 12:18:51 CET 2012 on sn-devel-104

diff --git a/auth/gensec/gensec.h b/auth/gensec/gensec.h
index aba1018a92b164e74aad3beab5ce2443b33d20a8..f88da2227d6d6717cbdc0c8632d39ed1dcf822fc 100644 (file)
--- a/auth/gensec/gensec.h
+++ b/auth/gensec/gensec.h
@@ -87,6 +87,8 @@ struct gensec_settings {
        /* To fill in our own name in the NTLMSSP server */
        const char *server_dns_domain;
        const char *server_dns_name;
+       const char *server_netbios_domain;
+       const char *server_netbios_name;
 };
 
 struct gensec_security_ops {

diff --git a/auth/ntlmssp/gensec_ntlmssp_server.c b/auth/ntlmssp/gensec_ntlmssp_server.c
index 6ba3976f7e50925202b0f6cc30b9b8caede22a10..8f45c2c6640e2560f38f1ed959af7544d619c574 100644 (file)
--- a/auth/ntlmssp/gensec_ntlmssp_server.c
+++ b/auth/ntlmssp/gensec_ntlmssp_server.c
@@ -343,8 +343,17 @@ NTSTATUS gensec_ntlmssp_server_start(struct gensec_security *gensec_security)
                ntlmssp_state->server.is_standalone = false;
        }
 
-       netbios_name = lpcfg_netbios_name(gensec_security->settings->lp_ctx);
-       netbios_domain = lpcfg_workgroup(gensec_security->settings->lp_ctx);
+       if (gensec_security->settings->server_netbios_name) {
+               netbios_name = gensec_security->settings->server_netbios_name;
+       } else {
+               netbios_name = lpcfg_netbios_name(gensec_security->settings->lp_ctx);
+       }
+
+       if (gensec_security->settings->server_netbios_domain) {
+               netbios_domain = gensec_security->settings->server_netbios_domain;
+       } else {
+               netbios_domain = lpcfg_workgroup(gensec_security->settings->lp_ctx);
+       }
 
        if (gensec_security->settings->server_dns_name) {
                dns_name = gensec_security->settings->server_dns_name;