Skip to content

Commit e181d54

Browse files
fcneufjengelh
authored andcommitted
nsp: passthrough PR_DEPARTMENT_NAME from SQL user table
Since we have effectively abandoned the old AB Departments from Gromox 0.x with the GAB rewrite, PR_DEPARTMENT_NAME need no longer be autogenerated either.
1 parent 018a6bb commit e181d54

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

doc/exchange_nsp.4gx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,7 @@ Default: (unspecified)
3232
.SH Notes
3333
A number of properties are always synthesized by exchange_nsp and
3434
never read from any storage; this includes key properties such as
35-
PR_ENTRYID, PR_RECORD_KEY, etc. The following properties need
36-
mentioning:
37-
.IP \(bu 4
38-
PR_DEPARTMENT: This property is synthesized from the department
39-
that a user has been assigned to (cf. SQL table "users", column
40-
"group_id", and SQL table "group", column "title").
35+
PR_ENTRYID, PR_RECORD_KEY, etc.
4136
.PP
4237
For user-attached properties that are read from SQL (cf. table
4338
"user_properties"), exchange_nsp (as well as zcore(8gx)'s AB) only

doc/user_properties.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@ possibly transformed by the ABP:
2323

2424
* ``PR_CREATION_TIME``: Not read, but synthesized.
2525

26-
* ``PR_DEPARTMENT_NAME``: Not read, but copied from the ``groups.title``
27-
column of the user's group_id. ("groups" in SQL refer to departments, a
28-
feature to create hierarchies in the address book).
26+
* ``PR_DEPARTMENT_NAME``: [Before Gromox 2.42] Not read, but copied from the
27+
``groups.title`` column of the user's group_id. ("groups" in SQL refer to
28+
departments, a feature to create hierarchies in the address book). [Since
29+
Gromox 2.42] Departments were abandoned and reading the property via MAPI
30+
yields no value. [Since Gromox 2.44] Special treatment has ceased. MAPI
31+
clients now see the same value as it is in SQL.
2932

3033
* ``PR_DISPLAY_TYPE``: Not read, but synthesized based on PR_DISPLAY_TYPE_EX.
3134

exch/nsp/nsp_interface.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,9 +398,6 @@ static ec_error_t nsp_interface_fetch_property(const ab_tree::ab_node &node,
398398
cu_utf8_to_mb(codepage,
399399
dn.c_str(), pprop->value.pstr, temp_len);
400400
return ecSuccess;
401-
case PR_DEPARTMENT_NAME:
402-
case PR_DEPARTMENT_NAME_A:
403-
return ecNotFound;
404401
case PR_OFFICE_LOCATION:
405402
if (!node.company_info(nullptr, &dn))
406403
return ecNotFound;

0 commit comments

Comments
 (0)