summaryrefslogtreecommitdiff
path: root/source3/passdb
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-01-02 13:10:25 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-01-02 13:10:25 +0000
commitff18825765440497a4eda97d6aaf7ff327db64bb (patch)
tree229acdab7c4ec99adff55e4d5bbca669c29c64fe /source3/passdb
parent81c6415aa14d86630531d741a1c4c4f552cb84af (diff)
downloadsamba-ff18825765440497a4eda97d6aaf7ff327db64bb.tar.gz
samba-ff18825765440497a4eda97d6aaf7ff327db64bb.tar.bz2
samba-ff18825765440497a4eda97d6aaf7ff327db64bb.zip
We already have one function to move unistr2 -> multibyte-static, so we
don't need a second just for pdb. Also, remove magic 'is lp_guest_account' test - the magic RID should be up to the passdb backend to set. Andrew Bartlett (This used to be commit f71c8338d35a2e8c73c3d8006ea6858cb522c715)
Diffstat (limited to 'source3/passdb')
-rw-r--r--source3/passdb/passdb.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index e13f0e9dfb..71a880d295 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -826,8 +826,6 @@ DOM_SID *local_uid_to_sid(DOM_SID *psid, uid_t uid)
if (pdb_getsampwnam(sam_user, pass->pw_name)) {
sid_copy(psid, pdb_get_user_sid(sam_user));
- } else if (strcmp(pass->pw_name, lp_guestaccount()) == 0) {
- sid_append_rid(psid, DOMAIN_USER_RID_GUEST);
} else {
sid_append_rid(psid, fallback_pdb_uid_to_user_rid(uid));
}
@@ -991,23 +989,6 @@ BOOL local_sid_to_gid(gid_t *pgid, const DOM_SID *psid, enum SID_NAME_USE *name_
return True;
}
-/**
- * Quick hack to do an easy ucs2 -> mulitbyte conversion
- * @return static buffer containing the converted string
- **/
-
-const char *pdb_unistr2_convert(const UNISTR2 *from)
-{
- static pstring convert_buffer;
- *convert_buffer = 0;
- if (!from) {
- return NULL;
- }
-
- unistr2_to_ascii(convert_buffer, from, sizeof(pstring));
- return convert_buffer;
-}
-
/*************************************************************
Change a password entry in the local smbpasswd file.