[debian-edu-commits] r81945 - in branches/wheezy/debian-edu-config: debian etc/smbldap-tools

[sunweaver at alioth.debian.org]

Author: sunweaver
Date: 2013-08-06 10:19:49 +0000 (Tue, 06 Aug 2013)
New Revision: 81945

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/etc/smbldap-tools/smbldap.conf
Log:
Explicitly set LDAP server hostname and port in
D-E's smbldap-tools/smbldap.conf.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-08-06 07:59:03 UTC (rev 81944)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-08-06 10:19:49 UTC (rev 81945)
@@ -1,3 +1,10 @@
+debian-edu-config (1.712) UNRELEASED; urgency=low
+
+  * Explicitly set LDAP server hostname and port in
+    D-E's smbldap-tools/smbldap.conf.
+
+ -- Mike Gabriel <sunweaver at debian.org>  Tue, 06 Aug 2013 12:05:10 +0200
+
 debian-edu-config (1.711) unstable; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-config/etc/smbldap-tools/smbldap.conf
===================================================================
--- branches/wheezy/debian-edu-config/etc/smbldap-tools/smbldap.conf	2013-08-06 07:59:03 UTC (rev 81944)
+++ branches/wheezy/debian-edu-config/etc/smbldap-tools/smbldap.conf	2013-08-06 10:19:49 UTC (rev 81945)
@@ -68,21 +68,20 @@
 # Slave LDAP server
 # Ex: slaveLDAP=127.0.0.1
 # If not defined, parameter is set to "127.0.0.1"
-#slaveLDAP="ldap.intern"
+slaveLDAP="ldap.intern"
 
 # Slave LDAP port
 # If not defined, parameter is set to "389"
-#slavePort="389"
+slavePort="389"
 
 # Master LDAP server: needed for write operations
 # Ex: masterLDAP=127.0.0.1
 # If not defined, parameter is set to "127.0.0.1"
-#masterLDAP="ldap.intern"
+masterLDAP="ldap.intern"
 
 # Master LDAP port
 # If not defined, parameter is set to "389"
-#masterPort="389"
-#masterPort="389"
+masterPort="389"
 
 # Use TLS for LDAP
 # If set to 1, this option will use start_tls for connection