s3: Fix some nonempty blank lines

diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index 1f47bf35f018709c9e71dba91992353825b29dae..a181502a89d1a254c36aface8eda0e9c16a91971 100644 (file)
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -7,17 +7,17 @@
    Copyright (C) Stefan (metze) Metzmacher     2002
    Copyright (C) Simo Sorce                    2002
    Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2005
-      
+
    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/>.
 */
@@ -216,14 +216,14 @@ char *sid_string_tos(const DOM_SID *sid)
 /*****************************************************************
  Convert a string to a SID. Returns True on success, False on fail.
 *****************************************************************/  
-   
+
 bool string_to_sid(DOM_SID *sidout, const char *sidstr)
 {
        const char *p;
        char *q;
        /* BIG NOTE: this function only does SIDS where the identauth is not >= 2^32 */
        uint32 conv;
-  
+
        if ((sidstr[0] != 'S' && sidstr[0] != 's') || sidstr[1] != '-') {
                DEBUG(3,("string_to_sid: Sid %s does not start with 'S-'.\n", sidstr));
                return False;
@@ -267,7 +267,7 @@ bool string_to_sid(DOM_SID *sidout, const char *sidstr)
                        break;
                q++;
        }
-               
+
        return True;
 }
 
@@ -325,7 +325,7 @@ bool sid_peek_rid(const DOM_SID *sid, uint32 *rid)
 {
        if (!sid || !rid)
                return False;           
-       
+
        if (sid->num_auths > 0) {
                *rid = sid->sub_auths[sid->num_auths - 1];
                return True;
@@ -342,7 +342,7 @@ bool sid_peek_check_rid(const DOM_SID *exp_dom_sid, const DOM_SID *sid, uint32 *
 {
        if (!exp_dom_sid || !sid || !rid)
                return False;
-                       
+
        if (sid->num_auths != (exp_dom_sid->num_auths+1)) {
                return False;
        }
@@ -351,7 +351,7 @@ bool sid_peek_check_rid(const DOM_SID *exp_dom_sid, const DOM_SID *sid, uint32 *
                *rid=(-1);
                return False;
        }
-       
+
        return sid_peek_rid(sid, rid);
 }
 
@@ -635,7 +635,7 @@ void del_sid_from_array(const DOM_SID *sid, DOM_SID **sids, size_t *num)
 
        for ( ; i<*num; i++ ) 
                sid_copy( &sid_list[i], &sid_list[i+1] );
-       
+
        return;
 }
 
@@ -648,7 +648,7 @@ bool add_rid_to_array_unique(TALLOC_CTX *mem_ctx,
                if ((*pp_rids)[i] == rid)
                        return True;
        }
-       
+
        *pp_rids = TALLOC_REALLOC_ARRAY(mem_ctx, *pp_rids, uint32, *p_num+1);
 
        if (*pp_rids == NULL) {

diff --git a/source3/librpc/ndr/sid.c b/source3/librpc/ndr/sid.c
index 252da85929102ceb229cab74d99554256251492f..eb5c2c477d1d7219969e93de66290648b497d7c0 100644 (file)
--- a/source3/librpc/ndr/sid.c
+++ b/source3/librpc/ndr/sid.c
@@ -4,17 +4,17 @@
    libndr interface
 
    Copyright (C) Andrew Tridgell 2003
-   
+
    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/>.
 */
@@ -29,7 +29,7 @@ char *dom_sid_string(TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
        int i, ofs, maxlen;
        uint32_t ia;
        char *ret;
-       
+
        if (!sid) {
                return talloc_strdup(mem_ctx, "(NULL SID)");
        }
@@ -54,6 +54,6 @@ char *dom_sid_string(TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
        for (i = 0; i < sid->num_auths; i++) {
                ofs += snprintf(ret + ofs, maxlen - ofs, "-%lu", (unsigned long)sid->sub_auths[i]);
        }
-       
+
        return ret;
 }

diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index e0f4ac4adc09fbcc52415aa4c17c8e91c14bd712..11ff046f6d716d7b4ebd298da75f1848284f4f74 100644 (file)
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -10,12 +10,12 @@
    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/>.
 */
@@ -173,7 +173,7 @@ static NTSTATUS cmd_lsa_query_info_policy(struct rpc_pipe_client *cli,
 
                if (!NT_STATUS_IS_OK(result))
                        goto done;
-                       
+
                result = rpccli_lsa_QueryInfoPolicy2(cli, mem_ctx,
                                                     &pol,
                                                     info_class,
@@ -186,7 +186,7 @@ static NTSTATUS cmd_lsa_query_info_policy(struct rpc_pipe_client *cli,
 
                if (!NT_STATUS_IS_OK(result))
                        goto done;
-               
+
                result = rpccli_lsa_QueryInfoPolicy(cli, mem_ctx,
                                                    &pol,
                                                    info_class,
@@ -726,7 +726,7 @@ static NTSTATUS cmd_lsa_create_account(struct rpc_pipe_client *cli,
        struct policy_handle user_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        uint32 des_access = 0x000f000f;
-       
+
        DOM_SID sid;
 
        if (argc != 2 ) {
@@ -1072,14 +1072,14 @@ static void display_trust_dom_info_4(struct lsa_TrustDomainInfoPassword *p,
                                     uint8_t session_key[16])
 {
        char *pwd, *pwd_old;
-       
+
        DATA_BLOB data     = data_blob_const(p->password->data, p->password->length);
        DATA_BLOB data_old = data_blob_const(p->old_password->data, p->old_password->length);
        DATA_BLOB session_key_blob = data_blob_const(session_key, sizeof(session_key));
 
        pwd     = sess_decrypt_string(talloc_tos(), &data, &session_key_blob);
        pwd_old = sess_decrypt_string(talloc_tos(), &data_old, &session_key_blob);
-       
+
        d_printf("Password:\t%s\n", pwd);
        d_printf("Old Password:\t%s\n", pwd_old);
 

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 6783308edd5002e074be5bd11b9d0c8c46fcf24d..65bb25db5961d298fe5c95347a8e3c6eb3b28ea8 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1552,7 +1552,7 @@ static void construct_reply_common(struct smb_request *req, const char *inbuf,
                                   char *outbuf)
 {
        srv_set_message(outbuf,0,0,false);
-       
+
        SCVAL(outbuf, smb_com, req->cmd);
        SIVAL(outbuf,smb_rcls,0);
        SCVAL(outbuf,smb_flg, FLAG_REPLY | (CVAL(inbuf,smb_flg) & FLAG_CASELESS_PATHNAMES)); 
@@ -2059,11 +2059,11 @@ void check_reload(time_t t)
        }
 
        /* 'printcap cache time = 0' disable the feature */
-       
+
        if ( printcap_cache_time != 0 )
        { 
                /* see if it's time to reload or if the clock has been set back */
-               
+
                if ( (t >= last_printer_reload_time+printcap_cache_time) 
                        || (t-last_printer_reload_time  < 0) ) 
                {