[Fedora-directory-commits] ldapserver/ldap/servers/slapd control.c, 1.4, 1.5

[Doctor Conrad]

Author: prowley

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27583

Modified Files:
	control.c 
Log Message:
177444: duplicate password policy oids in root DSE


Index: control.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/control.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- control.c	19 Apr 2005 22:07:36 -0000	1.4
+++ control.c	10 Jan 2006 19:30:12 -0000	1.5
@@ -95,10 +95,16 @@
 	    SLAPI_OPERATION_SEARCH | SLAPI_OPERATION_COMPARE
 	    | SLAPI_OPERATION_ADD | SLAPI_OPERATION_DELETE
 	    | SLAPI_OPERATION_MODIFY | SLAPI_OPERATION_MODDN );
+/*
+	We do not register the password policy response because it has
+	the same oid as the request (and it was being reported twice in
+	in the root DSE supportedControls attribute)
+
 	slapi_register_supported_control( LDAP_X_CONTROL_PWPOLICY_RESPONSE,
 	    SLAPI_OPERATION_SEARCH | SLAPI_OPERATION_COMPARE
 	    | SLAPI_OPERATION_ADD | SLAPI_OPERATION_DELETE
 	    | SLAPI_OPERATION_MODIFY | SLAPI_OPERATION_MODDN );
+*/
 	slapi_register_supported_control( LDAP_CONTROL_GET_EFFECTIVE_RIGHTS,
 		SLAPI_OPERATION_SEARCH );
 }