X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-shell%2Fconfig.c;h=39e3f15f6408609a22f4b1047c9fae5e7d02e23e;hb=89812424f4f844053cc2607e3e5e9382b0825bb8;hp=10aee26a2c795c6e3accb906e796dd0410ddae51;hpb=2a869f5a99f537b246ba8640502e2a86117cb6e8;p=openldap
diff --git a/servers/slapd/back-shell/config.c b/servers/slapd/back-shell/config.c
index 10aee26a2c..39e3f15f64 100644
--- a/servers/slapd/back-shell/config.c
+++ b/servers/slapd/back-shell/config.c
@@ -1,4 +1,32 @@
/* config.c - shell backend configuration file routine */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2004 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"
@@ -10,11 +38,10 @@
#include "slap.h"
#include "shell.h"
-extern char **charray_dup();
-
-shell_back_config(
- Backend *be,
- char *fname,
+int
+shell_back_db_config(
+ BackendDB *be,
+ const char *fname,
int lineno,
int argc,
char **argv
@@ -25,7 +52,7 @@ shell_back_config(
if ( si == NULL ) {
fprintf( stderr, "%s: line %d: shell backend info is null!\n",
fname, lineno );
- exit( 1 );
+ return( 1 );
}
/* command + args to exec for binds */
@@ -34,9 +61,9 @@ shell_back_config(
fprintf( stderr,
"%s: line %d: missing executable in \"bind \" line\n",
fname, lineno );
- exit( 1 );
+ 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 ) {
@@ -44,9 +71,9 @@ shell_back_config(
fprintf( stderr,
"%s: line %d: missing executable in \"unbind \" line\n",
fname, lineno );
- exit( 1 );
+ 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 ) {
@@ -54,9 +81,9 @@ shell_back_config(
fprintf( stderr,
"%s: line %d: missing executable in \"search \" line\n",
fname, lineno );
- exit( 1 );
+ 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 ) {
@@ -64,9 +91,9 @@ shell_back_config(
fprintf( stderr,
"%s: line %d: missing executable in \"compare \" line\n",
fname, lineno );
- exit( 1 );
+ 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 ) {
@@ -74,9 +101,9 @@ shell_back_config(
fprintf( stderr,
"%s: line %d: missing executable in \"modify \" line\n",
fname, lineno );
- exit( 1 );
+ 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 ) {
@@ -84,9 +111,9 @@ shell_back_config(
fprintf( stderr,
"%s: line %d: missing executable in \"modrdn \" line\n",
fname, lineno );
- exit( 1 );
+ 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 ) {
@@ -94,9 +121,9 @@ shell_back_config(
fprintf( stderr,
"%s: line %d: missing executable in \"add \" line\n",
fname, lineno );
- exit( 1 );
+ 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 ) {
@@ -104,24 +131,14 @@ shell_back_config(
fprintf( stderr,
"%s: line %d: missing executable in \"delete \" line\n",
fname, lineno );
- exit( 1 );
+ 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 );
- exit( 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;
}