The proposed patch was not working for me.
I suspect a small error in it.

I propose the following correction that seems to work for me.

Please not that it seems tha the solution proposed on the heimdal list
is quite different.

Cheers

--- ./heimdal-0.7.2/lib/hdb/hdb-ldap.c  2005-04-18 10:03:54.000000000 +0200
+++ ./heimdal-0.7.2.dfsg.1/lib/hdb/hdb-ldap.c   2007-07-03 18:32:16.000000000 
+0200
@@ -666,6 +666,7 @@
     }

     if (ent->etypes) {
+       int add_krb5EncryptionType = 0;
        /* clobber and replace encryption types. */
        if (!is_new_entry) {
            values = ldap_get_values(HDB2LDAP(db), msg, "krb5EncryptionType");
@@ -675,19 +676,25 @@
                                  NULL);
                if (ret)
                    goto out;
+               add_krb5EncryptionType = 1;
            }
+       } else if (is_heimdal_entry) {
+               add_krb5EncryptionType = 1;
        }
-       for (i = 0; i < ent->etypes->len; i++) {
-           if (is_samba_account &&
-               ent->keys.val[i].key.keytype == ETYPE_ARCFOUR_HMAC_MD5)
-           {
-               ;
-           } else if (is_heimdal_entry) {
-               ret = LDAP_addmod_integer(context, &mods, LDAP_MOD_ADD,
-                                         "krb5EncryptionType",
-                                         ent->etypes->val[i]);
-               if (ret)
-                   goto out;
+
+       if (add_krb5EncryptionType) {
+           for (i = 0; i < ent->etypes->len; i++) {
+                   if (is_samba_account &&
+                   ent->keys.val[i].key.keytype == ETYPE_ARCFOUR_HMAC_MD5)
+               {
+                   ;
+               } else if (is_heimdal_entry) {
+                   ret = LDAP_addmod_integer(context, &mods, LDAP_MOD_ADD,
+                                             "krb5EncryptionType",
+                                             ent->etypes->val[i]);
+                   if (ret)
+                       goto out;
+               }
            }
        }
     }

-- 
hdb-ldap is broken in 0.7.2 when used with samba-ldap
https://bugs.launchpad.net/bugs/120649
You received this bug notification because you are a member of Ubuntu
Bugs, which is the bug contact for Ubuntu.

-- 
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs

Reply via email to