Author: baggins                      Date: Thu Jun 25 08:47:55 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- correct syntax

---- Files affected:
packages/smbldap-tools:
   smbldap-tools-krb5.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/smbldap-tools/smbldap-tools-krb5.patch
diff -u packages/smbldap-tools/smbldap-tools-krb5.patch:1.1 
packages/smbldap-tools/smbldap-tools-krb5.patch:1.2
--- packages/smbldap-tools/smbldap-tools-krb5.patch:1.1 Mon Jun 22 16:51:16 2009
+++ packages/smbldap-tools/smbldap-tools-krb5.patch     Thu Jun 25 10:47:50 2009
@@ -20,7 +20,7 @@
 diff -ur smbldap-tools-0.9.6/smbldap-useradd 
smbldap-tools-0.9.6-krb5/smbldap-useradd
 --- smbldap-tools-0.9.6/smbldap-useradd        2009-06-22 16:19:38.853899020 
+0200
 +++ smbldap-tools-0.9.6-krb5/smbldap-useradd   2009-06-22 16:37:34.637118213 
+0200
-@@ -547,21 +547,43 @@
+@@ -547,21 +547,44 @@
              $valacctflags = "$tmp";
          }
  
@@ -39,8 +39,9 @@
 -                add => [ sambaSID           => "$config{SID}-$userRid" ]
 -            ]
 -        );
-+      if ( defined( $KERBEROS_REALM ) ) {
-+              my $modify = $ldap_master->modify(
++      my $modify;
++      if ( defined( $config{KERBEROS_REALM} ) ) {
++              $modify = $ldap_master->modify(
 +                  "uid=$userName,$config{usersdn}",
 +                  changes => [
 +                      add => [ objectClass        => 'sambaSAMAccount' ],
@@ -55,12 +56,12 @@
 +                      add => [ sambaSID           => "$config{SID}-$userRid" 
],
 +                      add => [ objectClass        => 'krb5Principal' ],
 +                      add => [ objectClass        => 'krb5KDCEntry' ],
-+                      add => [ krb5PrincipalName  => 
"$userna...@$kerberos_realm" ],
++                      add => [ krb5PrincipalName  => 
"$userna...@$config{kerberos_realm}" ],
 +                      add => [ krb5KeyVersionNumber => '0' ]
 +                  ]
 +              );
 +      } else {
-+              my $modify = $ldap_master->modify(
++              $modify = $ldap_master->modify(
 +                  "uid=$userName,$config{usersdn}",
 +                  changes => [
 +                      add => [ objectClass        => 'sambaSAMAccount' ],
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smbldap-tools/smbldap-tools-krb5.patch?r1=1.1&r2=1.2&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to