r11573: Adding Andrew Bartlett's patch to make machine account

logons work if the client gives the MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT
or MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT flags. This changes
the auth module interface to 2 (from 1). The effect of this is
that clients can access resources as a machine account if they
set these flags. This is the same as Windows (think of a VPN
where the vpn client authenticates itself to a VPN server
using machine account credentials - the vpn server checks
that the machine password was valid by performing a machine
account check with the PDC in the same was as it would a
user account check. I may add in a restriction (parameter)
to allow this behaviour to be turned off (as it was previously).
That may be on by default.
Andrew Bartlett please review this change carefully.
Jeremy.
(This used to be commit d1caef866326346fb191f8129d13d98379f18cd8)

3 files changed, 23 insertions, 18 deletions

diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c
index 6436346668..45195fb86a 100644
--- a/source3/nsswitch/wbinfo.c
+++ b/source3/nsswitch/wbinfo.c
@@ -630,6 +630,8 @@ static BOOL wbinfo_auth_crap(char *username)
 		
 	parse_wbinfo_domain_user(username, name_domain, name_user);
 
+	request.data.auth_crap.logon_parameters = MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT | MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT;
+
 	fstrcpy(request.data.auth_crap.user, name_user);
 
 	fstrcpy(request.data.auth_crap.domain, 
diff --git a/source3/nsswitch/winbindd_nss.h b/source3/nsswitch/winbindd_nss.h
index c851ca7480..eda68ae5c7 100644
--- a/source3/nsswitch/winbindd_nss.h
+++ b/source3/nsswitch/winbindd_nss.h
@@ -202,6 +202,7 @@ struct winbindd_request {
 		} auth;              /* pam_winbind auth module */
                 struct {
                         unsigned char chal[8];
+			uint32 logon_parameters;
                         fstring user;
                         fstring domain;
                         fstring lm_resp;
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index c2324291a6..3571142c58 100644
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/nsswitch/winbindd_pam.c
@@ -343,15 +343,16 @@ enum winbindd_result winbindd_dual_pam_auth(struct winbindd_domain *domain,
 		}
 
 		result = rpccli_netlogon_sam_network_logon(netlogon_pipe,
-							state->mem_ctx,
-							contact_domain->dcname, /* server name */
-							name_user,              /* user name */
-							name_domain,            /* target domain */
-							global_myname(),        /* workstation */
-							chal,
-							lm_resp,
-							nt_resp,
-							&info3);
+							   state->mem_ctx,
+							   0,
+							   contact_domain->dcname, /* server name */
+							   name_user,              /* user name */
+							   name_domain,            /* target domain */
+							   global_myname(),        /* workstation */
+							   chal,
+							   lm_resp,
+							   nt_resp,
+							   &info3);
 		attempts += 1;
 
 		/* We have to try a second time as cm_connect_netlogon
@@ -624,15 +625,16 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain,
 		}
 
 		result = rpccli_netlogon_sam_network_logon(netlogon_pipe,
-							state->mem_ctx,
-							contact_domain->dcname,
-							name_user,
-							name_domain, 
-							global_myname(),
-							state->request.data.auth_crap.chal,
-							lm_resp,
-							nt_resp,
-							&info3);
+							   state->mem_ctx,
+							   state->request.data.auth_crap.logon_parameters,
+							   contact_domain->dcname,
+							   name_user,
+							   name_domain, 
+							   global_myname(),
+							   state->request.data.auth_crap.chal,
+							   lm_resp,
+							   nt_resp,
+							   &info3);
 
 		attempts += 1;