X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fpasswd.c;h=14e37f2970f830257690f2a3b4e0a519c57343f1;hb=4325d05ebc5ca096ee4a0d0177e7651c028c7449;hp=06cc1586a87478d2285866f4d7b2badd4b3d0bf0;hpb=1410b3e7d9732be81c216731b4a3a15b0633ed16;p=openldap

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index 06cc1586a8..14e37f2970 100644
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -1,7 +1,7 @@
 /* bind.c - ldbm backend bind and unbind routines */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -21,7 +21,7 @@
 
 int passwd_extop(
 	Connection *conn, Operation *op,
-	const char *reqoid,
+	struct berval *reqoid,
 	struct berval *reqdata,
 	char **rspoid,
 	struct berval **rspdata,
@@ -33,7 +33,7 @@ int passwd_extop(
 	int rc;
 
 	assert( reqoid != NULL );
-	assert( strcmp( LDAP_EXOP_MODIFY_PASSWD, reqoid ) == 0 );
+	assert( ber_bvcmp( &slap_EXOP_MODIFY_PASSWD, reqoid ) == 0 );
 
 	if( op->o_dn.bv_len == 0 ) {
 		*text = "only authenticated users may change passwords";
@@ -50,8 +50,8 @@ int passwd_extop(
 	}
 
 	{
-		struct berval passwd = BER_BVC( LDAP_EXOP_MODIFY_PASSWD );
-		rc = backend_check_restrictions( be, conn, op, &passwd, text );
+		rc = backend_check_restrictions( be, conn, op,
+			(struct berval *)&slap_EXOP_MODIFY_PASSWD, text );
 	}
 
 	if( rc != LDAP_SUCCESS ) {
@@ -69,11 +69,14 @@ int passwd_extop(
 		rc = LDAP_OTHER;
 #endif
 
+#ifndef SLAPD_MULTIMASTER
+	/* This does not apply to multi-master case */
 	} else if( be->be_update_ndn.bv_len ) {
 		/* we SHOULD return a referral in this case */
 		*refs = referral_rewrite( be->be_update_refs,
 			NULL, NULL, LDAP_SCOPE_DEFAULT );
 			rc = LDAP_REFERRAL;
+#endif /* !SLAPD_MULTIMASTER */
 
 	} else {
 		rc = be->be_extended(
@@ -95,7 +98,7 @@ int slap_passwd_parse( struct berval *reqdata,
 	int rc = LDAP_SUCCESS;
 	ber_tag_t tag;
 	ber_len_t len;
-	char berbuf[256];
+	char berbuf[LBER_ELEMENT_SIZEOF];
 	BerElement *ber = (BerElement *)berbuf;
 
 	if( reqdata == NULL ) {
@@ -119,8 +122,8 @@ int slap_passwd_parse( struct berval *reqdata,
 	if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_ID ) {
 		if( id == NULL ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-				   "slap_passwd_parse: ID not allowed.\n"));
+			LDAP_LOG( OPERATION, ERR,
+			   "slap_passwd_parse: ID not allowed.\n", 0, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID not allowed.\n",
 				0, 0, 0 );
@@ -135,8 +138,8 @@ int slap_passwd_parse( struct berval *reqdata,
 
 		if( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-				   "slap_passwd_parse:  ID parse failed.\n"));
+			LDAP_LOG( OPERATION, ERR,
+			   "slap_passwd_parse:  ID parse failed.\n", 0, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID parse failed.\n",
 				0, 0, 0 );
@@ -151,8 +154,8 @@ int slap_passwd_parse( struct berval *reqdata,
 	if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_OLD ) {
 		if( oldpass == NULL ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-				   "slap_passwd_parse: OLD not allowed.\n" ));
+			LDAP_LOG( OPERATION, ERR,
+			   "slap_passwd_parse: OLD not allowed.\n" , 0, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD not allowed.\n",
 				0, 0, 0 );
@@ -167,8 +170,8 @@ int slap_passwd_parse( struct berval *reqdata,
 
 		if( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-				   "slap_passwd_parse:  ID parse failed.\n" ));
+			LDAP_LOG( OPERATION, ERR,
+			   "slap_passwd_parse:  ID parse failed.\n" , 0, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID parse failed.\n",
 				0, 0, 0 );
@@ -183,8 +186,8 @@ int slap_passwd_parse( struct berval *reqdata,
 	if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_NEW ) {
 		if( newpass == NULL ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-				   "slap_passwd_parse:  NEW not allowed.\n" ));
+			LDAP_LOG( OPERATION, ERR,
+			   "slap_passwd_parse:  NEW not allowed.\n", 0, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: NEW not allowed.\n",
 				0, 0, 0 );
@@ -199,8 +202,8 @@ int slap_passwd_parse( struct berval *reqdata,
 
 		if( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-				   "slap_passwd_parse:  OLD parse failed.\n"));
+			LDAP_LOG( OPERATION, ERR,
+			   "slap_passwd_parse:  OLD parse failed.\n", 0, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD parse failed.\n",
 				0, 0, 0 );
@@ -215,8 +218,8 @@ int slap_passwd_parse( struct berval *reqdata,
 	if( len != 0 ) {
 decoding_error:
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			   "slap_passwd_parse: decoding error, len=%ld\n", (long)len ));
+		LDAP_LOG( OPERATION, ERR, 
+			"slap_passwd_parse: decoding error, len=%ld\n", (long)len, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_TRACE,
 			"slap_passwd_parse: decoding error, len=%ld\n",
@@ -236,15 +239,15 @@ struct berval * slap_passwd_return(
 {
 	int rc;
 	struct berval *bv = NULL;
-	char berbuf[256];
+	char berbuf[LBER_ELEMENT_SIZEOF];
 	/* opaque structure, size unknown but smaller than berbuf */
 	BerElement *ber = (BerElement *)berbuf;
 
 	assert( cred != NULL );
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-		   "slap_passwd_return: %ld\n",(long)cred->bv_len ));
+	LDAP_LOG( OPERATION, ENTRY, 
+		"slap_passwd_return: %ld\n",(long)cred->bv_len, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "slap_passwd_return: %ld\n",
 		(long) cred->bv_len, 0, 0 );
@@ -302,8 +305,7 @@ slap_passwd_generate( struct berval *pass )
 {
 	struct berval *tmp;
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-		   "slap_passwd_generate: begin\n" ));
+	LDAP_LOG( OPERATION, ENTRY, "slap_passwd_generate: begin\n", 0, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "slap_passwd_generate\n", 0, 0, 0 );
 #endif