fix(core/ldap): When creating a new contact, also write the "sn" field

The "sn" attribute is mandatory for "inetOrgPerson" object class, so it
should be written otherwise entries cannot be added and fails for example
with

     Entry (cn=73a6-59920600-5-56454280,ou=personal,ou=addressbook,uid=alise,ou=peoples,dc=domain,dc=tld): object class 'inetOrgPerson' requires attribute 'sn'

Fixes #4206
Fixes #4248

Documentation/SOGoInstallationGuide.asciidoc

@@ -791,6 +791,7 @@ SOGoUserSources = (
     {
         type = ldap;
         CNFieldName = cn;
+        SNFieldName = sn;
         IDFieldName = uid;
         UIDFieldName = uid;
         IMAPHostFieldName = mailHost;
@@ -834,6 +835,7 @@ SOGoUserSources = (
     {
         type = ldap;
         CNFieldName = cn;
+        SNFieldName = sn;
         IDFieldName = cn;
         UIDFieldName = sAMAccountName;
         baseDN = "cn=Users,dc=acme,dc=com";

Scripts/sogo.conf

@@ -46,6 +46,7 @@
   //  {
   //    type = ldap;
   //    CNFieldName = cn;
+  //    SNFieldName = sn;
   //    UIDFieldName = uid;
   //    IDFieldName = uid; // first field of the DN for direct binds
   //    bindFields = (uid, mail); // array of fields to use for indirect binds
@@ -65,6 +66,7 @@
   //  {
   //    type = ldap;
   //    CNFieldName = cn;
+  //    SNFieldName = cn;
   //    UIDFieldName = sAMAccountName;
   //    baseDN = "CN=users,dc=domain,dc=tld";
   //    bindDN = "CN=sogo,CN=users,DC=domain,DC=tld";

SoObjects/SOGo/LDAPSource.h

@@ -55,6 +55,7 @@
   LDAPSourceSchema *_schema;
   NSString *_IDField;     // the first part of a user DN
   NSString *_CNField;
+  NSString *_SNField;
   NSString *_UIDField;
   NSArray *_mailFields;
   NSArray *_searchFields;
@@ -101,6 +102,7 @@
 - (void) setBaseDN: (NSString *) newBaseDN
 	   IDField: (NSString *) newIDField
 	   CNField: (NSString *) newCNField
+       SNField: (NSString *) newSNField
 	  UIDField: (NSString *) newUIDField
 	mailFields: (NSArray *) newMailFields
       searchFields: (NSArray *) newSearchFields

SoObjects/SOGo/LDAPSource.m

@@ -90,6 +90,7 @@ - (id) init
       _schema = nil;
       _IDField = @"cn"; /* the first part of a user DN */
       _CNField = @"cn";
+      _SNField = @"sn";
       _UIDField = @"uid";
       _mailFields = [[NSArray arrayWithObject: @"mail"] retain];
       _contactMapping = nil;
@@ -136,6 +137,7 @@ - (void) dealloc
   [_pristineBaseDN release];
   [_IDField release];
   [_CNField release];
+  [_SNField release];
   [_UIDField release];
   [_contactMapping release];
   [_mailFields release];
@@ -183,6 +185,7 @@ - (id) initFromUDSource: (NSDictionary *) udSource
       [self setBaseDN: [udSource objectForKey: @"baseDN"]
               IDField: [udSource objectForKey: @"IDFieldName"]
               CNField: [udSource objectForKey: @"CNFieldName"]
+              SNField: [udSource objectForKey: @"SNFieldName"]
              UIDField: [udSource objectForKey: @"UIDFieldName"]
            mailFields: [udSource objectForKey: @"MailFieldNames"]
          searchFields: [udSource objectForKey: @"SearchFieldNames"]
@@ -322,6 +325,7 @@ - (void) setBindDN: (NSString *) newBindDN
 - (void) setBaseDN: (NSString *) newBaseDN
            IDField: (NSString *) newIDField
            CNField: (NSString *) newCNField
+           SNField: (NSString *) newSNField
           UIDField: (NSString *) newUIDField
         mailFields: (NSArray *) newMailFields
       searchFields: (NSArray *) newSearchFields
@@ -339,6 +343,8 @@ - (void) setBaseDN: (NSString *) newBaseDN
     ASSIGN(_IDField, [newIDField lowercaseString]);
   if (newCNField)
     ASSIGN(_CNField, [newCNField lowercaseString]);
+  if (newSNField)
+    ASSIGN(_SNField, [newSNField lowercaseString]);
   if (newUIDField)
     ASSIGN(_UIDField, [newUIDField lowercaseString]);
   if (newIMAPHostField)
@@ -1208,6 +1214,11 @@ - (NSDictionary *) _convertLDAPEntryToContact: (NGLdapEntry *) ldapEntry
   if (!value)
     value = @"";
   [ldifRecord setObject: value forKey: @"c_cn"];
+
+  value = [[ldapEntry attributeWithName: _SNField] stringValueAtIndex: 0];
+  if (!value)
+    value = @"";
+  [ldifRecord setObject: value forKey: @"c_sn"];
   /* if "displayName" is not set, we use CNField because it must exist */
   if (![ldifRecord objectForKey: @"displayname"])
     [ldifRecord setObject: value forKey: @"displayname"];
@@ -1815,6 +1826,7 @@ - (NSArray *) addressBookSourcesForUser: (NSString *) theUser
               [ab setBaseDN: [entry dn]
 		    IDField: @"cn"
 		    CNField: @"displayName"
+		    SNField: @"sn"
 		   UIDField: @"cn"
 		 mailFields: nil
 		  searchFields: nil