projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
322953f
)
* Added stub code to point out where the LDAP-to-vCard code should appear.
author
Art Cancro
<ajc@citadel.org>
Mon, 28 Sep 2009 16:51:59 +0000
(16:51 +0000)
committer
Art Cancro
<ajc@citadel.org>
Mon, 28 Sep 2009 16:51:59 +0000
(16:51 +0000)
citadel/modules/vcard/serv_vcard.c
patch
|
blob
|
history
diff --git
a/citadel/modules/vcard/serv_vcard.c
b/citadel/modules/vcard/serv_vcard.c
index 46b7cb1f8f952e7d2fa97b8b874e19902d5f6bf8..18b30ae6eadb883d1b301b36e469b5fde8af4991 100644
(file)
--- a/
citadel/modules/vcard/serv_vcard.c
+++ b/
citadel/modules/vcard/serv_vcard.c
@@
-1184,24
+1184,33
@@
void vcard_create_room(void)
*/
void vcard_session_login_hook(void) {
struct vCard *v = NULL;
*/
void vcard_session_login_hook(void) {
struct vCard *v = NULL;
+ struct CitContext *CCC = CC; /* put this on the stack, just for speed */
+#ifdef HAVE_LDAP
/*
* Is this an LDAP session? If so, copy various LDAP attributes from the directory entry
* into the user's vCard.
*/
/*
* Is this an LDAP session? If so, copy various LDAP attributes from the directory entry
* into the user's vCard.
*/
- /* FIXME THIS IS NOT IMPLEMENTED YET */
+ if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.c_auth_mode == AUTHMODE_LDAP_AD)) {
+
+ /* FIXME do something with this.
+ * The DN of the account will be found in: CCC->ldap_dn
+ */
+
+ }
+#endif
/*
* Extract from the user's vCard, any Internet email addresses and the user's real name.
* These are inserted into the session data for various message entry commands to use.
*/
/*
* Extract from the user's vCard, any Internet email addresses and the user's real name.
* These are inserted into the session data for various message entry commands to use.
*/
- v = vcard_get_user(&CC->user);
+ v = vcard_get_user(&CC
C
->user);
if (v) {
if (v) {
- extract_inet_email_addrs(CC
->cs_inet_email, sizeof
CC->cs_inet_email,
- CC
->cs_inet_other_emails, sizeof
CC->cs_inet_other_emails,
+ extract_inet_email_addrs(CC
C->cs_inet_email, sizeof C
CC->cs_inet_email,
+ CC
C->cs_inet_other_emails, sizeof C
CC->cs_inet_other_emails,
v, 1
);
v, 1
);
- extract_friendly_name(CC
->cs_inet_fn, sizeof
CC->cs_inet_fn, v);
+ extract_friendly_name(CC
C->cs_inet_fn, sizeof C
CC->cs_inet_fn, v);
vcard_free(v);
}
vcard_free(v);
}