smbdes: convert des_crypt112_16 to use gnutls
[samba.git] / source3 / rpc_server / netlogon / srv_netlog_nt.c
index 4f66dfe0de55911beea0ea7f7f39a583a01641e4..124bae950640cd68db0f3f38c90b95fa0850fb65 100644 (file)
 #include "../librpc/gen_ndr/ndr_lsa_c.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "rpc_client/init_lsa.h"
+#include "rpc_client/init_samr.h"
 #include "rpc_server/rpc_ncacn_np.h"
 #include "../libcli/security/security.h"
 #include "../libcli/security/dom_sid.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
-#include "lib/crypto/arcfour.h"
 #include "lib/crypto/md4.h"
 #include "nsswitch/libwbclient/wbclient.h"
 #include "../libcli/registry/util_reg.h"
@@ -46,6 +46,7 @@
 #include "messages.h"
 #include "../lib/tsocket/tsocket.h"
 #include "lib/param/param.h"
+#include "libsmb/dsgetdcname.h"
 
 extern userdom_struct current_user_info;
 
@@ -72,7 +73,20 @@ WERROR _netr_LogonControl(struct pipes_struct *p,
        case 2:
                return WERR_NOT_SUPPORTED;
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
+       }
+
+       switch (r->in.function_code) {
+       case NETLOGON_CONTROL_QUERY:
+       case NETLOGON_CONTROL_REPLICATE:
+       case NETLOGON_CONTROL_SYNCHRONIZE:
+       case NETLOGON_CONTROL_PDC_REPLICATE:
+       case NETLOGON_CONTROL_BREAKPOINT:
+       case NETLOGON_CONTROL_BACKUP_CHANGE_LOG:
+       case NETLOGON_CONTROL_TRUNCATE_LOG:
+               break;
+       default:
+               return WERR_NOT_SUPPORTED;
        }
 
        l.in.logon_server       = r->in.logon_server;
