aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/backend')
-rw-r--r--addressbook/backend/pas/evolutionperson.schema18
-rw-r--r--addressbook/backend/pas/pas-backend-ldap.c4
2 files changed, 19 insertions, 3 deletions
diff --git a/addressbook/backend/pas/evolutionperson.schema b/addressbook/backend/pas/evolutionperson.schema
index 76a975330e..f0f3a394df 100644
--- a/addressbook/backend/pas/evolutionperson.schema
+++ b/addressbook/backend/pas/evolutionperson.schema
@@ -167,6 +167,18 @@ attributetype ( 1.3.6.1.4.1.8506.1.2.25
SUP name
SINGLE-VALUE )
+attributetype ( 1.3.6.1.4.1.8506.1.2.26
+ NAME 'calendarURI'
+ EQUALITY caseExactIA5Match
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.8506.1.2.27
+ NAME 'freeBusyURI'
+ EQUALITY caseExactIA5Match
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ SINGLE-VALUE )
+
# evolutionPerson
objectclass ( 1.3.6.1.4.1.8506.1.3.1
NAME 'evolutionPerson'
@@ -178,7 +190,7 @@ objectclass ( 1.3.6.1.4.1.8506.1.3.1
otherPhone $ businessRole $ managerName $ assistantName $ assistantPhone $
otherPostalAddress $ mailer $ birthDate $ anniversary $ spouseName $
note $ companyPhone $ callbackPhone $ otherFacsimileTelephoneNumber $
- radio $ telex $ tty $ categories )
+ radio $ telex $ tty $ categories $ calendarURI $ freeBusyURI )
)
# evolutionPersonList
@@ -188,5 +200,7 @@ objectclass ( 1.3.6.1.4.1.8506.1.3.2
SUP top
STRUCTURAL
MUST (
- listName $ mail $ contact )
+ listName )
+ MAY (
+ mail $ contact )
)
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index 3cec815753..0d18980c0f 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -226,7 +226,9 @@ struct prop_info {
E_STRING_PROP (E_CARD_SIMPLE_FIELD_FILE_AS, "file_as", "fileAs"),
E_STRING_PROP (E_CARD_SIMPLE_FIELD_CATEGORIES, "categories", "categories"),
-/* E_CARD_SIMPLE_FIELD_FBURL, */
+ E_STRING_PROP (E_CARD_SIMPLE_FIELD_CALURI, "caluri", "calendarURI"),
+ E_STRING_PROP (E_CARD_SIMPLE_FIELD_FBURL, "fburl", "freeBusyURI")
+
/* E_CARD_SIMPLE_FIELD_NAME_OR_ORG, */