Suck in latest changes from HEAD

[openldap] / servers / slapd / back-shell / modrdn.c

diff --git a/servers/slapd/back-shell/modrdn.c b/servers/slapd/back-shell/modrdn.c
index 9fd793317d19e6de0f0cf1d64722c60f4047512e..e2c7d64d5f046b7c921c30179a57b5f38915e3a4 100644 (file)
--- a/servers/slapd/back-shell/modrdn.c
+++ b/servers/slapd/back-shell/modrdn.c
@@ -1,48 +1,78 @@
 /* modrdn.c - shell backend modrdn function */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
+/*
+ * LDAP v3 newSuperior support.
+ *
+ * Copyright 1999, Juan C. Gomez, All rights reserved.
+ * This software is not subject to any license of Silicon Graphics 
+ * Inc. or Purdue University.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * without restriction or fee of any kind as long as this notice
+ * is preserved.
+ *
+ */
+
+#include "portable.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/socket.h>
+#include <ac/string.h>
+
 #include "slap.h"
 #include "shell.h"
 
-void
+int
 shell_back_modrdn(
     Backend    *be,
     Connection *conn,
     Operation  *op,
-    char       *dn,
-    char       *newrdn,
-    int                deleteoldrdn
+    struct berval *dn,
+    struct berval *ndn,
+    struct berval *newrdn,
+    struct berval *nnewrdn,
+    int                deleteoldrdn,
+    struct berval *newSuperior,
+    struct berval *nnewSuperior
 )
 {
        struct shellinfo        *si = (struct shellinfo *) be->be_private;
        FILE                    *rfp, *wfp;
 
-       if ( si->si_modrdn == NULL ) {
+       if ( IS_NULLCMD( si->si_modrdn ) ) {
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "modrdn not implemented" );
-               return;
+                   "modrdn not implemented", NULL, NULL );
+               return( -1 );
        }
 
-       if ( (op->o_private = forkandexec( si->si_modrdn, &rfp, &wfp ))
-           == -1 ) {
+       if ( (op->o_private = (void *) forkandexec( si->si_modrdn, &rfp, &wfp ))
+           == (void *) -1 ) {
                send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "could not fork/exec" );
-               return;
+                   "could not fork/exec", NULL, NULL );
+               return( -1 );
        }
 
        /* write out the request to the modrdn process */
        fprintf( wfp, "MODRDN\n" );
-       fprintf( wfp, "msgid: %d\n", op->o_msgid );
+       fprintf( wfp, "opid: %ld/%ld\n", op->o_connid, (long) op->o_msgid );
+       fprintf( wfp, "msgid: %ld\n", (long) op->o_msgid );
        print_suffixes( wfp, be );
-       fprintf( wfp, "dn: %s\n", dn );
-       fprintf( wfp, "newrdn: %s\n", newrdn );
+       fprintf( wfp, "dn: %s\n", dn->bv_val );
+       fprintf( wfp, "newrdn: %s\n", newrdn->bv_val );
        fprintf( wfp, "deleteoldrdn: %d\n", deleteoldrdn ? 1 : 0 );
+       if (newSuperior != NULL) {
+               fprintf( wfp, "newSuperior: %s\n", newSuperior->bv_val );
+       }
        fclose( wfp );
 
        /* read in the results and send them along */
        read_and_send_results( be, conn, op, rfp, NULL, 0 );
        fclose( rfp );
+       return( 0 );
 }