nss-pam-ldapd commit: r1632 - nss-pam-ldapd/nslcd

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Sat Mar 10 21:57:41 2012
New Revision: 1632
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=1632&view=revision

Log:
when doing DNS queries for SRV records recognise default ldap and ldaps ports

Modified:
   nss-pam-ldapd/nslcd/cfg.c

Modified: nss-pam-ldapd/nslcd/cfg.c
==============================================================================
--- nss-pam-ldapd/nslcd/cfg.c   Sat Mar 10 21:41:37 2012        (r1631)
+++ nss-pam-ldapd/nslcd/cfg.c   Sat Mar 10 21:57:41 2012        (r1632)
@@ -5,7 +5,7 @@
 
    Copyright (C) 1997-2005 Luke Howard
    Copyright (C) 2007 West Consulting
-   Copyright (C) 2007, 2008, 2009, 2010, 2011 Arthur de Jong
+   Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Arthur de Jong
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -214,8 +214,19 @@
       *nxt='\0';
       nxt++;
     }
-    /* add the URI */
-    mysnprintf(buf,sizeof(buf),"ldap://%s",hostlist);
+    /* if port is 636, use ldaps:// URI */
+    if ((strlen(hostlist)>4)&&(strcmp(hostlist+strlen(hostlist)-4,":636")==0))
+    {
+      hostlist[strlen(hostlist)-4]='\0';
+      mysnprintf(buf,sizeof(buf),"ldaps://%s",hostlist);
+    }
+    else
+    {
+      /* strip default port number */
+      if 
((strlen(hostlist)>4)&&(strcmp(hostlist+strlen(hostlist)-4,":389")==0))
+        hostlist[strlen(hostlist)-4]='\0';
+      mysnprintf(buf,sizeof(buf),"ldap://%s",hostlist);
+    }
     log_log(LOG_DEBUG,"add_uris_from_dns(): found uri: %s",buf);
     add_uri(filename,lnr,cfg,buf);
     /* get next entry from list */
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/