Fix nonempty blank lines

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 3c8c60f0e07204bc29b26ec7fcc53365b2fbaacb..4051a6ca3422b19ac9057a1e1b02f2ed46972562 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -335,7 +335,7 @@ static struct printjob *print_job_find(const char *sharename, uint32 jobid)
        uint32_t tmp;
        TDB_DATA                ret;
        struct tdb_print_db     *pdb = get_print_db_byname(sharename);
-       
+
        DEBUG(10,("print_job_find: looking up job %u for share %s\n",
                        (unsigned int)jobid, sharename ));
 
@@ -350,19 +350,19 @@ static struct printjob *print_job_find(const char *sharename, uint32 jobid)
                DEBUG(10,("print_job_find: failed to find jobid %u.\n", (unsigned int)jobid ));
                return NULL;
        }
-       
+
        if ( pjob.nt_devmode ) {
                free_nt_devicemode( &pjob.nt_devmode );
        }
-               
+
        ZERO_STRUCT( pjob );
-       
+
        if ( unpack_pjob( ret.dptr, ret.dsize, &pjob ) == -1 ) {
                DEBUG(10,("print_job_find: failed to unpack jobid %u.\n", (unsigned int)jobid ));
                SAFE_FREE(ret.dptr);
                return NULL;
        }
