diff options
| author | Gerald Carter <jerry@samba.org> | 2003-06-06 13:48:39 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-06-06 13:48:39 +0000 |
| commit | 711f8d0a13c6854f8c552a9561571d26fa5e9884 (patch) | |
| tree | 1b1f4a6fac98c249f8085e3cac15ae8beb9c3341 /source3/include | |
| parent | 53f8d3f01aed0118bafa36c8eabfc558e29f91dd (diff) | |
| download | samba-711f8d0a13c6854f8c552a9561571d26fa5e9884.tar.gz samba-711f8d0a13c6854f8c552a9561571d26fa5e9884.tar.bz2 samba-711f8d0a13c6854f8c552a9561571d26fa5e9884.zip | |
* break out more common code used between pdb_ldap and idmap_ldap
* remove 'winbind uid' and 'winbind gid' parameters (replaced
by current idmap parameter)
* create the sambaUnixIdPool entries automatically in the 'ldap
idmap suffix'
* add new 'ldap idmap suffix' and 'ldap group suffix' parametrer
* "idmap backend = ldap" now accepts 'ldap:ldap://server/' format
(parameters are passed to idmap init() function
(This used to be commit 1665926281ed2be3c5affca551c9d458d013fc7f)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/idmap.h | 2 | ||||
| -rw-r--r-- | source3/include/smbldap.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source3/include/idmap.h b/source3/include/idmap.h index 1267ac27bc..4b38128c2f 100644 --- a/source3/include/idmap.h +++ b/source3/include/idmap.h @@ -39,7 +39,7 @@ struct idmap_methods { /* Called when backend is first loaded */ - NTSTATUS (*init)(void); + NTSTATUS (*init)( char *params ); NTSTATUS (*get_sid_from_id)(DOM_SID *sid, unid_t id, int id_type); NTSTATUS (*get_id_from_sid)(unid_t *id, int *id_type, const DOM_SID *sid); diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h index 13451fa24f..c669f77425 100644 --- a/source3/include/smbldap.h +++ b/source3/include/smbldap.h @@ -39,6 +39,7 @@ #define LDAP_OBJ_ACCOUNT "account" #define LDAP_OBJ_POSIXACCOUNT "posixAccount" #define LDAP_OBJ_POSIXGROUP "posixGroup" +#define LDAP_OBJ_OU "organizationalUnit" /* some generic attributes that get reused a lot */ @@ -81,6 +82,7 @@ #define LDAP_ATTR_HOME_DRIVE 29 #define LDAP_ATTR_GROUP_SID 30 #define LDAP_ATTR_GROUP_TYPE 31 +#define LDAP_ATTR_SID 32 typedef struct _attrib_map_entry { |