summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/include/smb.h1
-rw-r--r--source3/lib/substitute.c3
-rw-r--r--source3/smbd/password.c1
-rw-r--r--source3/smbd/process.c2
5 files changed, 2 insertions, 7 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4efcbba6a8..03c021683a 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 3c727bafbf..799ffe1a46 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 b4f5f70fa0..0cb326961d 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 293ba85852..15d120a79c 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 ae115f3991..44cacfafdd 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));
}