diff options
| author | Michael Adam <obnox@samba.org> | 2007-09-07 08:54:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:30:31 -0500 |
| commit | f09b0d72f459fbbd3032b56093a7be85f332e8bd (patch) | |
| tree | 931643c003606c770df7d74d142ccf564b204b89 | |
| parent | 9044d034892ea7f21082bf915fa5dd531043b473 (diff) | |
| download | samba-f09b0d72f459fbbd3032b56093a7be85f332e8bd.tar.gz samba-f09b0d72f459fbbd3032b56093a7be85f332e8bd.tar.bz2 samba-f09b0d72f459fbbd3032b56093a7be85f332e8bd.zip | |
r24990: Kill an incredible amount of trailing whitespaces...
Further reformat get_trust_pw to conform to coding rules.
Michael
(This used to be commit b9e76a479e933084b1ee081ef5d8bd6bdbd7fadf)
| -rw-r--r-- | source3/passdb/passdb.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index fcbc4a477f..4556fdf4eb 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -1527,28 +1527,31 @@ BOOL get_trust_pw(const char *domain, uint8 ret_pwd[16], uint32 *channel) DOM_SID sid; char *pwd; time_t last_set_time; - + /* if we are a DC and this is not our domain, then lookup an account for the domain trust */ - - if ( IS_DC && !strequal(domain, lp_workgroup()) && lp_allow_trusted_domains() ) { - if (!pdb_get_trusteddom_pw(domain, &pwd, &sid, &last_set_time)) { + + if (IS_DC && !strequal(domain, lp_workgroup()) && + lp_allow_trusted_domains()) + { + if (!pdb_get_trusteddom_pw(domain, &pwd, &sid, &last_set_time)) + { DEBUG(0, ("get_trust_pw: could not fetch trust " "account password for trusted domain %s\n", domain)); return False; } - + *channel = SEC_CHAN_DOMAIN; E_md4hash(pwd, ret_pwd); SAFE_FREE(pwd); return True; } - + /* Just get the account for the requested domain. In the future this * might also cover to be member of more than one domain. */ - + if (secrets_fetch_trust_account_password(domain, ret_pwd, &last_set_time, channel)) return True; @@ -1558,4 +1561,3 @@ BOOL get_trust_pw(const char *domain, uint8 ret_pwd[16], uint32 *channel) return False; } -/* END */ |