[packages/smbldap-tools] - updated to 0.9.9

[adamg]

commit 926efc9e800d3d595275283bd0874178262ad060
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date:   Thu Dec 27 15:35:48 2012 +0100

    - updated to 0.9.9

 smbldap-tools-no-client-cert.patch | 105 +++++++++----------------------------
 smbldap-tools.spec                 |   4 +-
 2 files changed, 28 insertions(+), 81 deletions(-)
---
diff --git a/smbldap-tools.spec b/smbldap-tools.spec
index 11d2426..faa1ef3 100644
--- a/smbldap-tools.spec
+++ b/smbldap-tools.spec
@@ -6,12 +6,12 @@
 Summary:	User & Group administration tools for Samba-OpenLDAP
 Summary(pl.UTF-8):	Narzędzia do administracji użytkownikami i grupami dla Samby i OpenLDAP
 Name:		smbldap-tools
-Version:	0.9.8
+Version:	0.9.9
 Release:	1
 License:	GPL
 Group:		Applications/Networking
 Source0:	http://download.gna.org/smbldap-tools/sources/0.9.7/%{name}-%{version}.tar.gz
-# Source0-md5:	5b110aeeaa8afafa40d61ceed4d4f6a7
+# Source0-md5:	5084011003239a60ebe209c5fb570397
 URL:		https://gna.org/projects/smbldap-tools/
 Patch0:		%{name}-configure.patch
 Patch1:		%{name}-krb5.patch
diff --git a/smbldap-tools-no-client-cert.patch b/smbldap-tools-no-client-cert.patch
index c4d9402..0e99591 100644
--- a/smbldap-tools-no-client-cert.patch
+++ b/smbldap-tools-no-client-cert.patch
@@ -1,81 +1,28 @@
-diff -ur smbldap-tools-0.9.6/smbldap_tools.pl y/smbldap_tools.pl
---- smbldap-tools-0.9.6/smbldap_tools.pl	2009-06-24 13:47:32.302630165 +0200
-+++ y/smbldap_tools.pl	2009-06-25 11:46:51.000000000 +0200
-@@ -331,12 +331,19 @@
-           "erreur LDAP: Can't contact master ldap server for writing ($@)";
+--- smbldap-tools-0.9.9/smbldap_tools.pl~	2012-08-07 13:12:06.000000000 +0200
++++ smbldap-tools-0.9.9/smbldap_tools.pl	2012-12-27 15:29:06.544322290 +0100
+@@ -359,12 +359,19 @@
      }
-     if ( $config{ldapTLS} == 1 ) {
--        $mesg = $ldap_master->start_tls(
--            verify     => "$config{verify}",
--            clientcert => "$config{clientcert}",
--            clientkey  => "$config{clientkey}",
--            cafile     => "$config{cafile}"
+ 
+     if ($tls) {
+-        my $mesg = $ldap->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 );
-         }
-@@ -411,12 +411,19 @@
-         $config{slavePw} = $config{masterPw};
-     }
-     elsif ( $config{ldapTLS} == 1 ) {
--        $mesg = $ldap_slave->start_tls(
--            verify     => "$config{verify}",
--            clientcert => "$config{clientcert}",
--            clientkey  => "$config{clientkey}",
--            cafile     => "$config{cafile}"
--        );
-+        if ( defined($config{clientcert}) && defined($config{clientkey}) ) {
-+            $mesg = $ldap_slave->start_tls(
-+                verify     => "$config{verify}",
-+                clientcert => "$config{clientcert}",
-+                clientkey  => "$config{clientkey}",
-+                cafile     => "$config{cafile}"
-+            );
-+        } else {
-+            $mesg = $ldap_slave->start_tls(
-+                verify     => "$config{verify}",
-+                cafile     => "$config{cafile}"
-+            );
-+        }
-         if ( $mesg->code ) {
-             die( "Could not start_tls: " . $mesg->error );
-         }
-@@ -578,12 +585,19 @@
-     }
-     if ($userLdap) {
-         if ( $config{ldapTLS} == 1 ) {
--            $userLdap->start_tls(
--                verify     => "$config{verify}",
--                clientcert => "$config{clientcert}",
--                clientkey  => "$config{clientkey}",
--                cafile     => "$config{cafile}"
--            );
-+            if ( defined($config{clientcert}) && defined($config{clientkey}) ) {
-+                $userLdap->start_tls(
-+                    verify     => "$config{verify}",
-+                    clientcert => "$config{clientcert}",
-+                    clientkey  => "$config{clientkey}",
-+                    cafile     => "$config{cafile}"
-+                );
-+            } else {
-+                $userLdap->start_tls(
-+                    verify     => "$config{verify}",
-+                    cafile     => "$config{cafile}"
-+                );
-+            }
-         }
-         my $mesg = $userLdap->bind( dn => $dn, password => $pass );
-         if ( $mesg->code eq 0 ) {
++	    if ( defined($config{clientcert}) && defined($config{clientkey}) ) {
++		    my $mesg = $ldap->start_tls(
++			    verify     => $config{verify},
++			    clientcert => $config{clientcert},
++			    clientkey  => $config{clientkey},
++			    cafile     => $config{cafile},
++		    );
++	    } else {
++		    my $mesg = $ldap->start_tls(
++			    verify     => $config{verify},
++			    cafile     => $config{cafile},
++		    );
++	    }
+         if ($mesg->code) {
+ 	    $ldap->disconnect;
+ 	    die( "Cannot start TLS on LDAP connection: $uri: " . $mesg->error . "\n");
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/smbldap-tools.git/commitdiff/926efc9e800d3d595275283bd0874178262ad060