genrand.c: Changed SMB_PASSWD_FILE to lp_smb_passwd_file().

password.c: Started the initial code for domain_client_validate(). All
            bracketed with #ifdef DOMAIN_CLIENT for now.
reply.c: Call to domain_client_validate(). All
            bracketed with #ifdef DOMAIN_CLIENT for now.
smbpass.c: New code to get/set machine passwords. Tidied up nesting
           of lock calls.
Jeremy.
(This used to be commit 89fe059a6816f32d2cc5c4c04c4089b60590e7e6)

1 files changed, 55 insertions, 54 deletions

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 2f3b3660fc..4472aa16e6 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -377,65 +377,66 @@ static int session_trust_account(char *inbuf, char *outbuf, char *user,
                                 char *smb_passwd, int smb_passlen,
                                 char *smb_nt_passwd, int smb_nt_passlen)
 {
-        struct smb_passwd *smb_trust_acct = NULL; /* check if trust account exists */
-        if (lp_security() == SEC_USER)
-        {
-                smb_trust_acct = getsmbpwnam(user);
-        }
-        else
-        {
-                DEBUG(3,("Trust account %s only supported with security = user\n", user));
-                SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
-                return(ERROR(0, 0xc0000000|NT_STATUS_LOGON_FAILURE));
-        }
+  struct smb_passwd *smb_trust_acct = NULL; /* check if trust account exists */
+  if (lp_security() == SEC_USER)
+  {
+    smb_trust_acct = getsmbpwnam(user);
+  }
+  else
+  {
+    DEBUG(0,("session_trust_account: Trust account %s only supported with security = user\n", user));
+    SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
+    return(ERROR(0, 0xc0000000|NT_STATUS_LOGON_FAILURE));
+  }
 
-        if (smb_trust_acct == NULL)
-        {
-                /* lkclXXXX: workstation entry doesn't exist */
-                DEBUG(4,("Trust account %s user doesn't exist\n",user));
-                SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
-                return(ERROR(0, 0xc0000000|NT_STATUS_NO_SUCH_USER));
-        }
-        else
-        {
-                if ((smb_passlen != 24) || (smb_nt_passlen != 24))
-                {
-                        DEBUG(4,("Trust account %s - password length wrong.\n", user));
-                        SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
-                        return(ERROR(0, 0xc0000000|NT_STATUS_LOGON_FAILURE));
-                }
+  if (smb_trust_acct == NULL)
+  {
+    /* lkclXXXX: workstation entry doesn't exist */
+    DEBUG(0,("session_trust_account: Trust account %s user doesn't exist\n",user));
+    SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
+    return(ERROR(0, 0xc0000000|NT_STATUS_NO_SUCH_USER));
+  }
+  else
+  {
+    if ((smb_passlen != 24) || (smb_nt_passlen != 24))
+    {
+      DEBUG(0,("session_trust_account: Trust account %s - password length wrong.\n", user));
+      SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
+      return(ERROR(0, 0xc0000000|NT_STATUS_LOGON_FAILURE));
+    }
 
-                if (!smb_password_ok(smb_trust_acct, smb_passwd, smb_nt_passwd))
-                {
-                        DEBUG(4,("Trust Account %s - password failed\n", user));
-                        SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
-                        return(ERROR(0, 0xc0000000|NT_STATUS_LOGON_FAILURE));
-                }
+    if (!smb_password_ok(smb_trust_acct, smb_passwd, smb_nt_passwd))
+    {
+      DEBUG(0,("session_trust_account: Trust Account %s - password failed\n", user));
+      SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
+      return(ERROR(0, 0xc0000000|NT_STATUS_LOGON_FAILURE));
+    }
 
-                if (IS_BITS_SET_ALL(smb_trust_acct->acct_ctrl, ACB_DOMTRUST))
-                {
-                        DEBUG(4,("Domain trust account %s denied by server\n",user));
-                        SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
-                        return(ERROR(0, 0xc0000000|NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT));
-                }
+    if (IS_BITS_SET_ALL(smb_trust_acct->acct_ctrl, ACB_DOMTRUST))
+    {
+      DEBUG(0,("session_trust_account: Domain trust account %s denied by server\n",user));
+      SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
+      return(ERROR(0, 0xc0000000|NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT));
+    }
 
-                if (IS_BITS_SET_ALL(smb_trust_acct->acct_ctrl, ACB_SVRTRUST))
-                {
-                        DEBUG(4,("Server trust account %s denied by server\n",user));
-                        SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
-                        return(ERROR(0, 0xc0000000|NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT));
-                }
-                if (IS_BITS_SET_ALL(smb_trust_acct->acct_ctrl, ACB_WSTRUST))
-                {
-                        DEBUG(4,("Wksta trust account %s denied by server\n", user));
-                        SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
-                        return(ERROR(0, 0xc0000000|NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT));
-                }
-        }
+    if (IS_BITS_SET_ALL(smb_trust_acct->acct_ctrl, ACB_SVRTRUST))
+    {
+      DEBUG(0,("session_trust_account: Server trust account %s denied by server\n",user));
+      SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
+      return(ERROR(0, 0xc0000000|NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT));
+    }
+
+    if (IS_BITS_SET_ALL(smb_trust_acct->acct_ctrl, ACB_WSTRUST))
+    {
+      DEBUG(4,("session_trust_account: Wksta trust account %s denied by server\n", user));
+      SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
+      return(ERROR(0, 0xc0000000|NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT));
+    }
+  }
 
-        /* don't know what to do: indicate logon failure */
-        SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
-        return(ERROR(0, 0xc0000000|NT_STATUS_LOGON_FAILURE));
+  /* don't know what to do: indicate logon failure */
+  SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
+  return(ERROR(0, 0xc0000000|NT_STATUS_LOGON_FAILURE));
 }