ITS#4634

[openldap] / servers / slapd / back-shell / shell.h

diff --git a/servers/slapd/back-shell/shell.h b/servers/slapd/back-shell/shell.h
index c0ade1fd3ebfd137a1cd5535e0aeab4ce6393e81..d82d0c473a8194f9dbb8609f1c376f93202ff0ee 100644 (file)
--- a/servers/slapd/back-shell/shell.h
+++ b/servers/slapd/back-shell/shell.h
@@ -1,27 +1,49 @@
 /* shell.h - shell backend header file */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
  */
 
 #ifndef SLAPD_SHELL_H
 #define SLAPD_SHELL_H
 
-#include "external.h"
+#include "proto-shell.h"
 
 LDAP_BEGIN_DECL
 
 struct shellinfo {
-       char    **si_bind;      /* cmd + args to exec for bind    */
+       char    **si_bind;              /* cmd + args to exec for bind    */
        char    **si_unbind;    /* cmd + args to exec for unbind  */
        char    **si_search;    /* cmd + args to exec for search  */
        char    **si_compare;   /* cmd + args to exec for compare */
        char    **si_modify;    /* cmd + args to exec for modify  */
        char    **si_modrdn;    /* cmd + args to exec for modrdn  */
-       char    **si_add;       /* cmd + args to exec for add     */
+       char    **si_add;               /* cmd + args to exec for add     */
        char    **si_delete;    /* cmd + args to exec for delete  */
-       char    **si_abandon;   /* cmd + args to exec for abandon */
 };
 
 struct slap_backend_db;
@@ -38,12 +60,9 @@ extern void print_suffixes LDAP_P((
        struct slap_backend_db *bd));
 
 extern int read_and_send_results LDAP_P((
-       struct slap_backend_db *bd,
-       struct slap_conn *conn,
        struct slap_op *op,
-       FILE *fp,
-       struct berval **attrs,
-       int attrsonly));
+       struct slap_rep *rs,
+       FILE *fp));
 
 LDAP_END_DECL