summaryrefslogtreecommitdiffstats
path: root/daemons
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 /daemons
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 'daemons')
-rw-r--r--daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c2
-rw-r--r--daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c b/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c
index ec1c3967c..161a73177 100644
--- a/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c
+++ b/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c
@@ -53,7 +53,7 @@
#define IPA_PLUGIN_NAME "ipa-enrollment"
/* OID of the extended operation handled by this plug-in */
-#define JOIN_OID "2.16.840.1.113730.3.8.3.53"
+#define JOIN_OID "2.16.840.1.113730.3.8.10.3"
Slapi_PluginDesc pdesc = {
IPA_PLUGIN_NAME,
diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
index d76b7f7cd..9a1ca2b3f 100644
--- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
+++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
@@ -64,8 +64,8 @@
#define EXOP_PASSWD_OID "1.3.6.1.4.1.4203.1.11.1"
/* OID to retrieve keytabs */
-#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"