@@ -184,7 +198,6 @@ WERROR _netr_LogonControl2Ex(struct pipes_struct *p,
        struct netr_NETLOGON_INFO_3 *info3;
        struct netr_NETLOGON_INFO_4 *info4;
        const char *fn;
-       uint32_t acct_ctrl;
        NTSTATUS status;
        struct netr_DsRGetDCNameInfo *dc_info;
 
@@ -199,30 +212,44 @@ WERROR _netr_LogonControl2Ex(struct pipes_struct *p,
                fn = "_netr_LogonControl2Ex";
                break;
        default:
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
-       acct_ctrl = p->session_info->info->acct_flags;
+       switch (r->in.level) {
+       case 1:
+       case 2:
+       case 3:
+       case 4:
+               break;
+       default:
+               return WERR_INVALID_LEVEL;
+       }
 
        switch (r->in.function_code) {
-       case NETLOGON_CONTROL_TC_VERIFY:
-       case NETLOGON_CONTROL_CHANGE_PASSWORD:
-       case NETLOGON_CONTROL_REDISCOVER:
+       case NETLOGON_CONTROL_QUERY:
+               break;
+       default:
                if ((geteuid() != sec_initial_uid()) &&
                    !nt_token_check_domain_rid(p->session_info->security_token, DOMAIN_RID_ADMINS) &&
-                   !nt_token_check_sid(&global_sid_Builtin_Administrators, p->session_info->security_token) &&
-                   !(acct_ctrl & (ACB_WSTRUST | ACB_SVRTRUST))) {
+                   !nt_token_check_sid(&global_sid_Builtin_Administrators, p->session_info->security_token))
+               {
                        return WERR_ACCESS_DENIED;
                }
                break;
-       default:
-               break;
        }
 
        tc_status = WERR_NO_SUCH_DOMAIN;
 
        switch (r->in.function_code) {
        case NETLOGON_CONTROL_QUERY:
+               switch (r->in.level) {
+               case 1:
+               case 3:
+                       break;
+               default:
+                       return WERR_INVALID_PARAMETER;
+               }
+
                tc_status = WERR_OK;
                break;
        case NETLOGON_CONTROL_REPLICATE:
@@ -230,26 +257,12 @@ WERROR _netr_LogonControl2Ex(struct pipes_struct *p,
        case NETLOGON_CONTROL_PDC_REPLICATE:
        case NETLOGON_CONTROL_BACKUP_CHANGE_LOG:
        case NETLOGON_CONTROL_BREAKPOINT:
-               if (acct_ctrl & ACB_NORMAL) {
-                       return WERR_NOT_SUPPORTED;
-               } else if (acct_ctrl & (ACB_WSTRUST | ACB_SVRTRUST)) {
-                       return WERR_ACCESS_DENIED;
-               } else {
-                       return WERR_ACCESS_DENIED;
-               }
        case NETLOGON_CONTROL_TRUNCATE_LOG:
-               if (acct_ctrl & ACB_NORMAL) {
-                       break;
-               } else if (acct_ctrl & (ACB_WSTRUST | ACB_SVRTRUST)) {
-                       return WERR_ACCESS_DENIED;
-               } else {
-                       return WERR_ACCESS_DENIED;
-               }
-
        case NETLOGON_CONTROL_TRANSPORT_NOTIFY:
        case NETLOGON_CONTROL_FORCE_DNS_REG:
        case NETLOGON_CONTROL_QUERY_DNS_REG:
                return WERR_NOT_SUPPORTED;
+
        case NETLOGON_CONTROL_FIND_USER:
                if (!r->in.data || !r->in.data->user) {
                        return WERR_NOT_SUPPORTED;
@@ -287,7 +300,7 @@ WERROR _netr_LogonControl2Ex(struct pipes_struct *p,
 
                dc_name = talloc_asprintf(p->mem_ctx, "\\\\%s", dc_name2);
                if (!dc_name) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
                tc_status = WERR_OK;
@@ -315,7 +328,7 @@ WERROR _netr_LogonControl2Ex(struct pipes_struct *p,
 
                dc_name = talloc_asprintf(p->mem_ctx, "\\\\%s", dc_info->dc_unc);
                if (!dc_name) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
                tc_status = WERR_OK;
@@ -336,7 +349,7 @@ WERROR _netr_LogonControl2Ex(struct pipes_struct *p,
                /* no idea what this should be */
                DEBUG(0,("%s: unimplemented function level [%d]\n",
                        fn, r->in.function_code));
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_NOT_SUPPORTED;
        }
 
        /* prepare the response */
@@ -381,7 +394,7 @@ WERROR _netr_LogonControl2Ex(struct pipes_struct *p,
                r->out.query->info4 = info4;
                break;
        default:
-               return WERR_UNKNOWN_LEVEL;
+               return WERR_INVALID_LEVEL;
        }
 
        return WERR_OK;
@@ -397,7 +410,7 @@ NTSTATUS _netr_NetrEnumerateTrustedDomains(struct pipes_struct *p,
        NTSTATUS status;
        NTSTATUS result = NT_STATUS_OK;
        DATA_BLOB blob;
-       int num_domains = 0;
+       size_t num_domains = 0;
        const char **trusted_domains = NULL;
        struct lsa_DomainList domain_list;
        struct dcerpc_binding_handle *h = NULL;
@@ -406,11 +419,13 @@ NTSTATUS _netr_NetrEnumerateTrustedDomains(struct pipes_struct *p,
        int i;
        uint32_t max_size = (uint32_t)-1;
 
+       ZERO_STRUCT(pol);
        DEBUG(6,("_netr_NetrEnumerateTrustedDomains: %d\n", __LINE__));
 
        status = rpcint_binding_handle(p->mem_ctx,
                                       &ndr_table_lsarpc,
                                       p->remote_address,
+                                      p->local_address,
                                       p->session_info,
                                       p->msg_ctx,
                                       &h);
@@ -580,7 +595,7 @@ static NTSTATUS samr_find_machine_account(TALLOC_CTX *mem_ctx,
                status = NT_STATUS_NO_SUCH_USER;
                goto out;
        }
-       if (rids.count != types.count) {
+       if (types.count != 1) {
                status = NT_STATUS_INVALID_PARAMETER;
                goto out;
        }
@@ -691,6 +706,7 @@ static NTSTATUS get_md4pw(struct samr_Password *md4pw, const char *mach_acct,
        status = rpcint_binding_handle(mem_ctx,
                                       &ndr_table_samr,
                                       local,
+                                      NULL,
                                       session_info,
                                       msg_ctx,
                                       &h);
@@ -698,12 +714,10 @@ static NTSTATUS get_md4pw(struct samr_Password *md4pw, const char *mach_acct,
                goto out;
        }
 
-       become_root();
        status = samr_find_machine_account(mem_ctx, h, mach_acct,
                                           SEC_FLAG_MAXIMUM_ALLOWED,
                                           &domain_sid, &user_rid,
                                           &user_handle);
-       unbecome_root();
        if (!NT_STATUS_IS_OK(status)) {
                goto out;
        }
@@ -913,7 +927,7 @@ NTSTATUS _netr_ServerAuthenticate3(struct pipes_struct *p,
                srv_flgs |= NETLOGON_NEG_SUPPORTS_AES;
        }
 
-       if (lp_server_schannel() != false) {
+       if (in_neg_flags & NETLOGON_NEG_SCHANNEL) {
                srv_flgs |= NETLOGON_NEG_SCHANNEL;
        }
 
@@ -954,17 +968,6 @@ NTSTATUS _netr_ServerAuthenticate3(struct pipes_struct *p,
                goto out;
        }
 
-       if ( (lp_server_schannel() == true) &&
-            ((in_neg_flags & NETLOGON_NEG_SCHANNEL) == 0) ) {
-
-               /* schannel must be used, but client did not offer it. */
-               DEBUG(0,("%s: schannel required but client failed "
-                       "to offer it. Client was %s\n",
-                       fn, r->in.account_name));
-               status = NT_STATUS_ACCESS_DENIED;
-               goto out;
-       }
-
        status = get_md4pw(&mach_pwd,
                           r->in.account_name,
                           r->in.secure_channel_type,
@@ -1020,6 +1023,7 @@ NTSTATUS _netr_ServerAuthenticate3(struct pipes_struct *p,
        talloc_unlink(p->mem_ctx, lp_ctx);
 
        if (!NT_STATUS_IS_OK(status)) {
+               ZERO_STRUCTP(r->out.return_credentials);
                goto out;
        }
 
@@ -1057,36 +1061,6 @@ NTSTATUS _netr_ServerAuthenticate2(struct pipes_struct *p,
        return _netr_ServerAuthenticate3(p, &a);
 }
 
-/*************************************************************************
- * If schannel is required for this call test that it actually is available.
- *************************************************************************/
-static NTSTATUS schannel_check_required(struct pipe_auth_data *auth_info,
-                                       const char *computer_name,
-                                       bool integrity, bool privacy)
-{
-       if (auth_info && auth_info->auth_type == DCERPC_AUTH_TYPE_SCHANNEL) {
-               if (!privacy && !integrity) {
-                       return NT_STATUS_OK;
-               }
-
-               if ((!privacy && integrity) &&
-                   auth_info->auth_level == DCERPC_AUTH_LEVEL_INTEGRITY) {
-                       return NT_STATUS_OK;
-               }
-
-               if ((privacy || integrity) &&
-                   auth_info->auth_level == DCERPC_AUTH_LEVEL_PRIVACY) {
-                       return NT_STATUS_OK;
-               }
-       }
-
-       /* test didn't pass */
-       DEBUG(0, ("schannel_check_required: [%s] is not using schannel\n",
-                 computer_name));
-
-       return NT_STATUS_ACCESS_DENIED;
-}
-
 /*************************************************************************
  *************************************************************************/
 
@@ -1101,12 +1075,15 @@ static NTSTATUS netr_creds_server_step_check(struct pipes_struct *p,
        bool schannel_global_required = (lp_server_schannel() == true) ? true:false;
        struct loadparm_context *lp_ctx;
 
+       if (creds_out != NULL) {
+               *creds_out = NULL;
+       }
+
        if (schannel_global_required) {
-               status = schannel_check_required(&p->auth,
-                                                computer_name,
-                                                false, false);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
+               if (p->auth.auth_type != DCERPC_AUTH_TYPE_SCHANNEL) {
+                       DBG_ERR("[%s] is not using schannel\n",
+                               computer_name);
+                       return NT_STATUS_ACCESS_DENIED;
                }
        }
 
@@ -1123,14 +1100,27 @@ static NTSTATUS netr_creds_server_step_check(struct pipes_struct *p,
        return status;
 }
 
+
 /*************************************************************************
  *************************************************************************/
 
+struct _samr_Credentials_t {
+       enum {
+               CRED_TYPE_NT_HASH,
+               CRED_TYPE_PLAIN_TEXT,
+       } cred_type;
+       union {
+               struct samr_Password *nt_hash;
+               const char *password;
+       } creds;
+};
+
+
 static NTSTATUS netr_set_machine_account_password(TALLOC_CTX *mem_ctx,
                                                  struct auth_session_info *session_info,
                                                  struct messaging_context *msg_ctx,
                                                  const char *account_name,
-                                                 struct samr_Password *nt_hash)
+                                                 struct _samr_Credentials_t *cr)
 {
        NTSTATUS status;
        NTSTATUS result = NT_STATUS_OK;
@@ -1140,9 +1130,12 @@ static NTSTATUS netr_set_machine_account_password(TALLOC_CTX *mem_ctx,
        uint32_t acct_ctrl;
        union samr_UserInfo *info;
        struct samr_UserInfo18 info18;
+       struct samr_UserInfo26 info26;
        DATA_BLOB in,out;
        int rc;
        DATA_BLOB session_key;
+       enum samr_UserInfoLevel infolevel;
+       TALLOC_CTX *frame = talloc_stackframe();
 
        ZERO_STRUCT(user_handle);
 
@@ -1153,7 +1146,7 @@ static NTSTATUS netr_set_machine_account_password(TALLOC_CTX *mem_ctx,
                goto out;
        }
 
-       rc = tsocket_address_inet_from_strings(mem_ctx,
+       rc = tsocket_address_inet_from_strings(frame,
                                               "ip",
                                               "127.0.0.1",
                                               0,
@@ -1163,9 +1156,10 @@ static NTSTATUS netr_set_machine_account_password(TALLOC_CTX *mem_ctx,
                goto out;
        }
 
-       status = rpcint_binding_handle(mem_ctx,
+       status = rpcint_binding_handle(frame,
                                       &ndr_table_samr,
                                       local,
+                                      NULL,
                                       session_info,
                                       msg_ctx,
                                       &h);
@@ -1174,7 +1168,7 @@ static NTSTATUS netr_set_machine_account_password(TALLOC_CTX *mem_ctx,
        }
 
        become_root();
-       status = samr_find_machine_account(mem_ctx,
+       status = samr_find_machine_account(frame,
                                           h,
                                           account_name,
                                           SEC_FLAG_MAXIMUM_ALLOWED,
@@ -1187,7 +1181,7 @@ static NTSTATUS netr_set_machine_account_password(TALLOC_CTX *mem_ctx,
        }
 
        status = dcerpc_samr_QueryUserInfo2(h,
-                                           mem_ctx,
+                                           frame,
                                            &user_handle,
                                            UserControlInformation,
                                            &info,
@@ -1214,22 +1208,51 @@ static NTSTATUS netr_set_machine_account_password(TALLOC_CTX *mem_ctx,
                goto out;
        }
 
-       ZERO_STRUCT(info18);
+       switch(cr->cred_type) {
+               case CRED_TYPE_NT_HASH:
+                       ZERO_STRUCT(info18);
+
+                       infolevel = UserInternal1Information;
+
+                       in = data_blob_const(cr->creds.nt_hash, 16);
+                       out = data_blob_talloc_zero(frame, 16);
+                       if (out.data == NULL) {
+                               status = NT_STATUS_NO_MEMORY;
+                               goto out;
+                       }
+                       sess_crypt_blob(&out, &in, &session_key, true);
+                       memcpy(info18.nt_pwd.hash, out.data, out.length);
+
+                       info18.nt_pwd_active = true;
 
-       in = data_blob_const(nt_hash->hash, 16);
-       out = data_blob_talloc_zero(mem_ctx, 16);
-       sess_crypt_blob(&out, &in, &session_key, true);
-       memcpy(info18.nt_pwd.hash, out.data, out.length);
+                       info->info18 = info18;
+               break;
+               case CRED_TYPE_PLAIN_TEXT:
+                       ZERO_STRUCT(info26);
 
-       info18.nt_pwd_active = true;
+                       infolevel = UserInternal5InformationNew;
 
-       info->info18 = info18;
+                       status = init_samr_CryptPasswordEx(cr->creds.password,
+                                                          &session_key,
+                                                          &info26.password);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               goto out;
+                       }
+
+                       info26.password_expired = PASS_DONT_CHANGE_AT_NEXT_LOGON;
+                       info->info26 = info26;
+               break;
+               default:
+                       status = NT_STATUS_INTERNAL_ERROR;
+                       goto out;
+               break;
+       }
 
        become_root();
        status = dcerpc_samr_SetUserInfo2(h,
-                                         mem_ctx,
+                                         frame,
                                          &user_handle,
-                                         UserInternal1Information,
+                                         infolevel,
                                          info,
                                          &result);
        unbecome_root();
@@ -1243,8 +1266,9 @@ static NTSTATUS netr_set_machine_account_password(TALLOC_CTX *mem_ctx,
 
  out:
        if (h && is_valid_policy_hnd(&user_handle)) {
-               dcerpc_samr_Close(h, mem_ctx, &user_handle, &result);
+               dcerpc_samr_Close(h, frame, &user_handle, &result);
        }
+       TALLOC_FREE(frame);
 
        return status;
 }
@@ -1258,7 +1282,8 @@ NTSTATUS _netr_ServerPasswordSet(struct pipes_struct *p,
 {
        NTSTATUS status = NT_STATUS_OK;
        int i;
-       struct netlogon_creds_CredentialState *creds;
+       struct netlogon_creds_CredentialState *creds = NULL;
+       struct _samr_Credentials_t cr = { CRED_TYPE_NT_HASH, {0}};
 
        DEBUG(5,("_netr_ServerPasswordSet: %d\n", __LINE__));
 
@@ -1271,9 +1296,14 @@ NTSTATUS _netr_ServerPasswordSet(struct pipes_struct *p,
        unbecome_root();
 
        if (!NT_STATUS_IS_OK(status)) {
+               const char *computer_name = "<unknown>";
+
+               if (creds != NULL && creds->computer_name != NULL) {
+                       computer_name = creds->computer_name;
+               }
                DEBUG(2,("_netr_ServerPasswordSet: netlogon_creds_server_step failed. Rejecting auth "
                        "request from client %s machine account %s\n",
-                       r->in.computer_name, creds->computer_name));
+                       r->in.computer_name, computer_name));
                TALLOC_FREE(creds);
                return status;
        }
@@ -1281,18 +1311,22 @@ NTSTATUS _netr_ServerPasswordSet(struct pipes_struct *p,
        DEBUG(3,("_netr_ServerPasswordSet: Server Password Set by remote machine:[%s] on account [%s]\n",
                        r->in.computer_name, creds->computer_name));
 
-       netlogon_creds_des_decrypt(creds, r->in.new_password);
+       status = netlogon_creds_des_decrypt(creds, r->in.new_password);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
        DEBUG(100,("_netr_ServerPasswordSet: new given value was :\n"));
        for(i = 0; i < sizeof(r->in.new_password->hash); i++)
                DEBUG(100,("%02X ", r->in.new_password->hash[i]));
        DEBUG(100,("\n"));
 
+       cr.creds.nt_hash = r->in.new_password;
        status = netr_set_machine_account_password(p->mem_ctx,
                                                   p->session_info,
                                                   p->msg_ctx,
                                                   creds->account_name,
-                                                  r->in.new_password);
+                                                  &cr);
        return status;
 }
 
@@ -1307,7 +1341,7 @@ NTSTATUS _netr_ServerPasswordSet2(struct pipes_struct *p,
        struct netlogon_creds_CredentialState *creds = NULL;
        DATA_BLOB plaintext;
        struct samr_CryptPassword password_buf;
-       struct samr_Password nt_hash;
+       struct _samr_Credentials_t cr = { CRED_TYPE_PLAIN_TEXT, {0}};
 
        become_root();
        status = netr_creds_server_step_check(p, p->mem_ctx,
@@ -1330,27 +1364,43 @@ NTSTATUS _netr_ServerPasswordSet2(struct pipes_struct *p,
                return status;
        }
 
+       DEBUG(3,("_netr_ServerPasswordSet2: Server Password Seti2 by remote "
+                "machine:[%s] on account [%s]\n",
+                r->in.computer_name, creds->computer_name));
+
        memcpy(password_buf.data, r->in.new_password->data, 512);
        SIVAL(password_buf.data, 512, r->in.new_password->length);
 
        if (creds->negotiate_flags & NETLOGON_NEG_SUPPORTS_AES) {
-               netlogon_creds_aes_decrypt(creds, password_buf.data, 516);
+               status = netlogon_creds_aes_decrypt(creds,
+                                                   password_buf.data,
+                                                   516);
        } else {
-               netlogon_creds_arcfour_crypt(creds, password_buf.data, 516);
+               status = netlogon_creds_arcfour_crypt(creds,
+                                                     password_buf.data,
+                                                     516);
+       }
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       if (!extract_pw_from_buffer(p->mem_ctx, password_buf.data, &plaintext)) {
+       if (!decode_pw_buffer(p->mem_ctx,
+                             password_buf.data,
+                             (char**) &plaintext.data,
+                             &plaintext.length,
+                             CH_UTF16)) {
+               DEBUG(2,("_netr_ServerPasswordSet2: unable to extract password "
+                        "from a buffer. Rejecting auth request as a wrong password\n"));
                TALLOC_FREE(creds);
                return NT_STATUS_WRONG_PASSWORD;
        }
 
-       mdfour(nt_hash.hash, plaintext.data, plaintext.length);
-
+       cr.creds.password = (const char*) plaintext.data;
        status = netr_set_machine_account_password(p->mem_ctx,
                                                   p->session_info,
                                                   p->msg_ctx,
                                                   creds->account_name,
-                                                  &nt_hash);
+                                                  &cr);
        TALLOC_FREE(creds);
        return status;
 }
@@ -1490,7 +1540,7 @@ static NTSTATUS _netr_LogonSamLogon_base(struct pipes_struct *p,
                        return NT_STATUS_INTERNAL_ERROR;
        }
 
-       *r->out.authoritative = true; /* authoritative response */
+       *r->out.authoritative = 1; /* authoritative response */
 
        switch (r->in.validation_level) {
        case 2:
@@ -1554,22 +1604,30 @@ static NTSTATUS _netr_LogonSamLogon_base(struct pipes_struct *p,
        DEBUG(5,("Attempting validation level %d for unmapped username %s.\n",
                r->in.validation_level, nt_username));
 
-       status = NT_STATUS_OK;
+       status = netlogon_creds_decrypt_samlogon_logon(creds,
+                                                      r->in.logon_level,
+                                                      logon);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
-       netlogon_creds_decrypt_samlogon_logon(creds,
-                                             r->in.logon_level,
-                                             logon);
+       status = make_auth3_context_for_netlogon(talloc_tos(), &auth_context);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
        switch (r->in.logon_level) {
        case NetlogonNetworkInformation:
        case NetlogonNetworkTransitiveInformation:
        {
                const char *wksname = nt_workstation;
+               const char *workgroup = lp_workgroup();
+               bool ok;
 
-               status = make_auth_context_fixed(talloc_tos(), &auth_context,
-                                                logon->network->challenge);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
+               ok = auth3_context_set_challenge(
+                       auth_context, logon->network->challenge, "fixed");
+               if (!ok) {
+                       return NT_STATUS_NO_MEMORY;
                }
 
                /* For a network logon, the workstation name comes in with two
@@ -1579,10 +1637,12 @@ static NTSTATUS _netr_LogonSamLogon_base(struct pipes_struct *p,
                if (*wksname == '\\') wksname++;
 
                /* Standard challenge/response authentication */
-               if (!make_user_info_netlogon_network(&user_info,
+               if (!make_user_info_netlogon_network(talloc_tos(),
+                                                    &user_info,
                                                     nt_username, nt_domain,
                                                     wksname,
                                                     p->remote_address,
+                                                    p->local_address,
                                                     logon->network->identity_info.parameter_control,
                                                     logon->network->lm.data,
                                                     logon->network->lm.length,
@@ -1590,6 +1650,14 @@ static NTSTATUS _netr_LogonSamLogon_base(struct pipes_struct *p,
                                                     logon->network->nt.length)) {
                        status = NT_STATUS_NO_MEMORY;
                }
+
+               if (NT_STATUS_IS_OK(status)) {
+                       status = NTLMv2_RESPONSE_verify_netlogon_creds(
+                                               user_info->client.account_name,
+                                               user_info->client.domain_name,
+                                               user_info->password.response.nt,
+                                               creds, workgroup);
+               }
                break;
        }
        case NetlogonInteractiveInformation:
@@ -1621,18 +1689,15 @@ static NTSTATUS _netr_LogonSamLogon_base(struct pipes_struct *p,
                DEBUG(100,("decrypt of nt owf password:"));
                dump_data(100, logon->password->ntpassword.hash, 16);
 #endif
-               status = make_auth_context_subsystem(talloc_tos(),
-                                                    &auth_context);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
-               }
 
                auth_get_ntlm_challenge(auth_context, chal);
 
-               if (!make_user_info_netlogon_interactive(&user_info,
+               if (!make_user_info_netlogon_interactive(talloc_tos(),
+                                                        &user_info,
                                                         nt_username, nt_domain,
                                                         nt_workstation,
                                                         p->remote_address,
+                                                        p->local_address,
                                                         logon->password->identity_info.parameter_control,
                                                         chal,
                                                         logon->password->lmpassword.hash,
@@ -1647,12 +1712,15 @@ static NTSTATUS _netr_LogonSamLogon_base(struct pipes_struct *p,
        } /* end switch */
 
        if ( NT_STATUS_IS_OK(status) ) {
-               status = auth_check_ntlm_password(auth_context,
-                       user_info, &server_info);
+               status = auth_check_ntlm_password(p->mem_ctx,
+                                                 auth_context,
+                                                 user_info,
+                                                 &server_info,
+                                                 r->out.authoritative);
        }
 
        TALLOC_FREE(auth_context);
-       free_user_info(&user_info);
+       TALLOC_FREE(user_info);
 
        DEBUG(5,("%s: check_password returned status %s\n",
                  fn, nt_errstr(status)));
@@ -1660,15 +1728,6 @@ static NTSTATUS _netr_LogonSamLogon_base(struct pipes_struct *p,
        /* Check account and password */
 
        if (!NT_STATUS_IS_OK(status)) {
-               /* If we don't know what this domain is, we need to
-                  indicate that we are not authoritative.  This
-                  allows the client to decide if it needs to try
-                  a local user.  Fix by jpjanosi@us.ibm.com, #2976 */
-                if ( NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_USER)
-                    && !strequal(nt_domain, get_global_sam_name())
-                    && !is_trusted_domain(nt_domain) )
-                       *r->out.authoritative = false; /* We are not authoritative */
-
                TALLOC_FREE(server_info);
                return status;
        }
@@ -1695,6 +1754,14 @@ static NTSTATUS _netr_LogonSamLogon_base(struct pipes_struct *p,
                                                r->out.validation->sam3);
                break;
        case 6:
+               /* Only allow this if the pipe is protected. */
+               if (p->auth.auth_level < DCERPC_AUTH_LEVEL_PRIVACY) {
+                       DEBUG(0,("netr_Validation6: client %s not using privacy for netlogon\n",
+                               get_remote_machine_name()));
+                       status = NT_STATUS_INVALID_PARAMETER;
+                       break;
+               }
+
                status = serverinfo_to_SamInfo6(server_info,
                                                r->out.validation->sam6);
                break;
@@ -1706,10 +1773,11 @@ static NTSTATUS _netr_LogonSamLogon_base(struct pipes_struct *p,
                return status;
        }
 
-       netlogon_creds_encrypt_samlogon_validation(creds,
-                                                  r->in.validation_level,
-                                                  r->out.validation);
-       return NT_STATUS_OK;
+       status = netlogon_creds_encrypt_samlogon_validation(creds,
+                                                           r->in.validation_level,
+                                                           r->out.validation);
+
+       return status;
 }
 
 /****************************************************************
@@ -1947,7 +2015,7 @@ static bool wb_getdcname(TALLOC_CTX *mem_ctx,
        *dcname = talloc_strdup(mem_ctx, dc_info->dc_name);
        wbcFreeMemory(dc_info);
        if (!*dcname) {
-               *werr = WERR_NOMEM;
+               *werr = WERR_NOT_ENOUGH_MEMORY;
                return false;
        }
 
@@ -1996,7 +2064,7 @@ WERROR _netr_GetDcName(struct pipes_struct *p,
        *r->out.dcname = talloc_strdup(p->mem_ctx, info->dc_unc);
        talloc_free(info);
        if (!*r->out.dcname) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        return WERR_OK;
@@ -2041,7 +2109,7 @@ WERROR _netr_GetAnyDCName(struct pipes_struct *p,
        *r->out.dcname = talloc_strdup(p->mem_ctx, info->dc_unc);
        talloc_free(info);
        if (!*r->out.dcname) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        return WERR_OK;
@@ -2179,21 +2247,21 @@ NTSTATUS _netr_LogonGetDomainInfo(struct pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-WERROR _netr_ServerPasswordGet(struct pipes_struct *p,
-                              struct netr_ServerPasswordGet *r)
+NTSTATUS _netr_ServerPasswordGet(struct pipes_struct *p,
+                                struct netr_ServerPasswordGet *r)
 {
        p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
-       return WERR_NOT_SUPPORTED;
+       return NT_STATUS_NOT_SUPPORTED;
 }
 
 /****************************************************************
 ****************************************************************/
 
-WERROR _netr_NETRLOGONSENDTOSAM(struct pipes_struct *p,
-                               struct netr_NETRLOGONSENDTOSAM *r)
+NTSTATUS _netr_NetrLogonSendToSam(struct pipes_struct *p,
+                               struct netr_NetrLogonSendToSam *r)
 {
        p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
-       return WERR_NOT_SUPPORTED;
+       return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 /****************************************************************
@@ -2405,19 +2473,19 @@ WERROR _netr_DsRGetForestTrustInformation(struct pipes_struct *p,
                info_ptr = talloc(p->mem_ctx, struct lsa_ForestTrustInformation *);
                if (info_ptr == NULL) {
                        p->fault_state = DCERPC_FAULT_CANT_PERFORM;
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                info = talloc_zero(info_ptr, struct lsa_ForestTrustInformation);
                if (info == NULL) {
                        p->fault_state = DCERPC_FAULT_CANT_PERFORM;
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
                /* Fill forest trust information and expand UPN suffixes list */
                status = fill_forest_trust_array(p->mem_ctx, info);
                if (!NT_STATUS_IS_OK(status)) {
                        p->fault_state = DCERPC_FAULT_CANT_PERFORM;
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
                *info_ptr = info;
@@ -2444,22 +2512,16 @@ NTSTATUS _netr_GetForestTrustInformation(struct pipes_struct *p,
        NTSTATUS status;
        struct netlogon_creds_CredentialState *creds;
        struct lsa_ForestTrustInformation *info, **info_ptr;
-       struct loadparm_context *lp_ctx;
 
        /* TODO: check server name */
 
-       lp_ctx = loadparm_init_s3(p->mem_ctx, loadparm_s3_helpers());
-       if (lp_ctx == NULL) {
-               DEBUG(0, ("loadparm_init_s3 failed\n"));
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
-       status = schannel_check_creds_state(p->mem_ctx, lp_ctx,
-                                           r->in.computer_name,
-                                           r->in.credential,
-                                           r->out.return_authenticator,
-                                           &creds);
-       talloc_unlink(p->mem_ctx, lp_ctx);
+       become_root();
+       status = netr_creds_server_step_check(p, p->mem_ctx,
+                                             r->in.computer_name,
+                                             r->in.credential,
+                                             r->out.return_authenticator,
+                                             &creds);
+       unbecome_root();
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -2501,6 +2563,7 @@ static NTSTATUS get_password_from_trustAuth(TALLOC_CTX *mem_ctx,
 {
        enum ndr_err_code ndr_err;
        struct trustAuthInOutBlob trustAuth;
+       NTSTATUS status;
 
        ndr_err = ndr_pull_struct_blob_all(trustAuth_blob, mem_ctx, &trustAuth,
                                           (ndr_pull_flags_fn_t)ndr_pull_trustAuthInOutBlob);
@@ -2513,7 +2576,10 @@ static NTSTATUS get_password_from_trustAuth(TALLOC_CTX *mem_ctx,
                mdfour(current_pw_enc->hash,
                       trustAuth.current.array[0].AuthInfo.clear.password,
                       trustAuth.current.array[0].AuthInfo.clear.size);
-               netlogon_creds_des_encrypt(creds, current_pw_enc);
+               status = netlogon_creds_des_encrypt(creds, current_pw_enc);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
        } else {
                return NT_STATUS_UNSUCCESSFUL;
        }
@@ -2524,7 +2590,10 @@ static NTSTATUS get_password_from_trustAuth(TALLOC_CTX *mem_ctx,
                mdfour(previous_pw_enc->hash,
                       trustAuth.previous.array[0].AuthInfo.clear.password,
                       trustAuth.previous.array[0].AuthInfo.clear.size);
-               netlogon_creds_des_encrypt(creds, previous_pw_enc);
+               status = netlogon_creds_des_encrypt(creds, previous_pw_enc);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
        } else {
                ZERO_STRUCTP(previous_pw_enc);
        }
@@ -2546,22 +2615,16 @@ NTSTATUS _netr_ServerGetTrustInfo(struct pipes_struct *p,
        bool trusted;
        struct netr_TrustInfo *trust_info;
        struct pdb_trusted_domain *td;
-       struct loadparm_context *lp_ctx;
-
-       lp_ctx = loadparm_init_s3(p->mem_ctx, loadparm_s3_helpers());
-       if (lp_ctx == NULL) {
-               DEBUG(0, ("loadparm_init_s3 failed\n"));
-               return NT_STATUS_INTERNAL_ERROR;
-       }
 
        /* TODO: check server name */
 
-       status = schannel_check_creds_state(p->mem_ctx, lp_ctx,
-                                           r->in.computer_name,
-                                           r->in.credential,
-                                           r->out.return_authenticator,
-                                           &creds);
-       talloc_unlink(p->mem_ctx, lp_ctx);
+       become_root();
+       status = netr_creds_server_step_check(p, p->mem_ctx,
+                                             r->in.computer_name,
+                                             r->in.credential,
+                                             r->out.return_authenticator,
+                                             &creds);
+       unbecome_root();
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }