From eec1ffde019c9b94a4b89e69cc674d01e1d73fc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.bernigaud@opensides.be>
Date: Tue, 7 Jun 2016 07:07:13 +0200
Subject: [PATCH] Fixes #4853 Added callerSN and callerGIVENNAME
---
include/class_plugin.inc | 9 ++++++---
include/class_userinfo.inc | 8 ++++++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 5a8ac0246..83be96b78 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -1461,9 +1461,12 @@ class plugin
$ui = get_userinfo();
- $addAttrs['callerDN'] = $ui->dn;
- $addAttrs['callerCN'] = $ui->cn;
- $addAttrs['callerUID'] = $ui->uid;
+ $addAttrs['callerDN'] = $ui->dn;
+ $addAttrs['callerCN'] = $ui->cn;
+ $addAttrs['callerUID'] = $ui->uid;
+ $addAttrs['callerSN'] = $ui->sn;
+ $addAttrs['callerGIVENNAME'] = $ui->givenName;
+
$addAttrs['dn'] = $this->dn;
$addAttrs['location'] = $config->current['NAME'];
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index a489b3e9e..8fd9d0dfe 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -36,6 +36,8 @@ class userinfo
var $ip;
var $cn;
var $uid;
+ var $sn = '';
+ var $givenName = '';
var $gidNumber = -1;
var $language = "";
var $subtreeACL = array();
@@ -67,6 +69,12 @@ class userinfo
if (isset($attrs['gidNumber'][0])) {
$this->gidNumber = $attrs['gidNumber'][0];
}
+ if (isset($attrs['sn'][0])) {
+ $this->sn = $attrs['sn'][0];
+ }
+ if (isset($attrs['givenName'][0])) {
+ $this->givenName = $attrs['givenName'][0];
+ }
/* Assign user language */
if (isset($attrs['preferredLanguage'][0])) {
--
GitLab