X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-shell%2Fconfig.c;h=467d95f6d695c7bb87cade78052dd5a3b8ffca16;hb=63e843d2003ddf20f3725ad439991e769ffc792a;hp=5fa4876a357a57f7ade3a09fa24d64cd46b287c0;hpb=e0eba072443fc49e2c83f3f74d09b7e0ee4f45bb;p=openldap
diff --git a/servers/slapd/back-shell/config.c b/servers/slapd/back-shell/config.c
index 5fa4876a35..467d95f6d6 100644
--- a/servers/slapd/back-shell/config.c
+++ b/servers/slapd/back-shell/config.c
@@ -1,8 +1,31 @@
/* config.c - shell backend configuration file routine */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2005 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
+ * .
+ */
+/* 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).
*/
#include "portable.h"
@@ -40,7 +63,7 @@ shell_back_db_config(
fname, lineno );
return( 1 );
}
- si->si_bind = charray_dup( &argv[1] );
+ si->si_bind = ldap_charray_dup( &argv[1] );
/* command + args to exec for unbinds */
} else if ( strcasecmp( argv[0], "unbind" ) == 0 ) {
@@ -50,7 +73,7 @@ shell_back_db_config(
fname, lineno );
return( 1 );
}
- si->si_unbind = charray_dup( &argv[1] );
+ si->si_unbind = ldap_charray_dup( &argv[1] );
/* command + args to exec for searches */
} else if ( strcasecmp( argv[0], "search" ) == 0 ) {
@@ -60,7 +83,7 @@ shell_back_db_config(
fname, lineno );
return( 1 );
}
- si->si_search = charray_dup( &argv[1] );
+ si->si_search = ldap_charray_dup( &argv[1] );
/* command + args to exec for compares */
} else if ( strcasecmp( argv[0], "compare" ) == 0 ) {
@@ -70,7 +93,7 @@ shell_back_db_config(
fname, lineno );
return( 1 );
}
- si->si_compare = charray_dup( &argv[1] );
+ si->si_compare = ldap_charray_dup( &argv[1] );
/* command + args to exec for modifies */
} else if ( strcasecmp( argv[0], "modify" ) == 0 ) {
@@ -80,7 +103,7 @@ shell_back_db_config(
fname, lineno );
return( 1 );
}
- si->si_modify = charray_dup( &argv[1] );
+ si->si_modify = ldap_charray_dup( &argv[1] );
/* command + args to exec for modrdn */
} else if ( strcasecmp( argv[0], "modrdn" ) == 0 ) {
@@ -90,7 +113,7 @@ shell_back_db_config(
fname, lineno );
return( 1 );
}
- si->si_modrdn = charray_dup( &argv[1] );
+ si->si_modrdn = ldap_charray_dup( &argv[1] );
/* command + args to exec for add */
} else if ( strcasecmp( argv[0], "add" ) == 0 ) {
@@ -100,7 +123,7 @@ shell_back_db_config(
fname, lineno );
return( 1 );
}
- si->si_add = charray_dup( &argv[1] );
+ si->si_add = ldap_charray_dup( &argv[1] );
/* command + args to exec for delete */
} else if ( strcasecmp( argv[0], "delete" ) == 0 ) {
@@ -110,23 +133,11 @@ shell_back_db_config(
fname, lineno );
return( 1 );
}
- si->si_delete = charray_dup( &argv[1] );
-
- /* command + args to exec for abandon */
- } else if ( strcasecmp( argv[0], "abandon" ) == 0 ) {
- if ( argc < 2 ) {
- fprintf( stderr,
- "%s: line %d: missing executable in \"abandon \" line\n",
- fname, lineno );
- return( 1 );
- }
- si->si_abandon = charray_dup( &argv[1] );
+ si->si_delete = ldap_charray_dup( &argv[1] );
/* anything else */
} else {
- fprintf( stderr,
-"%s: line %d: unknown directive \"%s\" in shell database definition (ignored)\n",
- fname, lineno, argv[0] );
+ return SLAP_CONF_UNKNOWN;
}
return 0;