[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  d6490bdc0f6 s3:passdb: Remove unused function secrets_fetch_trust_account_password()
       via  cb8518e1936 s3:include: Fix trailing whitespaces in secrets.h
      from  751b2b853b3 ldb: change the version to 2.7.0 for Samba 4.18

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d6490bdc0f69be3c5e78f08fad7b3f23b4857aa1
Author: Pavel Filipenský <pfilipensky at samba.org>
Date:   Sat Aug 6 00:35:22 2022 +0200

    s3:passdb: Remove unused function secrets_fetch_trust_account_password()
    
    Signed-off-by: Pavel Filipenský <pfilipensky at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Mon Aug  8 19:03:08 UTC 2022 on sn-devel-184

commit cb8518e19362ee84fe7525cbaab6d779d7e9f254
Author: Pavel Filipenský <pfilipensky at samba.org>
Date:   Sat Aug 6 10:11:47 2022 +0200

    s3:include: Fix trailing whitespaces in secrets.h
    
    Signed-off-by: Pavel Filipenský <pfilipensky at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/include/secrets.h                | 13 +++++--------
 source3/passdb/machine_account_secrets.c | 26 --------------------------
 2 files changed, 5 insertions(+), 34 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/secrets.h b/source3/include/secrets.h
index 1abfbb07e89..47cf40432f0 100644
--- a/source3/include/secrets.h
+++ b/source3/include/secrets.h
@@ -1,20 +1,20 @@
 /*
- * Unix SMB/CIFS implementation. 
+ * Unix SMB/CIFS implementation.
  * secrets.tdb file format info
  * Copyright (C) Andrew Tridgell              2000
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
  * Free Software Foundation; either version 3 of the License, or (at your
  * option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, see <http://www.gnu.org/licenses/>.  
+ * this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _SECRETS_H
@@ -110,9 +110,6 @@ bool secrets_fetch_trust_account_password_legacy(const char *domain,
 						 uint8_t ret_pwd[16],
 						 time_t *pass_last_set_time,
 						 enum netr_SchannelType *channel);
-bool secrets_fetch_trust_account_password(const char *domain, uint8_t ret_pwd[16],
-					  time_t *pass_last_set_time,
-					  enum netr_SchannelType *channel);
 bool secrets_fetch_trusted_domain_password(const char *domain, char** pwd,
                                            struct dom_sid  *sid, time_t *pass_last_set_time);
 bool secrets_store_trusted_domain_password(const char* domain, const char* pwd,
diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
index d404298502e..5353cca9315 100644
--- a/source3/passdb/machine_account_secrets.c
+++ b/source3/passdb/machine_account_secrets.c
@@ -362,32 +362,6 @@ bool secrets_fetch_trust_account_password_legacy(const char *domain,
 	return True;
 }
 
-/************************************************************************
- Routine to get the trust account password for a domain.
- The user of this function must have locked the trust password file using
- the above secrets_lock_trust_account_password().
-************************************************************************/
-
-bool secrets_fetch_trust_account_password(const char *domain, uint8_t ret_pwd[16],
-					  time_t *pass_last_set_time,
-					  enum netr_SchannelType *channel)
-{
-	char *plaintext;
-
-	plaintext = secrets_fetch_machine_password(domain, pass_last_set_time,
-						   channel);
-	if (plaintext) {
-		DEBUG(4,("Using cleartext machine password\n"));
-		E_md4hash(plaintext, ret_pwd);
-		SAFE_FREE(plaintext);
-		return True;
-	}
-
-	return secrets_fetch_trust_account_password_legacy(domain, ret_pwd,
-							   pass_last_set_time,
-							   channel);
-}
-
 /************************************************************************
  Routine to delete all information related to the domain joined machine.
 ************************************************************************/


-- 
Samba Shared Repository