sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s3: Fix some nonempty blank lines

Browse Source
This commit is contained in:
Volker Lendecke 2009-12-21 15:11:55 +01:00
parent d534a5be49
commit e1bf189e00
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/winbindd/winbindd_ccache_access.c
View File

@ -6,17 +6,17 @@
Copyright (C) Robert O'Callahan 2006 Copyright (C) Robert O'Callahan 2006
Copyright (C) Jeremy Allison 2006 (minor fixes to fit into Samba and Copyright (C) Jeremy Allison 2006 (minor fixes to fit into Samba and
protect against integer wrap). protect against integer wrap).
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
@ -77,7 +77,7 @@ static NTSTATUS do_ntlm_auth_with_hashes(const char *username,
} }
status = ntlmssp_set_hashes(ntlmssp_state, lm_hash, nt_hash); status = ntlmssp_set_hashes(ntlmssp_state, lm_hash, nt_hash);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, ("Could not set hashes: %s\n", DEBUG(1, ("Could not set hashes: %s\n",
nt_errstr(status))); nt_errstr(status)));

20
source3/winbindd/winbindd_misc.c
View File

@ -5,17 +5,17 @@
Copyright (C) Tim Potter 2000 Copyright (C) Tim Potter 2000
Copyright (C) Andrew Bartlett 2002 Copyright (C) Andrew Bartlett 2002
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
@ -93,7 +93,7 @@ void winbindd_list_trusted_domains(struct winbindd_cli_state *state)
int extra_data_len = 0; int extra_data_len = 0;
char *extra_data = NULL; char *extra_data = NULL;
int i = 0; int i = 0;
DEBUG(3, ("[%5lu]: list trusted domains\n", DEBUG(3, ("[%5lu]: list trusted domains\n",
(unsigned long)state->pid)); (unsigned long)state->pid));
@ -137,7 +137,7 @@ void winbindd_list_trusted_domains(struct winbindd_cli_state *state)
is_online ? "Online" : "Offline" ); is_online ? "Online" : "Offline" );
} }
} }
extra_data_len = 0; extra_data_len = 0;
if (extra_data != NULL) { if (extra_data != NULL) {
extra_data_len = strlen(extra_data); extra_data_len = strlen(extra_data);
@ -193,7 +193,7 @@ enum winbindd_result winbindd_dual_list_trusted_domains(struct winbindd_domain *
sid_string_talloc(state->mem_ctx, &sids[i])); sid_string_talloc(state->mem_ctx, &sids[i]));
/* add our primary domain */ /* add our primary domain */
for (i=0; i<num_domains; i++) { for (i=0; i<num_domains; i++) {
if (strequal(names[i], domain->name)) { if (strequal(names[i], domain->name)) {
have_own_domain = True; have_own_domain = True;
@ -368,7 +368,7 @@ void winbindd_interface_version(struct winbindd_cli_state *state)
{ {
DEBUG(3, ("[%5lu]: request interface version\n", DEBUG(3, ("[%5lu]: request interface version\n",
(unsigned long)state->pid)); (unsigned long)state->pid));
state->response->data.interface_version = WINBIND_INTERFACE_VERSION; state->response->data.interface_version = WINBIND_INTERFACE_VERSION;
request_ok(state); request_ok(state);
} }
@ -378,7 +378,7 @@ void winbindd_interface_version(struct winbindd_cli_state *state)
void winbindd_domain_name(struct winbindd_cli_state *state) void winbindd_domain_name(struct winbindd_cli_state *state)
{ {
DEBUG(3, ("[%5lu]: request domain name\n", (unsigned long)state->pid)); DEBUG(3, ("[%5lu]: request domain name\n", (unsigned long)state->pid));
fstrcpy(state->response->data.domain_name, lp_workgroup()); fstrcpy(state->response->data.domain_name, lp_workgroup());
request_ok(state); request_ok(state);
} }
@ -389,7 +389,7 @@ void winbindd_netbios_name(struct winbindd_cli_state *state)
{ {
DEBUG(3, ("[%5lu]: request netbios name\n", DEBUG(3, ("[%5lu]: request netbios name\n",
(unsigned long)state->pid)); (unsigned long)state->pid));
fstrcpy(state->response->data.netbios_name, global_myname()); fstrcpy(state->response->data.netbios_name, global_myname());
request_ok(state); request_ok(state);
} }
@ -401,7 +401,7 @@ void winbindd_priv_pipe_dir(struct winbindd_cli_state *state)
char *priv_dir; char *priv_dir;
DEBUG(3, ("[%5lu]: request location of privileged pipe\n", DEBUG(3, ("[%5lu]: request location of privileged pipe\n",
(unsigned long)state->pid)); (unsigned long)state->pid));
priv_dir = get_winbind_priv_pipe_dir(); priv_dir = get_winbind_priv_pipe_dir();
state->response->extra_data.data = talloc_move(state->mem_ctx, state->response->extra_data.data = talloc_move(state->mem_ctx,
&priv_dir); &priv_dir);