From ff18825765440497a4eda97d6aaf7ff327db64bb Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 2 Jan 2003 13:10:25 +0000 Subject: 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) --- source3/passdb/passdb.c | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'source3/passdb') 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. -- cgit