diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-03 15:22:13 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:10 -0800 |
| commit | e23c7adb1a5f23aa3b688e76888c778e12368320 (patch) | |
| tree | cd20729b64ed76381bbf7958bd0e1bd63a2bb6e4 /source3/passdb | |
| parent | 7c0f3ea1304293fd1505706e597eebb640d224e3 (diff) | |
| download | samba-e23c7adb1a5f23aa3b688e76888c778e12368320.tar.gz samba-e23c7adb1a5f23aa3b688e76888c778e12368320.tar.xz samba-e23c7adb1a5f23aa3b688e76888c778e12368320.zip | |
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>
Diffstat (limited to 'source3/passdb')
| -rw-r--r-- | source3/passdb/passdb.c | 2 | ||||
| -rw-r--r-- | source3/passdb/pdb_interface.c | 2 | ||||
| -rw-r--r-- | source3/passdb/pdb_smbpasswd.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 5a4620f6cb3..8cf592cc401 100644 --- 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 ea67e2faf51..8529aa24402 100644 --- 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 83785c68a1a..8b0cd7aa360 100644 --- 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; |