X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fpasswd.c;h=bec86197894430933f815cbd5ff677c2b8bbcab5;hb=6df9b5459294bcc9adf27f048508d43eea58a203;hp=38cee4b7c6153126c4c30234c0671befd1b11aa2;hpb=b57c11f4bd23e0fe9dec8bae3af2fcd7494a8f98;p=openldap

diff --git a/servers/slapd/back-bdb/passwd.c b/servers/slapd/back-bdb/passwd.c
index 38cee4b7c6..bec8619789 100644
--- a/servers/slapd/back-bdb/passwd.c
+++ b/servers/slapd/back-bdb/passwd.c
@@ -91,7 +91,7 @@ retry:	/* transaction retry */
 			bdb_cache_return_entry_w(&bdb->bi_cache, e);
 		}
 		Debug( LDAP_DEBUG_TRACE, "bdb_exop_passwd: retrying...\n", 0, 0, 0 );
-		rc = txn_abort( ltid );
+		rc = TXN_ABORT( ltid );
 		ltid = NULL;
 		op->o_private = NULL;
 		if( rc != 0 ) {
@@ -103,7 +103,7 @@ retry:	/* transaction retry */
 	}
 
 	/* begin transaction */
-	rc = txn_begin( bdb->bi_dbenv, NULL, &ltid, 
+	rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, 
 		bdb->bi_db_opflags );
 	*text = NULL;
 	if( rc != 0 ) {
@@ -208,9 +208,9 @@ retry:	/* transaction retry */
 
 		if( rc == 0 ) {
 			if( op->o_noop ) {
-				rc = txn_abort( ltid );
+				rc = TXN_ABORT( ltid );
 			} else {
-				rc = txn_commit( ltid, 0 );
+				rc = TXN_COMMIT( ltid, 0 );
 			}
 			ltid = NULL;
 		}
@@ -231,7 +231,7 @@ done:
 	}
 
 	if( ltid != NULL ) {
-		txn_abort( ltid );
+		TXN_ABORT( ltid );
 		op->o_private = NULL;
 	}