r24990: Kill an incredible amount of trailing whitespaces...
authorMichael Adam <obnox@samba.org>
Fri, 7 Sep 2007 08:54:48 +0000 (08:54 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:30:31 +0000 (12:30 -0500)
Further reformat get_trust_pw to conform to coding rules.

Michael
(This used to be commit b9e76a479e933084b1ee081ef5d8bd6bdbd7fadf)

source3/passdb/passdb.c

index fcbc4a477f85407b8a77619b837f617fa1228bb5..4556fdf4ebe6bb4a3b5b5c86047eaf345bdf0297 100644 (file)
@@ -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 */