-       
+
        SAFE_FREE(ret.dptr);
 
        DEBUG(10,("print_job_find: returning system job %d for jobid %u.\n",

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 82af55800ff901b9f4e35275e3b345ea63226750..1dcc70adaebde105493e9bed698bd1266ae1597d 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -7,17 +7,17 @@
    Copyright (C) Andrew Tridgell 2002
    Copyright (C) Jelmer Vernooij 2003
    Copyright (C) Volker Lendecke 2004
-   
+
    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/>.
 */
@@ -103,9 +103,9 @@ static void winbindd_status(void)
        DEBUG(0, ("winbindd status:\n"));
 
        /* Print client state information */
-       
+
        DEBUG(0, ("\t%d clients currently active\n", winbindd_num_clients()));
-       
+
        if (DEBUGLEVEL >= 2 && winbindd_num_clients()) {
                DEBUG(2, ("\tclient list:\n"));
                for(tmp = winbindd_client_list(); tmp; tmp = tmp->next) {
@@ -157,7 +157,7 @@ static void terminate(bool is_parent)
        }
 
        idmap_close();
-       
+
        trustdom_cache_shutdown();
 
 #if 0
@@ -288,7 +288,7 @@ static struct winbindd_dispatch_table {
        void (*fn)(struct winbindd_cli_state *state);
        const char *winbindd_cmd_name;
 } dispatch_table[] = {
-       
+
        /* User functions */
 
        { WINBINDD_GETPWNAM, winbindd_getpwnam, "GETPWNAM" },
@@ -685,9 +685,9 @@ static void new_connection(int listen_sock, bool privileged)
        struct winbindd_cli_state *state;
        socklen_t len;
        int sock;
-       
+
        /* Accept connection */
-       
+
        len = sizeof(sunaddr);
 
        do {
@@ -696,16 +696,16 @@ static void new_connection(int listen_sock, bool privileged)
 
        if (sock == -1)
                return;
-       
+
        DEBUG(6,("accepted socket %d\n", sock));
-       
+
        /* Create new connection structure */
-       
+
        if ((state = TALLOC_ZERO_P(NULL, struct winbindd_cli_state)) == NULL) {
                close(sock);
                return;
        }
-       
+
        state->sock = sock;
 
        state->last_access = time(NULL);        
@@ -720,7 +720,7 @@ static void new_connection(int listen_sock, bool privileged)
                         request_len_recv, state);
 
        /* Add to connection list */
-       
+
        winbindd_add_client(state);
 }
 
@@ -731,7 +731,7 @@ static void remove_client(struct winbindd_cli_state *state)
        char c = 0;
 
        /* It's a dead client - hold a funeral */
-       
+
        if (state == NULL) {
                return;
        }
@@ -740,14 +740,14 @@ static void remove_client(struct winbindd_cli_state *state)
        write(state->sock, &c, sizeof(c));
 
        /* Close socket */
-               
+
        close(state->sock);
-               
+
        /* Free any getent state */
-               
+
        free_getent_state(state->getpwent_state);
        free_getent_state(state->getgrent_state);
-               
+
        /* We may have some extra data that was not freed if the client was
           killed unexpectedly */
 
@@ -756,9 +756,9 @@ static void remove_client(struct winbindd_cli_state *state)
        TALLOC_FREE(state->mem_ctx);
 
        remove_fd_event(&state->fd_event);
-               
+
        /* Remove from list and free */
-               
+
        winbindd_remove_client(state);
        TALLOC_FREE(state);
 }
@@ -893,7 +893,7 @@ static void process_loop(void)
        }
 
        /* Call select */
-        
+
        selret = sys_select(maxfd + 1, &r_fds, &w_fds, NULL, &timeout);
 
        if (selret == 0) {
@@ -944,7 +944,7 @@ static void process_loop(void)
                /* new, non-privileged connection */
                new_connection(listen_sock, False);
        }
-            
+
        if (FD_ISSET(listen_priv_sock, &r_fds)) {
                while (winbindd_num_clients() >
                       WINBINDD_MAX_SIMULTANEOUS_CLIENTS - 1) {
@@ -1159,7 +1159,7 @@ int main(int argc, char **argv, char **envp)
        BlockSignals(False, SIGCHLD);
 
        /* Setup signal handlers */
-       
+
        CatchSignal(SIGINT, termination_handler);      /* Exit on these sigs */
        CatchSignal(SIGQUIT, termination_handler);
        CatchSignal(SIGTERM, termination_handler);
@@ -1232,13 +1232,13 @@ int main(int argc, char **argv, char **envp)
        messaging_register(winbind_messaging_context(), NULL,
                           MSG_DEBUG,
                           winbind_msg_debug);
-       
+
        netsamlogon_cache_init(); /* Non-critical */
-       
+
        /* clear the cached list of trusted domains */
 
        wcache_tdc_clear();     
-       
+
        if (!init_domain_list()) {
                DEBUG(0,("unable to initialize domain list\n"));
                exit(1);

diff --git a/source3/winbindd/winbindd_async.c b/source3/winbindd/winbindd_async.c
index 7500bcbe5b29ffd350bded087f4b897118d8d711..7b93f963b4be903b874bf3fe1756bbca64e969d5 100644 (file)
--- a/source3/winbindd/winbindd_async.c
+++ b/source3/winbindd/winbindd_async.c
@@ -5,7 +5,7 @@
 
    Copyright (C) Volker Lendecke 2005
    Copyright (C) Gerald Carter 2006
-   
+
    The helpers always consist of three functions: 
 
    * A request setup function that takes the necessary parameters together
@@ -21,12 +21,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/>.
 */
@@ -166,7 +166,7 @@ static void lookupsid_recv(TALLOC_CTX *mem_ctx, bool success,
                /* Try again using the forest root */
                struct winbindd_domain *root_domain = find_root_domain();
                struct winbindd_request request;
-               
+
                if ( !root_domain ) {
                        DEBUG(5,("lookupsid_recv: unable to determine forest root\n"));
                        cont(s->caller_private_data, False, NULL, NULL, SID_NAME_UNKNOWN);
@@ -491,7 +491,7 @@ void winbindd_listent_async(TALLOC_CTX *mem_ctx,
        do_async_domain(mem_ctx, domain, &request, listent_recv,
                        (void *)cont, private_data);
 }
- 
+
 enum winbindd_result winbindd_dual_list_users(struct winbindd_domain *domain,
                                               struct winbindd_cli_state *state)
 {
@@ -509,7 +509,7 @@ enum winbindd_result winbindd_dual_list_users(struct winbindd_domain *domain,
        methods = domain->methods;
        status = methods->query_user_list(domain, state->mem_ctx, 
                                          &num_entries, &info);
-       
+
        if (!NT_STATUS_IS_OK(status))
                return WINBINDD_ERROR;
 
@@ -521,7 +521,7 @@ enum winbindd_result winbindd_dual_list_users(struct winbindd_domain *domain,
           +1 for the ',' between group names */
        extra_data = (char *)SMB_REALLOC(extra_data, 
                (sizeof(fstring) + 1) * num_entries);
- 
+
        if (!extra_data) {
                DEBUG(0,("failed to enlarge buffer!\n"));
                return WINBINDD_ERROR;
@@ -530,12 +530,12 @@ enum winbindd_result winbindd_dual_list_users(struct winbindd_domain *domain,
        /* Pack user list into extra data fields */
        for (i = 0; i < num_entries; i++) {
                fstring acct_name, name;
-               
+
                if (info[i].acct_name == NULL)
                        fstrcpy(acct_name, "");
                else
                        fstrcpy(acct_name, info[i].acct_name);
-               
+
                fill_domain_username(name, domain->name, acct_name, True);
                /* Append to extra data */
                memcpy(&extra_data[extra_data_len], name, strlen(name));
@@ -904,7 +904,7 @@ enum winbindd_result winbindd_dual_getsidaliases(struct winbindd_domain *domain,
                           (char *)state->response.extra_data.data));
                state->response.length += len+1;
        }
-       
+
        return WINBINDD_OK;
 }
 
@@ -926,7 +926,7 @@ static void gettoken_recvdomgroups(TALLOC_CTX *mem_ctx, bool success,
 static void gettoken_recvaliases(void *private_data, bool success,
                                 const DOM_SID *aliases,
                                 size_t num_aliases);
-                                
+
 
 void winbindd_gettoken_async(TALLOC_CTX *mem_ctx, const DOM_SID *user_sid,
                             void (*cont)(void *private_data, bool success,
@@ -975,7 +975,7 @@ static void gettoken_recvdomgroups(TALLOC_CTX *mem_ctx, bool success,
        struct gettoken_state *state =
                talloc_get_type_abort(private_data, struct gettoken_state);
        char *sids_str;
-       
+
        if (!success) {
                DEBUG(10, ("Could not get domain groups\n"));
                state->cont(state->private_data, False, NULL, 0);