diff options
| author | Tim Potter <tpot@samba.org> | 2002-11-29 02:58:59 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-11-29 02:58:59 +0000 |
| commit | f3e3a56ea9085b186af24b0b4e911863fd9ceacc (patch) | |
| tree | 994a10565d8ce8ff296fe3153433090e7570b271 /source3/smbd | |
| parent | 8986bdf7072a9d9f100767a4546c70cdf69a72b2 (diff) | |
| download | samba-f3e3a56ea9085b186af24b0b4e911863fd9ceacc.tar.gz samba-f3e3a56ea9085b186af24b0b4e911863fd9ceacc.tar.bz2 samba-f3e3a56ea9085b186af24b0b4e911863fd9ceacc.zip | |
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)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/build_options.c | 1 | ||||
| -rw-r--r-- | source3/smbd/change_trust_pw.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/source3/smbd/build_options.c b/source3/smbd/build_options.c index f52c53dda5..8129f22898 100644 --- a/source3/smbd/build_options.c +++ b/source3/smbd/build_options.c @@ -188,7 +188,6 @@ void build_options(BOOL screen) output(screen," SBINDIR: %s\n", dyn_SBINDIR); output(screen," BINDIR: %s\n", dyn_BINDIR); output(screen," LOCKDIR: %s\n",dyn_LOCKDIR); - output(screen," DRIVERFILE: %s\n", dyn_DRIVERFILE); output(screen," LOGFILEBASE: %s\n", dyn_LOGFILEBASE); /*Output various other options (most map to defines in the configure script*/ 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); |