X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fpasswd.c;h=ab04da8d2a8ffbff4b3b46d6d77588664570cf13;hb=ffebea4a8b879db1a9dc23e2c2749d303b271d43;hp=e9f44db6a0b1ab014e91628f61c694ecdb943d79;hpb=0e2af54a3ffdeebe3901370683be56fcc53023b0;p=openldap

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index e9f44db6a0..ab04da8d2a 100644
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -26,12 +26,12 @@ int passwd_extop(
 	struct berval **rspdata,
 	LDAPControl ***rspctrls,
 	const char **text,
-	BVarray *refs )
+	BerVarray *refs )
 {
 	int rc;
 
 	assert( reqoid != NULL );
-	assert( strcmp( LDAP_EXOP_X_MODIFY_PASSWD, reqoid ) == 0 );
+	assert( strcmp( LDAP_EXOP_MODIFY_PASSWD, reqoid ) == 0 );
 
 	if( op->o_dn.bv_len == 0 ) {
 		*text = "only authenticated users may change passwords";
@@ -101,7 +101,7 @@ int slap_passwd_parse( struct berval *reqdata,
 		tag = ber_peek_tag( ber, &len );
 	}
 
-	if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_ID ) {
+	if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_ID ) {
 		if( id == NULL ) {
 #ifdef NEW_LOGGING
 			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
@@ -116,7 +116,7 @@ int slap_passwd_parse( struct berval *reqdata,
 			goto done;
 		}
 
-		tag = ber_scanf( ber, "o", id );
+		tag = ber_scanf( ber, "m", id );
 
 		if( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
@@ -133,7 +133,7 @@ int slap_passwd_parse( struct berval *reqdata,
 		tag = ber_peek_tag( ber, &len);
 	}
 
-	if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_OLD ) {
+	if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_OLD ) {
 		if( oldpass == NULL ) {
 #ifdef NEW_LOGGING
 			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
@@ -148,7 +148,7 @@ int slap_passwd_parse( struct berval *reqdata,
 			goto done;
 		}
 
-		tag = ber_scanf( ber, "o", oldpass );
+		tag = ber_scanf( ber, "m", oldpass );
 
 		if( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
@@ -165,7 +165,7 @@ int slap_passwd_parse( struct berval *reqdata,
 		tag = ber_peek_tag( ber, &len);
 	}
 
-	if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW ) {
+	if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_NEW ) {
 		if( newpass == NULL ) {
 #ifdef NEW_LOGGING
 			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
@@ -180,7 +180,7 @@ int slap_passwd_parse( struct berval *reqdata,
 			goto done;
 		}
 
-		tag = ber_scanf( ber, "o", newpass );
+		tag = ber_scanf( ber, "m", newpass );
 
 		if( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
@@ -257,7 +257,7 @@ struct berval * slap_passwd_return(
 	ber_init_w_nullc( ber, LBER_USE_DER );
 
 	rc = ber_printf( ber, "{tON}",
-		LDAP_TAG_EXOP_X_MODIFY_PASSWD_GEN, cred );
+		LDAP_TAG_EXOP_MODIFY_PASSWD_GEN, cred );
 
 	if( rc >= 0 ) {
 		(void) ber_flatten( ber, &bv );