param: rename lp function and variable from 'guestaccount' to 'guest_account'

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 88cb915dd829297ad83f61328acd6dddbf4329dd..247a129c23d8569392d4f0d58c08e6f23f188ad3 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -243,7 +243,7 @@ FN_GLOBAL_CONST_STRING(dedicated_keytab_file, dedicated_keytab_file)
 FN_GLOBAL_CONST_STRING(dnsdomain, dnsdomain)
 FN_GLOBAL_CONST_STRING(dns_forwarder, dns_forwarder)
 FN_GLOBAL_CONST_STRING(dos_charset, dos_charset)
-FN_GLOBAL_CONST_STRING(guestaccount, guestaccount)
+FN_GLOBAL_CONST_STRING(guest_account, guest_account)
 FN_GLOBAL_CONST_STRING(lockdir, lockdir)
 FN_GLOBAL_CONST_STRING(logon_drive, logon_drive)
 FN_GLOBAL_CONST_STRING(logon_home, logon_home)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 5d0ab2cb43e548e887d34a6483300ac9da9f2a3d..ebd1f438da934cf5282866dd786f02e79af513f8 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -583,7 +583,7 @@ static struct parm_struct parm_table[] = {
                .label          = "guest account",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(guestaccount),
+               .offset         = GLOBAL_VAR(guest_account),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED,

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 24190afb491d661b0e8ef8b84aabadf919d27dcb..5ac9ebde4b349d1e603a11fc96b008c8d625e362 100644 (file)
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -721,7 +721,7 @@ static NTSTATUS get_system_info3(TALLOC_CTX *mem_ctx,
 static NTSTATUS get_guest_info3(TALLOC_CTX *mem_ctx,
                                struct netr_SamInfo3 *info3)
 {
-       const char *guest_account = lp_guestaccount();
+       const char *guest_account = lp_guest_account();
        struct dom_sid domain_sid;
        struct passwd *pwd;
        const char *tmp;
@@ -782,7 +782,7 @@ static NTSTATUS get_guest_info3(TALLOC_CTX *mem_ctx,
 static NTSTATUS make_new_session_info_guest(struct auth_session_info **session_info, struct auth_serversupplied_info **server_info)
 {
        static const char zeros[16] = {0};
-       const char *guest_account = lp_guestaccount();
+       const char *guest_account = lp_guest_account();
        const char *domain = lp_netbios_name();
        struct netr_SamInfo3 info3;
        TALLOC_CTX *tmp_ctx;

diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index d86d589cc3d6ff14d6c6491fb33d79fa63bca84c..936846c16fa7468951ccf11311b98d4305b015a8 100644 (file)
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -619,7 +619,7 @@ static NTSTATUS create_token_from_sid(TALLOC_CTX *mem_ctx,
 
                /*
                 * If the SID from lookup_name() was the guest sid, passdb knows
-                * about the mapping of guest sid to lp_guestaccount()
+                * about the mapping of guest sid to lp_guest_account()
                 * username and will return the unix_pw info for a guest
                 * user. Use it if it's there, else lookup the *uid details
                 * using Get_Pwnam_alloc(). See bug #6291 for details. JRA.

diff --git a/source3/auth/user_krb5.c b/source3/auth/user_krb5.c
index 7d44285d5112bd1cc1c503d32338ad3ac44c4407..2650e27feb7ea2865162ef1bb14c0b6fcdce7858 100644 (file)
--- a/source3/auth/user_krb5.c
+++ b/source3/auth/user_krb5.c
@@ -151,7 +151,7 @@ NTSTATUS get_user_from_kerberos_info(TALLOC_CTX *mem_ctx,
 
                if (lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_UID) {
                        *mapped_to_guest = true;
-                       fuser = talloc_strdup(mem_ctx, lp_guestaccount());
+                       fuser = talloc_strdup(mem_ctx, lp_guest_account());
                        if (!fuser) {
                                return NT_STATUS_NO_MEMORY;
                        }

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 90f09562d14736fd570c9edb24d0d6581d6e8ba9..c7a95e1607775b8d78f398ce00a8dcbbfaca382a 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -752,7 +752,7 @@ static void init_globals(bool reinit_globals)
        string_set(&Globals.mangling_method, "hash2");
        Globals.mangle_prefix = 1;
 
-       string_set(&Globals.guestaccount, GUEST_ACCOUNT);
+       string_set(&Globals.guest_account, GUEST_ACCOUNT);
 
        /* using UTF8 by default allows us to support all chars */
        string_set(&Globals.unix_charset, DEFAULT_UNIX_CHARSET);

diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 5a4620f6cb3292055672b9e38edbb294aa40d9a4..8cf592cc40149b723486893a89f4ef9f845f71ee 100644 (file)
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -148,7 +148,7 @@ static int count_commas(const char *str)
 static NTSTATUS samu_set_unix_internal(struct pdb_methods *methods,
                                       struct samu *user, const struct passwd *pwd, bool create)
 {
-       const char *guest_account = lp_guestaccount();
+       const char *guest_account = lp_guest_account();
        const char *domain = lp_netbios_name();
        char *fullname;
        uint32_t urid;

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index ea67e2faf51d5e7602e40dfc914b18c71743bb50..8529aa24402e8514688cf64188ac536f223760e5 100644 (file)
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -367,7 +367,7 @@ static bool guest_user_info( struct samu *user )
 {
        struct passwd *pwd;
        NTSTATUS result;
-       const char *guestname = lp_guestaccount();
+       const char *guestname = lp_guest_account();
 
        pwd = Get_Pwnam_alloc(talloc_tos(), guestname);
        if (pwd == NULL) {

diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 83785c68a1aacc2b9c84f0cc5ed43224404d22a1..8b0cd7aa360a7a407d3790028b05172acd2d5b1e 100644 (file)
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -1206,9 +1206,9 @@ static bool build_smb_pass (struct smb_passwd *smb_pw, const struct samu *sampas
 
                /* If the user specified a RID, make sure its able to be both stored and retreived */
                if (rid == DOMAIN_RID_GUEST) {
-                       struct passwd *passwd = Get_Pwnam_alloc(NULL, lp_guestaccount());
+                       struct passwd *passwd = Get_Pwnam_alloc(NULL, lp_guest_account());
                        if (!passwd) {
-                               DEBUG(0, ("Could not find guest account via Get_Pwnam_alloc()! (%s)\n", lp_guestaccount()));
+                               DEBUG(0, ("Could not find guest account via Get_Pwnam_alloc()! (%s)\n", lp_guest_account()));
                                return False;
                        }
                        smb_pw->smb_userid=passwd->pw_uid;
@@ -1343,7 +1343,7 @@ static NTSTATUS smbpasswd_getsampwsid(struct pdb_methods *my_methods, struct sam
 
        /* More special case 'guest account' hacks... */
        if (rid == DOMAIN_RID_GUEST) {
-               const char *guest_account = lp_guestaccount();
+               const char *guest_account = lp_guest_account();
                if (!(guest_account && *guest_account)) {
                        DEBUG(1, ("Guest account not specfied!\n"));
                        return nt_status;

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 02938d405c9ede1089e4556d59b42e5bea408d5e..cc727a9a73ffacca7a768fa7e427d84c50eff29f 100644 (file)
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -902,7 +902,7 @@ static WERROR init_srv_sess_info_1(struct pipes_struct *p,
                bool guest;
 
                connect_time = (uint32_t)(now - session_list[resume_handle].connect_start);
-               guest = strequal( session_list[resume_handle].username, lp_guestaccount() );
+               guest = strequal( session_list[resume_handle].username, lp_guest_account() );
 
                ctr1->array[num_entries].client         = session_list[resume_handle].remote_machine;
                ctr1->array[num_entries].user           = session_list[resume_handle].username;

diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index 8e5e6d8a93fb7ff5e9d07ae64b1c20d5760e7566..16c0e3b1109178b8a7986b69abe25a2ff2188894 100644 (file)
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -37,7 +37,7 @@ bool change_to_guest(void)
 {
        struct passwd *pass;
 
-       pass = Get_Pwnam_alloc(talloc_tos(), lp_guestaccount());
+       pass = Get_Pwnam_alloc(talloc_tos(), lp_guest_account());
        if (!pass) {
                return false;
        }

diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index b7b76e80937a6750869dcfaaced3f4f662888e69..aadabc1435402999e696af8038cf23ea553f0de7 100644 (file)
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -1948,7 +1948,7 @@ doma_done:
                goto failed;
        }
 
-       if (!pdb_getsampwnam(samuser, lp_guestaccount())) {
+       if (!pdb_getsampwnam(samuser, lp_guest_account())) {
                LDAPMod **mods = NULL;
                struct dom_sid sid;
                char *dn;
@@ -1960,7 +1960,7 @@ doma_done:
 
                sid_compose(&sid, get_global_sam_sid(), DOMAIN_RID_GUEST);
 
-               pwd = Get_Pwnam_alloc(tc, lp_guestaccount());
+               pwd = Get_Pwnam_alloc(tc, lp_guest_account());
 
                if (!pwd) {
                        if (domusers_gid == -1) {
@@ -1973,7 +1973,7 @@ doma_done:
                                d_fprintf(stderr, _("talloc failed\n"));
                                goto done;
                        }
-                       pwd->pw_name = talloc_strdup(pwd, lp_guestaccount());
+                       pwd->pw_name = talloc_strdup(pwd, lp_guest_account());
 
                        if (is_ipa) {
                                pwd->pw_uid = 999;
@@ -2042,7 +2042,7 @@ doma_done:
                }
 
                if (is_ipa) {
-                       if (!pdb_getsampwnam(samuser, lp_guestaccount())) {
+                       if (!pdb_getsampwnam(samuser, lp_guest_account())) {
                                d_fprintf(stderr, _("Failed to read just "
                                                    "created user.\n"));
                                goto failed;
@@ -2054,7 +2054,7 @@ doma_done:
 
        d_printf(_("Checking Guest's group.\n"));
 
-       pwd = Get_Pwnam_alloc(tc, lp_guestaccount());
+       pwd = Get_Pwnam_alloc(tc, lp_guest_account());
        if (!pwd) {
                d_fprintf(stderr,
                          _("Failed to find just created Guest account!\n"