summaryrefslogtreecommitdiffstats
path: root/source/include/smbldap.h
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-09-30 17:13:37 +0000
committerGerald Carter <jerry@samba.org>2005-09-30 17:13:37 +0000
commit796cade5585f1237e2c047293ad6a9b8a4e923ba (patch)
tree5f3a22ba40783ce548328a44b9262a451f33ad27 /source/include/smbldap.h
parent38730479cfd0c1d46fcb8950fc30da3fa3f8b154 (diff)
downloadsamba-796cade5585f1237e2c047293ad6a9b8a4e923ba.tar.gz
samba-796cade5585f1237e2c047293ad6a9b8a4e923ba.tar.xz
samba-796cade5585f1237e2c047293ad6a9b8a4e923ba.zip
r10656: BIG merge from trunk. Features not copied over
* \PIPE\unixinfo * winbindd's {group,alias}membership new functions * winbindd's lookupsids() functionality * swat (trunk changes to be reverted as per discussion with Deryck)
Diffstat (limited to 'source/include/smbldap.h')
-rw-r--r--source/include/smbldap.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/source/include/smbldap.h b/source/include/smbldap.h
index df56f60bf39..bea1a6d84a3 100644
--- a/source/include/smbldap.h
+++ b/source/include/smbldap.h
@@ -1,5 +1,5 @@
/*
- Unix SMB/CIFS implementation.
+ Unix SMB/CIFS mplementation.
LDAP protocol helper functions for SAMBA
Copyright (C) Gerald Carter 2001-2003
@@ -40,6 +40,7 @@ struct smbldap_state;
#define LDAP_OBJ_IDPOOL "sambaUnixIdPool"
#define LDAP_OBJ_IDMAP_ENTRY "sambaIdmapEntry"
#define LDAP_OBJ_SID_ENTRY "sambaSidEntry"
+#define LDAP_OBJ_TRUST_PASSWORD "sambaTrustPassword"
#define LDAP_OBJ_ACCOUNT "account"
#define LDAP_OBJ_POSIXACCOUNT "posixAccount"
@@ -95,10 +96,12 @@ struct smbldap_state;
#define LDAP_ATTR_LOGON_COUNT 36
#define LDAP_ATTR_MUNGED_DIAL 37
#define LDAP_ATTR_BAD_PASSWORD_TIME 38
-#define LDAP_ATTR_PWD_HISTORY 39
+#define LDAP_ATTR_PWD_HISTORY 39
#define LDAP_ATTR_SID_LIST 40
-#define LDAP_ATTR_MOD_TIMESTAMP 41
-#define LDAP_ATTR_LOGON_HOURS 42
+#define LDAP_ATTR_MOD_TIMESTAMP 41
+#define LDAP_ATTR_LOGON_HOURS 42
+#define LDAP_ATTR_TRUST_PASSWD_FLAGS 43
+
typedef struct _attrib_map_entry {
int attrib;
@@ -117,6 +120,8 @@ extern ATTRIB_MAP_ENTRY groupmap_attr_list[];
extern ATTRIB_MAP_ENTRY groupmap_attr_list_to_delete[];
extern ATTRIB_MAP_ENTRY idpool_attr_list[];
extern ATTRIB_MAP_ENTRY sidmap_attr_list[];
+extern ATTRIB_MAP_ENTRY trustpw_attr_list[];
+
/* Function declarations -- not included in proto.h so we don't
have to worry about LDAP structure types */