From f3e3a56ea9085b186af24b0b4e911863fd9ceacc Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Fri, 29 Nov 2002 02:58:59 +0000 Subject: Merge a bunch of trivial changes from HEAD. The difference remaining should actual functional differences between HEAD and 3.0. - Mostly reformatting - Removal of unecessary #include "smb.h" - Merge of dyn_DRIVERFILE removal - Silly bug fix for python code (This used to be commit d3998307adc50ba50defe610cb656c73799ae3b9) --- source3/smbd/change_trust_pw.c | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/smbd/change_trust_pw.c') diff --git a/source3/smbd/change_trust_pw.c b/source3/smbd/change_trust_pw.c index e4a7fbae6b..28a004eba8 100644 --- a/source3/smbd/change_trust_pw.c +++ b/source3/smbd/change_trust_pw.c @@ -120,7 +120,6 @@ account password for domain %s.\n", domain)); if(NT_STATUS_IS_OK(res = modify_trust_password( domain, dc_name, old_trust_passwd_hash))) break; - } else { res = modify_trust_password( domain, remote_machine, old_trust_passwd_hash); -- cgit