diff options
| -rw-r--r-- | source4/dsdb/config.mk | 10 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samba3sam.c (renamed from source4/lib/ldb/samba/samba3sam.c) | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/config.mk | 5 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_map/README | 29 | ||||
| -rw-r--r-- | source4/lib/ldb/modules/ldb_map.c (renamed from source4/lib/ldb/ldb_map/ldb_map.c) | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/modules/ldb_map.h (renamed from source4/lib/ldb/ldb_map/ldb_map.h) | 0 | ||||
| -rw-r--r-- | source4/lib/ldb/tests/samba3.ldif | 200 | ||||
| -rw-r--r-- | source4/lib/samba3/PLAN | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | source4/setup/upgrade | 0 |
9 files changed, 16 insertions, 235 deletions
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk index 8f66eab39c..0b03d221ba 100644 --- a/source4/dsdb/config.mk +++ b/source4/dsdb/config.mk @@ -22,6 +22,16 @@ INIT_OBJ_FILES = \ ################################################ ################################################ +# Start MODULE libldb_samba3sam +[MODULE::libldb_samba3sam] +SUBSYSTEM = LIBLDB +INIT_OBJ_FILES = \ + dsdb/samdb/ldb_modules/samba3sam.o +# +# End MODULE libldb_samldb +################################################ + +################################################ # Start SUBSYSTEM SAMDB [SUBSYSTEM::SAMDB] INIT_OBJ_FILES = \ diff --git a/source4/lib/ldb/samba/samba3sam.c b/source4/dsdb/samdb/ldb_modules/samba3sam.c index f7d83ced8f..444d7e8d12 100644 --- a/source4/lib/ldb/samba/samba3sam.c +++ b/source4/dsdb/samdb/ldb_modules/samba3sam.c @@ -23,7 +23,7 @@ */ #include "includes.h" -#include "ldb/ldb_map/ldb_map.h" +#include "ldb/modules/ldb_map.h" #include "ldb/include/ldb.h" #include "ldb/include/ldb_private.h" diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 23a99e367b..f75964c44f 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -41,7 +41,7 @@ NOPROTO = YES # Start MODULE libldb_map [MODULE::libldb_map] SUBSYSTEM = LIBLDB -INIT_OBJ_FILES = lib/ldb/ldb_map/ldb_map.o +INIT_OBJ_FILES = lib/ldb/modules/ldb_map.o # End MODULE libldb_map ################################################ @@ -115,8 +115,7 @@ REQUIRED_SUBSYSTEMS = \ # Start SUBSYSTEM LDBSAMBA [SUBSYSTEM::LDBSAMBA] OBJ_FILES = \ - lib/ldb/samba/ldif_handlers.o \ - lib/ldb/samba/samba3sam.o + lib/ldb/samba/ldif_handlers.o # End SUBSYSTEM LDBSAMBA ################################################ diff --git a/source4/lib/ldb/ldb_map/README b/source4/lib/ldb/ldb_map/README deleted file mode 100644 index 3c7e30a331..0000000000 --- a/source4/lib/ldb/ldb_map/README +++ /dev/null @@ -1,29 +0,0 @@ -This directory contains a skeleton backend for ldb backends that allow -using an LDAP server while mapping the attributes in that schema to -another schema. This backend will never be used itself but instead have -other backends based on it (e.g. ldb_samba3 for a Samba3-LDAP-to-samdb -backend) - -Each backend that uses this skeleton has to specify an array of -struct objectclass_mapping's (see ldb_map.h). - -If no mappings are defined for an objectclass, it will be kept as is. - -Special mapping routine for dn's (calls rdn mapping routine) -Special mapping routine for rdn's - -Keep cache of mapped dn's so we don't have to traverse the tree each time - -search - Simply uses search_bytree - -search_bytree - Map all attributes in parse_tree - -add -modify - Map ldb_message to LDAPMod - -rename -delete - Simply map dn diff --git a/source4/lib/ldb/ldb_map/ldb_map.c b/source4/lib/ldb/modules/ldb_map.c index 7a620f3b81..531d5ccd67 100644 --- a/source4/lib/ldb/ldb_map/ldb_map.c +++ b/source4/lib/ldb/modules/ldb_map.c @@ -25,7 +25,7 @@ #include "includes.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_private.h" -#include "lib/ldb/ldb_map/ldb_map.h" +#include "lib/ldb/modules/ldb_map.h" /* TODO: * - objectclass hint in ldb_map_attribute diff --git a/source4/lib/ldb/ldb_map/ldb_map.h b/source4/lib/ldb/modules/ldb_map.h index 02fec649c6..02fec649c6 100644 --- a/source4/lib/ldb/ldb_map/ldb_map.h +++ b/source4/lib/ldb/modules/ldb_map.h diff --git a/source4/lib/ldb/tests/samba3.ldif b/source4/lib/ldb/tests/samba3.ldif deleted file mode 100644 index 035eb1c516..0000000000 --- a/source4/lib/ldb/tests/samba3.ldif +++ /dev/null @@ -1,200 +0,0 @@ -dn: ou=Users,ou=Tests,dc=vernstok,dc=nl -objectClass: organizationalUnit -ou: Users - -dn: ou=Groups,ou=Tests,dc=vernstok,dc=nl -objectClass: organizationalUnit -ou: Groups - -dn: uid=nobody,ou=Users,ou=Tests,dc=vernstok,dc=nl -cn: nobody -sn: nobody -objectClass: inetOrgPerson -objectClass: sambaSAMAccount -objectClass: posixAccount -objectClass: shadowAccount -gidNumber: 514 -uid: nobody -uidNumber: 999 -homeDirectory: /dev/null -sambaPwdLastSet: 0 -sambaLogonTime: 0 -sambaLogoffTime: 2147483647 -sambaKickoffTime: 2147483647 -sambaPwdCanChange: 0 -sambaPwdMustChange: 2147483647 -sambaHomePath: \\PDC-SMB3\home\%U -sambaHomeDrive: H: -sambaProfilePath: \\PDC-SMB3\profiles\%U\nobody -sambaPrimaryGroupSID: S-1-5-21-4231626423-2410014848-2360679739-514 -sambaLMPassword: NO PASSWORDXXXXXXXXXXXXXXXXXXXXX -sambaNTPassword: NO PASSWORDXXXXXXXXXXXXXXXXXXXXX -sambaAcctFlags: [NU ] -sambaSID: S-1-5-21-4231626423-2410014848-2360679739-2998 -loginShell: /bin/false - -dn: cn=Domain Admins,ou=Groups,ou=Tests,dc=vernstok,dc=nl -objectClass: posixGroup -objectClass: sambaGroupMapping -gidNumber: 512 -cn: Domain Admins -memberUid: Administrator -description: Netbios Domain Administrators -sambaSID: S-1-5-21-4231626423-2410014848-2360679739-512 -sambaGroupType: 2 -displayName: Domain Admins - -dn: cn=Domain Users,ou=Groups,ou=Tests,dc=vernstok,dc=nl -objectClass: posixGroup -objectClass: sambaGroupMapping -gidNumber: 513 -cn: Domain Users -description: Netbios Domain Users -sambaSID: S-1-5-21-4231626423-2410014848-2360679739-513 -sambaGroupType: 2 -displayName: Domain Users - -dn: cn=Domain Guests,ou=Groups,ou=Tests,dc=vernstok,dc=nl -objectClass: posixGroup -objectClass: sambaGroupMapping -gidNumber: 514 -cn: Domain Guests -description: Netbios Domain Guests Users -sambaSID: S-1-5-21-4231626423-2410014848-2360679739-514 -sambaGroupType: 2 -displayName: Domain Guests - -dn: cn=Print Operators,ou=Groups,ou=Tests,dc=vernstok,dc=nl -objectClass: posixGroup -objectClass: sambaGroupMapping -gidNumber: 550 -cn: Print Operators -description: Netbios Domain Print Operators -sambaSID: S-1-5-21-4231626423-2410014848-2360679739-550 -sambaGroupType: 2 -displayName: Print Operators - -dn: cn=Backup Operators,ou=Groups,ou=Tests,dc=vernstok,dc=nl -objectClass: posixGroup -objectClass: sambaGroupMapping -gidNumber: 551 -cn: Backup Operators -description: Netbios Domain Members can bypass file security to back up files -sambaSID: S-1-5-21-4231626423-2410014848-2360679739-551 -sambaGroupType: 2 -displayName: Backup Operators - -dn: cn=Replicator,ou=Groups,ou=Tests,dc=vernstok,dc=nl -objectClass: posixGroup -objectClass: sambaGroupMapping -gidNumber: 552 -cn: Replicator -description: Netbios Domain Supports file replication in a sambaDomainName -sambaSID: S-1-5-21-4231626423-2410014848-2360679739-552 -sambaGroupType: 2 -displayName: Replicator - -dn: cn=Domain Computers,ou=Groups,ou=Tests,dc=vernstok,dc=nl -objectClass: posixGroup -objectClass: sambaGroupMapping -gidNumber: 553 -cn: Domain Computers -description: Netbios Domain Computers accounts -sambaSID: S-1-5-21-4231626423-2410014848-2360679739-553 -sambaGroupType: 2 -displayName: Domain Computers - -dn: cn=Administrators,ou=Groups,ou=Tests,dc=vernstok,dc=nl -objectClass: posixGroup -objectClass: sambaGroupMapping -gidNumber: 544 -cn: Administrators -description: Netbios Domain Members can fully administer the computer/sambaDomainName -sambaSID: S-1-5-21-4231626423-2410014848-2360679739-544 -sambaGroupType: 2 -displayName: Administrators - -dn: cn=Users,ou=Groups,ou=Tests,dc=vernstok,dc=nl -objectClass: posixGroup -objectClass: sambaGroupMapping -gidNumber: 545 -cn: Users -description: Netbios Domain Ordinary users -sambaSID: S-1-5-21-4231626423-2410014848-2360679739-545 -sambaGroupType: 2 -displayName: users - -dn: cn=Guests,ou=Groups,ou=Tests,dc=vernstok,dc=nl -objectClass: posixGroup -objectClass: sambaGroupMapping -gidNumber: 546 -cn: Guests -memberUid: nobody -description: Netbios Domain Users granted guest access to the computer/sambaDomainName -sambaSID: S-1-5-21-4231626423-2410014848-2360679739-546 -sambaGroupType: 2 -displayName: Guests - -dn: cn=Power Users,ou=Groups,ou=Tests,dc=vernstok,dc=nl -objectClass: posixGroup -objectClass: sambaGroupMapping -gidNumber: 547 -cn: Power Users -description: Netbios Domain Members can share directories and printers -sambaSID: S-1-5-21-4231626423-2410014848-2360679739-547 -sambaGroupType: 2 -displayName: Power Users - -dn: cn=Account Operators,ou=Groups,ou=Tests,dc=vernstok,dc=nl -objectClass: posixGroup -objectClass: sambaGroupMapping -gidNumber: 548 -cn: Account Operators -description: Netbios Domain Users to manipulate users accounts -sambaSID: S-1-5-21-4231626423-2410014848-2360679739-548 -sambaGroupType: 2 -displayName: Account Operators - -dn: cn=Server Operators,ou=Groups,ou=Tests,dc=vernstok,dc=nl -objectClass: posixGroup -objectClass: sambaGroupMapping -gidNumber: 549 -cn: Server Operators -description: Netbios Domain Server Operators -sambaSID: S-1-5-21-4231626423-2410014848-2360679739-549 -sambaGroupType: 2 -displayName: Server Operators - -dn: ou=Computers,ou=Tests,dc=vernstok,dc=nl -objectClass: organizationalUnit -ou: Computers - -dn: uid=Administrator,ou=Users,ou=Tests,dc=vernstok,dc=nl -cn: Administrator -sn: Administrator -objectClass: inetOrgPerson -objectClass: sambaSAMAccount -objectClass: posixAccount -objectClass: shadowAccount -gidNumber: 512 -uid: Administrator -uidNumber: 0 -homeDirectory: /home/%U -sambaPwdLastSet: 0 -sambaLogonTime: 0 -sambaLogoffTime: 2147483647 -sambaKickoffTime: 2147483647 -sambaPwdCanChange: 0 -sambaPwdMustChange: 2147483647 -sambaHomePath: \\PDC-SMB3\home\%U -sambaHomeDrive: H: -sambaProfilePath: \\PDC-SMB3\profiles\%U\Administrator -sambaPrimaryGroupSID: S-1-5-21-4231626423-2410014848-2360679739-512 -sambaLMPassword: XXX -sambaNTPassword: XXX -sambaAcctFlags: [U ] -sambaSID: S-1-5-21-4231626423-2410014848-2360679739-2996 -loginShell: /bin/false -gecos: Netbios Domain Administrator - - diff --git a/source4/lib/samba3/PLAN b/source4/lib/samba3/PLAN index abc3d5d6ae..67395ca84c 100644 --- a/source4/lib/samba3/PLAN +++ b/source4/lib/samba3/PLAN @@ -1,4 +1,5 @@ TODO (SoC project): - move ini parsing stuff to seperate file param/ini.c - - test ldb_map backend (testsuite?) - parse "passdb backend" setting and parse tdbsam/passdb based on it + - test ldb_map backend (testsuite?) + - testsuite for the static upgrade diff --git a/source4/setup/upgrade b/source4/setup/upgrade index fed09f2a4e..fed09f2a4e 100644..100755 --- a/source4/setup/upgrade +++ b/source4/setup/upgrade |