From e35a2f89b27b49f57d73c2461e0cecd2bbd46fa8 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 11 Apr 2010 11:50:55 +0200 Subject: s3: Fix some nonempty lines --- source3/auth/auth_builtin.c | 12 ++++++------ source3/auth/auth_domain.c | 22 +++++++++++----------- source3/auth/auth_script.c | 6 +++--- source3/auth/auth_server.c | 12 ++++++------ source3/auth/auth_unix.c | 13 ++++++------- source3/auth/auth_winbind.c | 6 +++--- 6 files changed, 35 insertions(+), 36 deletions(-) diff --git a/source3/auth/auth_builtin.c b/source3/auth/auth_builtin.c index f8f048a6f2..705fdda3e8 100644 --- a/source3/auth/auth_builtin.c +++ b/source3/auth/auth_builtin.c @@ -3,17 +3,17 @@ Generic authentication types Copyright (C) Andrew Bartlett 2001-2002 Copyright (C) Jelmer Vernooij 2002 - + 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 . */ @@ -84,7 +84,7 @@ static NTSTATUS check_name_to_ntstatus_security(const struct auth_context *auth_ fstring user; long error_num; fstrcpy(user, user_info->smb_name); - + if (strnequal("NT_STATUS", user, strlen("NT_STATUS"))) { strupper_m(user); return nt_status_string_to_code(user); @@ -92,11 +92,11 @@ static NTSTATUS check_name_to_ntstatus_security(const struct auth_context *auth_ strlower_m(user); error_num = strtoul(user, NULL, 16); - + DEBUG(5,("check_name_to_ntstatus_security: Error for user %s was %lx\n", user, error_num)); nt_status = NT_STATUS(error_num); - + return nt_status; } diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c index a07aa617c4..6e182a38e7 100644 --- a/source3/auth/auth_domain.c +++ b/source3/auth/auth_domain.c @@ -3,17 +3,17 @@ Authenticate against a remote domain Copyright (C) Andrew Tridgell 1992-1998 Copyright (C) Andrew Bartlett 2001 - + 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 . */ @@ -138,7 +138,7 @@ static NTSTATUS connect_to_domain_password_server(struct cli_state **cli, if (mutex == NULL) { return NT_STATUS_NO_LOGON_SERVERS; } - + /* Attempt connection */ *retry = True; result = cli_full_connection(cli, global_myname(), dc_name, dc_ss, 0, @@ -275,7 +275,7 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx, */ /* rety loop for robustness */ - + for (i = 0; !NT_STATUS_IS_OK(nt_status) && retry && (i < 3); i++) { nt_status = connect_to_domain_password_server(&cli, domain, @@ -316,7 +316,7 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx, /* Let go as soon as possible so we avoid any potential deadlocks with winbind lookup up users or groups. */ - + TALLOC_FREE(mutex); if (!NT_STATUS_IS_OK(nt_status)) { @@ -409,7 +409,7 @@ static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context, user_info->domain)); return NT_STATUS_NO_LOGON_SERVERS; } - + nt_status = domain_client_validate(mem_ctx, user_info, domain, @@ -417,7 +417,7 @@ static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context, server_info, dc_name, &dc_ss); - + return nt_status; } @@ -469,7 +469,7 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte This return makes "map to guest = bad user" work again. The logic is that if we know nothing about the domain, that user is not known to us and does not exist */ - + if ( !is_trusted_domain( user_info->domain ) ) return NT_STATUS_NOT_IMPLEMENTED; @@ -503,13 +503,13 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte /* use get_dc_name() for consistency even through we know that it will be a netbios name */ - + if ( !get_dc_name(user_info->domain, NULL, dc_name, &dc_ss) ) { DEBUG(5,("check_trustdomain_security: unable to locate a DC for domain %s\n", user_info->domain)); return NT_STATUS_NO_LOGON_SERVERS; } - + nt_status = domain_client_validate(mem_ctx, user_info, user_info->domain, diff --git a/source3/auth/auth_script.c b/source3/auth/auth_script.c index be1ae81501..5769f21979 100644 --- a/source3/auth/auth_script.c +++ b/source3/auth/auth_script.c @@ -4,17 +4,17 @@ Call out to a shell script for an authentication check. Copyright (C) Jeremy Allison 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 . */ diff --git a/source3/auth/auth_server.c b/source3/auth/auth_server.c index ec92787dce..0109f625ed 100644 --- a/source3/auth/auth_server.c +++ b/source3/auth/auth_server.c @@ -8,12 +8,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 . */ @@ -228,7 +228,7 @@ static DATA_BLOB auth_get_challenge_server(const struct auth_context *auth_conte TALLOC_CTX *mem_ctx) { struct cli_state *cli = server_cryptkey(mem_ctx); - + if (cli) { DEBUG(3,("using password server validation\n")); @@ -236,7 +236,7 @@ static DATA_BLOB auth_get_challenge_server(const struct auth_context *auth_conte /* We can't work with unencrypted password servers unless 'encrypt passwords = no' */ DEBUG(5,("make_auth_info_server: Server is unencrypted, no challenge available..\n")); - + /* However, it is still a perfectly fine connection to pass that unencrypted password over */ *my_private_data = @@ -282,7 +282,7 @@ static NTSTATUS check_smbserver_security(const struct auth_context *auth_context bool locally_made_cli = False; cli = state->cli; - + if (cli) { } else { cli = server_cryptkey(mem_ctx); @@ -293,7 +293,7 @@ static NTSTATUS check_smbserver_security(const struct auth_context *auth_context DEBUG(1,("password server is not connected (cli not initialised)\n")); return NT_STATUS_LOGON_FAILURE; } - + if ((cli->sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) == 0) { if (user_info->encrypted) { DEBUG(1,("password server %s is plaintext, but we are encrypted. This just can't work :-(\n", cli->desthost)); diff --git a/source3/auth/auth_unix.c b/source3/auth/auth_unix.c index 3e2df9a123..99b94b609e 100644 --- a/source3/auth/auth_unix.c +++ b/source3/auth/auth_unix.c @@ -2,17 +2,17 @@ Unix SMB/CIFS implementation. Password and authentication handling Copyright (C) Andrew Bartlett 2001 - + 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 . */ @@ -31,11 +31,11 @@ static bool update_smbpassword_file(const char *user, const char *password) { struct samu *sampass; bool ret; - + if ( !(sampass = samu_new( NULL )) ) { return False; } - + become_root(); ret = pdb_getsampwnam(sampass, user); unbecome_root(); @@ -94,7 +94,6 @@ static NTSTATUS check_unix_security(const struct auth_context *auth_context, become_root(); pass = Get_Pwnam_alloc(talloc_tos(), user_info->internal_username); - /** @todo This call assumes a ASCII password, no charset transformation is done. We may need to revisit this **/ nt_status = pass_check(pass, @@ -104,7 +103,7 @@ static NTSTATUS check_unix_security(const struct auth_context *auth_context, lp_update_encrypted() ? update_smbpassword_file : NULL, True); - + unbecome_root(); if (NT_STATUS_IS_OK(nt_status)) { diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c index 74723e6af4..93028c4cd8 100644 --- a/source3/auth/auth_winbind.c +++ b/source3/auth/auth_winbind.c @@ -5,17 +5,17 @@ Copyright (C) Tim Potter 2000 Copyright (C) Andrew Bartlett 2001 - 2002 - + 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 . */ -- cgit