[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha6-11-g55dfad4
Volker Lendecke
vlendec at samba.org
Tue Jan 20 22:11:11 GMT 2009
The branch, master has been updated
via 55dfad40af52235a59e44dbe6434713e7a810bf2 (commit)
via d7d251f8c700e254ae913acee702a9fc5c886e8b (commit)
from 520f88143bd894f6aea38bb9adae5a1165a8720e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 55dfad40af52235a59e44dbe6434713e7a810bf2
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jan 20 23:08:33 2009 +0100
"userdom_struct" does not need "full_name" anymore -- unused
commit d7d251f8c700e254ae913acee702a9fc5c886e8b
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jan 20 22:04:53 2009 +0100
Fix some nonempty blank lines
-----------------------------------------------------------------------
Summary of changes:
source3/auth/auth_compat.c | 18 +++++++++---------
source3/include/auth.h | 22 +++++++++++-----------
source3/include/proto.h | 2 +-
source3/include/smb.h | 1 -
source3/lib/substitute.c | 3 +--
source3/smbd/password.c | 1 -
source3/smbd/process.c | 2 --
7 files changed, 22 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/auth/auth_compat.c b/source3/auth/auth_compat.c
index ad2686c..00d9dea 100644
--- a/source3/auth/auth_compat.c
+++ b/source3/auth/auth_compat.c
@@ -2,17 +2,17 @@
Unix SMB/CIFS implementation.
Password and authentication handling
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 <http://www.gnu.org/licenses/>.
*/
@@ -44,18 +44,18 @@ NTSTATUS check_plaintext_password(const char *smb_name, DATA_BLOB plaintext_pass
if (!NT_STATUS_IS_OK(nt_status = make_auth_context_subsystem(&plaintext_auth_context))) {
return nt_status;
}
-
+
chal = plaintext_auth_context->get_ntlm_challenge(plaintext_auth_context);
-
+
if (!make_user_info_for_reply(&user_info,
smb_name, lp_workgroup(), chal,
plaintext_password)) {
return NT_STATUS_NO_MEMORY;
}
-
+
nt_status = plaintext_auth_context->check_ntlm_password(plaintext_auth_context,
user_info, server_info);
-
+
(plaintext_auth_context->free)(&plaintext_auth_context);
free_user_info(&user_info);
return nt_status;
@@ -97,7 +97,7 @@ bool password_ok(const char *smb_name, DATA_BLOB password_blob)
DATA_BLOB null_password = data_blob_null;
bool encrypted = (global_encrypted_passwords_negotiated && (password_blob.length == 24 || password_blob.length > 46));
-
+
if (encrypted) {
/*
* The password could be either NTLM or plain LM. Try NTLM first,
@@ -116,7 +116,7 @@ bool password_ok(const char *smb_name, DATA_BLOB password_blob)
if (NT_STATUS_IS_OK(pass_check_smb(smb_name, lp_workgroup(), null_password, password_blob, null_password, encrypted))) {
return True;
}
-
+
if (NT_STATUS_IS_OK(pass_check_smb(smb_name, lp_workgroup(), password_blob, null_password, null_password, encrypted))) {
return True;
}
diff --git a/source3/include/auth.h b/source3/include/auth.h
index adcd6e9..17bccce 100644
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -4,17 +4,17 @@
Unix SMB/CIFS implementation.
Standardised Authentication types
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 <http://www.gnu.org/licenses/>.
*/
@@ -25,9 +25,9 @@ typedef struct auth_usersupplied_info {
DATA_BLOB lm_interactive_pwd;
DATA_BLOB nt_interactive_pwd;
DATA_BLOB plaintext_password;
-
+
bool encrypted;
-
+
bool was_mapped; /* Did the username map actually match? */
char *client_domain; /* domain name string */
char *domain; /* domain name after mapping */
@@ -35,7 +35,7 @@ typedef struct auth_usersupplied_info {
char *smb_name; /* username before mapping */
char *wksta_name; /* workstation name (netbios calling
* name) unicode string */
-
+
uint32 logon_parameters;
} auth_usersupplied_info;
@@ -50,16 +50,16 @@ typedef struct auth_serversupplied_info {
struct unix_user_token utok;
/* NT group information taken from the info3 structure */
-
+
NT_USER_TOKEN *ptok;
-
+
DATA_BLOB user_session_key;
DATA_BLOB lm_session_key;
char *login_server; /* which server authorized the login? */
-
+
struct samu *sam_account;
-
+
void *pam_handle;
/*
@@ -118,7 +118,7 @@ typedef struct auth_methods
DATA_BLOB (*get_chal)(const struct auth_context *auth_context,
void **my_private_data,
TALLOC_CTX *mem_ctx);
-
+
/* Used to keep tabs on things like the cli for SMB server authentication */
void *private_data;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4efcbba..03c0216 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -801,7 +801,7 @@ bool set_remote_machine_name(const char *remote_name, bool perm);
const char *get_remote_machine_name(void);
void sub_set_smb_name(const char *name);
void set_current_user_info(const char *smb_name, const char *unix_name,
- const char *full_name, const char *domain);
+ const char *domain);
const char *get_current_username(void);
void standard_sub_basic(const char *smb_name, const char *domain_name,
char *str, size_t len);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 3c727ba..799ffe1 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -647,7 +647,6 @@ struct smb_request {
typedef struct {
fstring smb_name; /* user name from the client */
fstring unix_name; /* unix user name of a validated user */
- fstring full_name; /* to store full name (such as "Joe Bloggs") from gecos field of password file */
fstring domain; /* domain that the client specified */
} userdom_struct;
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index b4f5f70..0cb3269 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -216,11 +216,10 @@ static const char *get_smb_user_name(void)
********************************************************************/
void set_current_user_info(const char *smb_name, const char *unix_name,
- const char *full_name, const char *domain)
+ const char *domain)
{
fstrcpy(current_user_info.smb_name, smb_name);
fstrcpy(current_user_info.unix_name, unix_name);
- fstrcpy(current_user_info.full_name, full_name);
fstrcpy(current_user_info.domain, domain);
/* The following is safe as current_user_info.smb_name
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 293ba85..15d120a 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -309,7 +309,6 @@ int register_existing_vuid(uint16 vuid,
set_current_user_info(
vuser->server_info->sanitized_username,
vuser->server_info->unix_name,
- pdb_get_fullname(vuser->server_info->sam_account),
pdb_get_domain(vuser->server_info->sam_account));
return vuser->vuid;
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index ae115f3..44cacfa 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1380,8 +1380,6 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req, in
set_current_user_info(
vuser->server_info->sanitized_username,
vuser->server_info->unix_name,
- pdb_get_fullname(vuser->server_info
- ->sam_account),
pdb_get_domain(vuser->server_info
->sam_account));
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list