Added realm on ldapvcard to append to user

jabberd2 · Feb 16, 2014 · 93feaf3 · 93feaf3
1 parent 979f24e
commit 93feaf3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/etc/sm.xml.dist.in b/etc/sm.xml.dist.in
@@ -263,6 +263,11 @@
       <pwattr>jabberPassword</pwattr>
       -->
 
+      <!-- Realm to append to uidattr. -->
+      <!--
+      <realm>example.org</realm>
+      -->
+
       <!-- see authreg.ldapfull in c2s.xml for description. -->
       <!--
       <validattr>valid</validattr>

diff --git a/storage/storage_ldapvcard.c b/storage/storage_ldapvcard.c
@@ -44,6 +44,8 @@ typedef struct drvdata_st {
     LDAP *ld;
     const char *uri;
 
+    const char *realm; // server id to be appended to uid
+
     const char *binddn;
     const char *bindpw;
     const char *basedn;
@@ -442,7 +444,12 @@ static st_ret_t _st_ldapvcard_get(st_driver_t drv, const char *type, const char
                     ldap_value_free(vals);
                     continue;
                 }
-                strncpy(jid,vals[0],sizeof(jid)-1); jid[sizeof(jid)-1]='\0';
+                if( data->realm == NULL ) {
+                    strncpy(jid,vals[0],sizeof(jid)-1); jid[sizeof(jid)-1]='\0';
+                } else {
+                    snprintf(jid, 2048, "%s@%s", vals[0], data->realm);
+                }
+
                 ldap_value_free(vals);
 
                 vals = (char **)ldap_get_values(data->ld,entry,"displayName");
@@ -554,7 +561,7 @@ static void _st_ldapvcard_free(st_driver_t drv) {
 DLLEXPORT st_ret_t st_init(st_driver_t drv)
 {
     drvdata_t data;
-    const char *uri, *basedn, *srvtype_s;
+    const char *uri, *realm, *basedn, *srvtype_s;
     int srvtype_i;
 
     log_write(drv->st->log, LOG_NOTICE, "ldapvcard: initializing");
@@ -565,6 +572,11 @@ DLLEXPORT st_ret_t st_init(st_driver_t drv)
         return st_FAILED;
     }
 
+    realm = config_get_one(drv->st->config, "storage.ldapvcard.realm", 0);
+    if(realm != NULL) {
+        log_write(drv->st->log, LOG_NOTICE, "ldapvcard: defined realm %s", realm);
+    }
+
     basedn = config_get_one(drv->st->config, "storage.ldapvcard.basedn", 0);
     if(basedn == NULL) {
         log_write(drv->st->log, LOG_ERR, "ldapvcard: no basedn specified in config file");
@@ -588,6 +600,7 @@ DLLEXPORT st_ret_t st_init(st_driver_t drv)
     drv->private = (void *) data;
 
     data->uri = uri;
+    data->realm = realm;
     data->basedn = basedn;
     data->srvtype = srvtype_i;