ITS#4844 add missing overlays

[openldap] / libraries / libldap / txn.c

diff --git a/libraries/libldap/txn.c b/libraries/libldap/txn.c
index 575eb49bb500074d3ad0dc0029b659e5329c1463..82cd465de4d2962ff3fd3bf0bdade3d9a2cf4f89 100644 (file)
--- a/libraries/libldap/txn.c
+++ b/libraries/libldap/txn.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004 The OpenLDAP Foundation.
+ * Copyright 2006-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -13,36 +13,143 @@
  * <http://www.OpenLDAP.org/license.html>.
  */
 /* ACKNOWLEDGEMENTS:
- * This program was orignally developed by Kurt D. Zeilenga for inclusion in
- * OpenLDAP Software.
+ * This program was orignally developed by Kurt D. Zeilenga for inclusion
+ * in OpenLDAP Software.
+ */
+
+/*
+ * LDAPv3 Transactions (draft-zeilenga-ldap-txn)
  */
 
 #include "portable.h"
 
+#include <stdio.h>
 #include <ac/stdlib.h>
 
-#include <ac/time.h>
+#include <ac/socket.h>
 #include <ac/string.h>
+#include <ac/time.h>
 
 #include "ldap-int.h"
+#include "ldap_log.h"
+
+#ifdef LDAP_X_TXN
+int
+ldap_txn_start(
+       LDAP *ld,
+       LDAPControl **sctrls,
+       LDAPControl **cctrls,
+       int *msgidp )
+{
+       return ldap_extended_operation( ld, LDAP_EXOP_X_TXN_START,
+               NULL, sctrls, cctrls, msgidp );
+}
 
 int
-ldap_txn_create_s(
+ldap_txn_start_s(
        LDAP *ld,
-       struct berval   **cookie,
-       LDAPControl             **sctrls,
-       LDAPControl             **cctrls )
+       LDAPControl **sctrls,
+       LDAPControl **cctrls,
+       struct berval **txnid )
 {
-       return LDAP_NOT_SUPPORTED;
+       assert( txnid != NULL );
+
+       return ldap_extended_operation_s( ld, LDAP_EXOP_X_TXN_START,
+               NULL, sctrls, cctrls, NULL, txnid );
+}
+
+int
+ldap_txn_end(
+       LDAP *ld,
+       int commit,
+       struct berval *txnid,
+       LDAPControl **sctrls,
+       LDAPControl **cctrls,
+       int *msgidp )
+{
+       int rc;
+       BerElement *txnber = NULL;
+       struct berval *txnval = NULL;
+
+       assert( txnid != NULL );
+
+       txnber = ber_alloc_t( LBER_USE_DER );
+
+       if( commit ) {
+               ber_printf( txnber, "{ON}", txnid );
+       } else {
+               ber_printf( txnber, "{bON}", commit, txnid );
+       }
+
+       ber_flatten( txnber, &txnval );
+
+       rc = ldap_extended_operation( ld, LDAP_EXOP_X_TXN_END,
+               txnval, sctrls, cctrls, msgidp );
+
+       ber_free( txnber, 1 );
+       return rc;
 }
 
 int
 ldap_txn_end_s(
        LDAP *ld,
-       struct berval   *cookie,
-       int                             commit,
-       LDAPControl             **sctrls,
-       LDAPControl             **cctrls )
+       int commit,
+       struct berval *txnid,
+       LDAPControl **sctrls,
+       LDAPControl **cctrls,
+       int *retidp )
 {
-       return LDAP_NOT_SUPPORTED;
+       int rc;
+       BerElement *txnber = NULL;
+       struct berval *txnval = NULL;
+       struct berval *retdata = NULL;
+
+       if ( retidp != NULL ) *retidp = -1;
+
+       txnber = ber_alloc_t( LBER_USE_DER );
+
+       if( commit ) {
+               ber_printf( txnber, "{ON}", txnid );
+       } else {
+               ber_printf( txnber, "{bON}", commit, txnid );
+       }
+
+       ber_flatten( txnber, &txnval );
+
+       rc = ldap_extended_operation_s( ld, LDAP_EXOP_X_TXN_END,
+               txnval, sctrls, cctrls, NULL, &retdata );
+
+       ber_free( txnber, 1 );
+
+       /* parse retdata */
+       if( retdata != NULL ) {
+               BerElement *ber;
+               ber_tag_t tag;
+               ber_int_t retid;
+
+               if( retidp == NULL ) goto done;
+
+               ber = ber_init( retdata );
+
+               if( ber == NULL ) {
+                       rc = ld->ld_errno = LDAP_NO_MEMORY;
+                       goto done;
+               }
+
+               tag = ber_scanf( ber, "i", &retid );
+               ber_free( ber, 1 );
+
+               if ( tag != LBER_INTEGER ) {
+                       rc = ld->ld_errno = LDAP_DECODING_ERROR;
+                       goto done;
+               }
+
+               *retidp = (int) retid;
+
+done:
+               ber_bvfree( retdata );
+       }
+
+       return rc;
 }
+#endif