Cleanup ISO C compatibility for recent commits

[openldap] / servers / slapd / back-passwd / config.c

diff --git a/servers/slapd/back-passwd/config.c b/servers/slapd/back-passwd/config.c
index 3ed61fa9e73045f9abdcab854d8db1283ad468f9..92b1ae27ba2ffaf72965f458a6d493d89f0e2a70 100644 (file)
--- a/servers/slapd/back-passwd/config.c
+++ b/servers/slapd/back-passwd/config.c
@@ -1,4 +1,32 @@
 /* config.c - passwd backend configuration file routine */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2011 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).
+ */
 
 #include "portable.h"
 
@@ -9,36 +37,37 @@
 #include <ac/time.h>
 
 #include "slap.h"
+#include "back-passwd.h"
+#include "config.h"
 
-void
-passwd_back_config(
-    Backend    *be,
-    char       *fname,
-    int                lineno,
-    int                argc,
-    char       **argv
-)
-{
-       /* alternate passwd file */
-       if ( strcasecmp( argv[0], "file" ) == 0 ) {
+static ConfigTable passwdcfg[] = {
+       { "file", "filename", 2, 2, 0,
 #ifdef HAVE_SETPWFILE
-               if ( argc < 2 ) {
-                       fprintf( stderr,
-               "%s: line %d: missing filename in \"file <filename>\" line\n",
-                           fname, lineno );
-                       exit( 1 );
-               }
-               be->be_private = ch_strdup( argv[1] );
-#else /* HAVE_SETPWFILE */
-               fprintf( stderr,
-    "%s: line %d: ignoring \"file\" option (not supported on this platform)\n",
-                           fname, lineno );
-#endif /* HAVE_SETPWFILE */
+               ARG_STRING|ARG_OFFSET, NULL,
+#else
+               ARG_IGNORED, NULL,
+#endif
+               "( OLcfgDbAt:9.1 NAME 'olcPasswdFile' "
+                       "DESC 'File containing passwd records' "
+                       "EQUALITY caseExactMatch "
+                       "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
+       { NULL, NULL, 0, 0, 0, ARG_IGNORED,
+               NULL, NULL, NULL, NULL }
+};
+
+static ConfigOCs passwdocs[] = {
+       { "( OLcfgDbOc:9.1 "
+                       "NAME 'olcPasswdConfig' "
+                       "DESC 'Passwd backend configuration' "
+                       "SUP olcDatabaseConfig "
+                       "MAY olcPasswdFile )",
+                       Cft_Database, passwdcfg },
+       { NULL, 0, NULL }
+};
 
-       /* anything else */
-       } else {
-               fprintf( stderr,
-"%s: line %d: unknown directive \"%s\" in passwd database definition (ignored)\n",
-                   fname, lineno, argv[0] );
-       }
+int
+passwd_back_init_cf( BackendInfo *bi )
+{
+       bi->bi_cf_ocs = passwdocs;
+       return config_register_schema( passwdcfg, passwdocs );
 }