packages: smbldap-tools/smbldap-tools.spec, smbldap-tools/smbldap-tools-no-...

[baggins]

Author: baggins                      Date: Thu Jun 25 09:50:19 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- do not require client certificate

---- Files affected:
packages/smbldap-tools:
   smbldap-tools.spec (1.25 -> 1.26) , smbldap-tools-no-client-cert.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/smbldap-tools/smbldap-tools.spec
diff -u packages/smbldap-tools/smbldap-tools.spec:1.25 packages/smbldap-tools/smbldap-tools.spec:1.26
--- packages/smbldap-tools/smbldap-tools.spec:1.25	Mon Jun 22 16:51:16 2009
+++ packages/smbldap-tools/smbldap-tools.spec	Thu Jun 25 11:50:13 2009
@@ -10,7 +10,7 @@
 Name:		smbldap-tools
 Version:	0.9.6
 # Despite name-ver file this is REALLY a pre1 release
-Release:	0.pre1.2
+Release:	0.pre1.3
 License:	GPL
 Group:		Applications/Networking
 URL:		https://gna.org/projects/smbldap-tools/
@@ -21,6 +21,7 @@
 Patch1:		%{name}-configure.patch
 Patch2:		%{name}-nscd.patch
 Patch3:		%{name}-krb5.patch
+Patch4:		%{name}-no-client-cert.patch
 BuildRequires:	rpm-perlprov >= 4.1-13
 %if %{with autodeps}
 BuildRequires:	perl-Crypt-SmbHash
@@ -51,6 +52,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -84,6 +86,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2009/06/25 09:50:13  baggins
+- rel 3
+- do not require client certificate
+
 Revision 1.25  2009/06/22 14:51:16  baggins
 - rel 2
 - add kerberos objectclasses and required fields if kerberos configured

================================================================
Index: packages/smbldap-tools/smbldap-tools-no-client-cert.patch
diff -u /dev/null packages/smbldap-tools/smbldap-tools-no-client-cert.patch:1.1
--- /dev/null	Thu Jun 25 11:50:19 2009
+++ packages/smbldap-tools/smbldap-tools-no-client-cert.patch	Thu Jun 25 11:50:13 2009
@@ -0,0 +1,29 @@
+diff -ur smbldap-tools-0.9.6/smbldap_tools.pm y/smbldap_tools.pm
+--- smbldap-tools-0.9.6/smbldap_tools.pm	2009-06-24 13:47:32.302630165 +0200
++++ y/smbldap_tools.pm	2009-06-25 11:46:51.000000000 +0200
+@@ -331,12 +331,19 @@
+           "erreur LDAP: Can't contact master ldap server for writing ($@)";
+     }
+     if ( $config{ldapTLS} == 1 ) {
+-        $mesg = $ldap_master->start_tls(
+-            verify     => "$config{verify}",
+-            clientcert => "$config{clientcert}",
+-            clientkey  => "$config{clientkey}",
+-            cafile     => "$config{cafile}"
+-        );
++        if ( defined($config{clientcert}) && defined($config{clientkey}) ) {
++            $mesg = $ldap_master->start_tls(
++                verify     => "$config{verify}",
++                clientcert => "$config{clientcert}",
++                clientkey  => "$config{clientkey}",
++                cafile     => "$config{cafile}"
++            );
++        } else {
++            $mesg = $ldap_master->start_tls(
++                verify     => "$config{verify}",
++                cafile     => "$config{cafile}"
++            );
++        }
+         if ( $mesg->code ) {
+             die( "Could not start_tls: " . $mesg->error );
+         }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smbldap-tools/smbldap-tools.spec?r1=1.25&r2=1.26&f=u