From 7e3838dd2d8647e9c621a08c61a2a22ef1d94bb2 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 27 Aug 2005 15:13:15 +0000 Subject: r9685: Add tests for samba3sam mapping module Fix a couple of bugs Move samba3sam backend to lib/ldb/ Remove some more unused parameters (This used to be commit 7f864d446d6af7cfd9fb8dbc496a29b36ec57ce9) --- source4/lib/samba3/config.mk | 1 - source4/lib/samba3/ldb_samba3.c | 198 ---------------------------------------- 2 files changed, 199 deletions(-) delete mode 100644 source4/lib/samba3/ldb_samba3.c (limited to 'source4/lib/samba3') diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk index eba694c2af..06b7e5e256 100644 --- a/source4/lib/samba3/config.mk +++ b/source4/lib/samba3/config.mk @@ -11,7 +11,6 @@ ADD_OBJ_FILES = \ lib/samba3/group.o \ lib/samba3/registry.o \ lib/samba3/secrets.o \ - lib/samba3/ldb_samba3.o \ lib/samba3/share_info.o \ lib/samba3/upgrade.o # End SUBSYSTEM LIBSAMBA3 diff --git a/source4/lib/samba3/ldb_samba3.c b/source4/lib/samba3/ldb_samba3.c deleted file mode 100644 index 68f5412c90..0000000000 --- a/source4/lib/samba3/ldb_samba3.c +++ /dev/null @@ -1,198 +0,0 @@ -/* - ldb database library - Samba3 compatibility backend - - Copyright (C) Jelmer Vernooij 2005 - - ** NOTE! The following LGPL license applies to the ldb - ** library. This does NOT imply that all of Samba is released - ** under the LGPL - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "includes.h" -#include "ldb/ldb_map/ldb_map.h" -#include "ldb/include/ldb.h" -#include "ldb/include/ldb_private.h" - -/* FIXME: - * sambaSID -> member - * sambaSIDList -> member (special!) - * sambaDomainName -> name - * sambaTrustPassword - * sambaUnixIdPool - * sambaIdmapEntry - * sambaAccountPolicy - * sambaSidEntry - * sambaAcctFlags -> systemFlags ? - * sambaPasswordHistory -> ntPwdHistory*/ - -/* Not necessary: - * sambaConfig - * sambaShare - * sambaConfigOption - * sambaNextGroupRid - * sambaNextUserRid - * sambaAlgorithmicRidBase - */ - -/* Not in Samba4: - * sambaKickoffTime - * sambaPwdCanChange - * sambaPwdMustChange - * sambaHomePath - * sambaHomeDrive - * sambaLogonScript - * sambaProfilePath - * sambaUserWorkstations - * sambaMungedDial - * sambaLogonHours */ - - - -const struct ldb_map_objectclass samba3_objectclasses[] = { - { "group", "sambaGroupMapping" }, - { "user", "sambaSAMAccount" }, - { "domain", "sambaDomain" }, -}; - -const struct ldb_map_attribute samba3_attributes[] = -{ - /* sambaNextRid -> nextRid */ - { - .local_name = "nextRid", - .type = MAP_RENAME, - .u.rename.remote_name = "sambaNextRid", - }, - - /* sambaBadPasswordTime -> badPasswordtime*/ - { - .local_name = "badPasswordTime", - .type = MAP_RENAME, - .u.rename.remote_name = "sambaBadPasswordTime", - }, - - /* sambaLMPassword -> lmPwdHash*/ - { - .local_name = "lmPwdHash", - .type = MAP_RENAME, - .u.rename.remote_name = "sambaLMPassword", - }, - - /* sambaGroupType -> groupType */ - { - .local_name = "groupType", - .type = MAP_RENAME, - .u.rename.remote_name = "sambaGroupType", - }, - - /* sambaNTPassword -> ntPwdHash*/ - { - .local_name = "badPwdCount", - .type = MAP_RENAME, - .u.rename.remote_name = "sambaNTPassword", - }, - - /* sambaPrimaryGroupSID -> primaryGroupID */ - { - .local_name = "primaryGroupID", - .type = MAP_CONVERT, - .u.convert.remote_name = "sambaPrimaryGroupSID", - .u.convert.convert_local = NULL, /* FIXME: Add domain SID */ - .u.convert.convert_remote = NULL, /* FIXME: Extract RID */ - }, - - /* sambaBadPasswordCount -> badPwdCount */ - { - .local_name = "badPwdCount", - .type = MAP_RENAME, - .u.rename.remote_name = "sambaBadPasswordCount", - }, - - /* sambaLogonTime -> lastLogon*/ - { - .local_name = "lastLogon", - .type = MAP_RENAME, - .u.rename.remote_name = "sambaLogonTime", - }, - - /* sambaLogoffTime -> lastLogoff*/ - { - .local_name = "lastLogoff", - .type = MAP_RENAME, - .u.rename.remote_name = "sambaLogoffTime", - }, - - /* gidNumber -> unixName */ - { - .local_name = "unixName", - .type = MAP_CONVERT, - .u.convert.remote_name = "gidNumber", - .u.convert.convert_local = NULL, /* FIXME: Lookup gid */ - .u.convert.convert_remote = NULL, /* FIXME: Lookup groupname */ - }, - - /* uid -> unixName */ - { - .local_name = "unixName", - .type = MAP_CONVERT, - .u.convert.remote_name = "uid", - .u.convert.convert_local = NULL, /* FIXME: Lookup uid */ - .u.convert.convert_remote = NULL, /* FIXME: Lookup username */ - }, - - /* displayName -> name */ - { - .local_name = "name", - .type = MAP_RENAME, - .u.rename.remote_name = "displayName", - }, - - /* cn */ - { - .local_name = "cn", - .type = MAP_KEEP, - }, - - /* description */ - { - .local_name = "description", - .type = MAP_KEEP, - }, - - /* sambaSID -> objectSid*/ - { - .local_name = "objectSid", - .type = MAP_RENAME, - .u.rename.remote_name = "sambaSID", - }, - - /* sambaPwdLastSet -> pwdLastSet*/ - { - .local_name = "pwdLastSet", - .type = MAP_RENAME, - .u.rename.remote_name = "sambaPwdLastSet", - }, -}; - - /* the init function */ -#ifdef HAVE_DLOPEN_DISABLED - struct ldb_module *init_module(struct ldb_context *ldb, const char *options[]) -#else - struct ldb_module *ldb_samba3_module_init(struct ldb_context *ldb, const char *options[]) -#endif -{ - return ldb_map_init(ldb, &samba3_attributes, &samba3_objectclasses, options); -} -- cgit