"userdom_struct" does not need "full_name" anymore -- unused

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4efcbba6a8aae3936bc6a66ffb53fdef7d2db6af..03c021683ab28e10f2a4cb375808d296f078b2ae 100644 (file)
--- 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 *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);
 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 3c727bafbf85d00b74838414ee2c7850a375b109..799ffe1a462b9a2b805d59c8a48af1a485fc7bb3 100644 (file)
--- 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 */
 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;
 
        fstring domain; /* domain that the client specified */
 } userdom_struct;
 

diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index b4f5f70fa05cd2b17d967c4b106a8241419d384d..0cb326961d767478086984e8ab9ad246fcb966fb 100644 (file)
--- 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,
 ********************************************************************/
 
 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.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
        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 293ba85852dadd8221910f279dbcf2c9e0deac8d..15d120a79c4fba298d926679faa8d71adc4011cb 100644 (file)
--- 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,
        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;
                pdb_get_domain(vuser->server_info->sam_account));
 
        return vuser->vuid;

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index ae115f399114072d2f4ce97276822ca5f23d99fd..44cacfafddd97cd3e5f41bfd5bf0a6d6e36c364a 100644 (file)
--- 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,
                                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));
                        }
                                        pdb_get_domain(vuser->server_info
                                                       ->sam_account));
                        }