summaryrefslogtreecommitdiffstats
path: root/ipa-client
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2011-02-16 11:16:30 -0500
committerSimo Sorce <ssorce@redhat.com>2011-02-17 08:38:53 -0500
commit50318b60eebbed1dc1a488991dff7f86bfaca58f (patch)
treed24257a448bc0d9b8f303269373506aea292de90 /ipa-client
parent3f40f1492cd39574c80af1a01e3771bd86c7027d (diff)
downloadfreeipa-50318b60eebbed1dc1a488991dff7f86bfaca58f.tar.gz
freeipa-50318b60eebbed1dc1a488991dff7f86bfaca58f.tar.xz
freeipa-50318b60eebbed1dc1a488991dff7f86bfaca58f.zip
Fix duplicate OIDs
Apparently we forgot to check OID consistency between the schema and the extensions, and we got duplicates. Technically the schema was done later but it is easier to change the extensions OIDs than to change the schema of current beta2/rc1 installations. The only side effect is that older ipa-getkeytab and ipa-join binaries will fail. So all the admin/client tools must be upgraded at the same time as well as all the masters (otherwise some will show/accept the new OID while others won't). Fixes: https://fedorahosted.org/freeipa/ticket/976
Diffstat (limited to 'ipa-client')
-rw-r--r--ipa-client/ipa-getkeytab.c4
-rw-r--r--ipa-client/ipa-join.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/ipa-client/ipa-getkeytab.c b/ipa-client/ipa-getkeytab.c
index f8da31786..01b8d7bc5 100644
--- a/ipa-client/ipa-getkeytab.c
+++ b/ipa-client/ipa-getkeytab.c
@@ -50,8 +50,8 @@
#define KRB5_KDB_SALTTYPE_SPECIAL 4
#define KRB5_KDB_SALTTYPE_AFS3 5
-#define KEYTAB_SET_OID "2.16.840.1.113730.3.8.3.1"
-#define KEYTAB_RET_OID "2.16.840.1.113730.3.8.3.2"
+#define KEYTAB_SET_OID "2.16.840.1.113730.3.8.10.1"
+#define KEYTAB_RET_OID "2.16.840.1.113730.3.8.10.2"
struct krb_key_salt {
krb5_enctype enctype;
diff --git a/ipa-client/ipa-join.c b/ipa-client/ipa-join.c
index 86b1bd122..c3818f21e 100644
--- a/ipa-client/ipa-join.c
+++ b/ipa-client/ipa-join.c
@@ -42,7 +42,7 @@
#define NAME "ipa-join"
#define VERSION "1.0"
-#define JOIN_OID "2.16.840.1.113730.3.8.3.53"
+#define JOIN_OID "2.16.840.1.113730.3.8.10.3"
#define CAFILE "/etc/ipa/ca.crt"