From: Pierangelo Masarati Date: Mon, 3 Jan 2005 10:51:59 +0000 (+0000) Subject: mostly copyright cleanup; removal of unnecessary headers X-Git-Tag: OPENLDAP_REL_ENG_2_3_BP~471 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=edc9b936d051d462a090d46bace7a85db607b4b9;p=openldap mostly copyright cleanup; removal of unnecessary headers --- diff --git a/servers/slapd/back-sql/add.c b/servers/slapd/back-sql/add.c index 310e5e26cd..55903e4047 100644 --- a/servers/slapd/back-sql/add.c +++ b/servers/slapd/back-sql/add.c @@ -3,6 +3,7 @@ * * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2002 Pierangelo Masarati. * Portions Copyright 2004 Mark Adamson. * All rights reserved. * @@ -16,7 +17,9 @@ */ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati and Mark Adamson. + */ #include "portable.h" diff --git a/servers/slapd/back-sql/api.c b/servers/slapd/back-sql/api.c index 78b8f151c7..763956b049 100644 --- a/servers/slapd/back-sql/api.c +++ b/servers/slapd/back-sql/api.c @@ -2,6 +2,7 @@ * * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2004 Pierangelo Masarati. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -14,7 +15,8 @@ */ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati. */ #include "portable.h" diff --git a/servers/slapd/back-sql/back-sql.h b/servers/slapd/back-sql/back-sql.h index 0275bfd570..a949b8c0a2 100644 --- a/servers/slapd/back-sql/back-sql.h +++ b/servers/slapd/back-sql/back-sql.h @@ -18,7 +18,7 @@ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion * by OpenLDAP Software. Additional significant contributors include - * Pierangelo Mararati and Mark Adamson. + * Pierangelo Masarati and Mark Adamson. */ /* * The following changes have been addressed: @@ -71,7 +71,7 @@ * BACKSQL_REALLOC_STMT from modify.c (a more recent unixODBC lib?) */ /* - * Improvements submitted by (ITS#) + * Improvements submitted by (ITS#3432) * * 1. id_query.patch applied (with changes) * 2. shortcut.patch applied (reworked) @@ -170,7 +170,17 @@ can be easily distinguished. #ifndef __BACKSQL_H__ #define __BACKSQL_H__ -#include "sql-types.h" +/* former sql-types.h */ +#include +#include + +typedef struct { + SWORD ncols; + BerVarray col_names; + UDWORD *col_prec; + char **cols; + SQLINTEGER *value_len; +} BACKSQL_ROW_NTS; /* * Better use the standard length of 8192 (as of slap.h)? diff --git a/servers/slapd/back-sql/bind.c b/servers/slapd/back-sql/bind.c index cb5f26e888..ce4edaf83c 100644 --- a/servers/slapd/back-sql/bind.c +++ b/servers/slapd/back-sql/bind.c @@ -3,6 +3,7 @@ * * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2002 Pierangelo Masarati. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -15,7 +16,8 @@ */ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati. */ #include "portable.h" diff --git a/servers/slapd/back-sql/compare.c b/servers/slapd/back-sql/compare.c index 51a22c79f4..08f4c7f356 100644 --- a/servers/slapd/back-sql/compare.c +++ b/servers/slapd/back-sql/compare.c @@ -3,6 +3,7 @@ * * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2002 Pierangelo Masarati. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -15,7 +16,8 @@ */ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati. */ #include "portable.h" diff --git a/servers/slapd/back-sql/config.c b/servers/slapd/back-sql/config.c index 8dc1f46d27..965ba89180 100644 --- a/servers/slapd/back-sql/config.c +++ b/servers/slapd/back-sql/config.c @@ -3,6 +3,7 @@ * * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2002 Pierangelo Masarati. * Portions Copyright 2004 Mark Adamson. * All rights reserved. * @@ -16,7 +17,8 @@ */ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati. */ #include "portable.h" diff --git a/servers/slapd/back-sql/delete.c b/servers/slapd/back-sql/delete.c index b80cffc204..fb0538b09d 100644 --- a/servers/slapd/back-sql/delete.c +++ b/servers/slapd/back-sql/delete.c @@ -3,6 +3,7 @@ * * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2002 Pierangelo Masarati. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -15,7 +16,8 @@ */ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati. */ #include "portable.h" diff --git a/servers/slapd/back-sql/entry-id.c b/servers/slapd/back-sql/entry-id.c index c7ebc7bc1d..8bd0e0daee 100644 --- a/servers/slapd/back-sql/entry-id.c +++ b/servers/slapd/back-sql/entry-id.c @@ -3,6 +3,7 @@ * * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2002 Pierangelo Masarati. * Portions Copyright 2004 Mark Adamson. * All rights reserved. * @@ -16,7 +17,8 @@ */ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati and Mark Adamson. */ #include "portable.h" diff --git a/servers/slapd/back-sql/init.c b/servers/slapd/back-sql/init.c index 645c073418..28d56e76d9 100644 --- a/servers/slapd/back-sql/init.c +++ b/servers/slapd/back-sql/init.c @@ -3,6 +3,7 @@ * * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2002 Pierangelo Masarati. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -15,7 +16,8 @@ */ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati. */ #include "portable.h" diff --git a/servers/slapd/back-sql/modify.c b/servers/slapd/back-sql/modify.c index ad02bbd225..b1edff898c 100644 --- a/servers/slapd/back-sql/modify.c +++ b/servers/slapd/back-sql/modify.c @@ -3,6 +3,7 @@ * * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2002 Pierangelo Masarati. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -15,7 +16,8 @@ */ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati. */ #include "portable.h" diff --git a/servers/slapd/back-sql/modrdn.c b/servers/slapd/back-sql/modrdn.c index 60155c2924..847ae82d84 100644 --- a/servers/slapd/back-sql/modrdn.c +++ b/servers/slapd/back-sql/modrdn.c @@ -3,6 +3,7 @@ * * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2002 Pierangelo Masarati. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -15,7 +16,8 @@ */ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati. */ #include "portable.h" diff --git a/servers/slapd/back-sql/operational.c b/servers/slapd/back-sql/operational.c index 2b026ac51f..72f73017a1 100644 --- a/servers/slapd/back-sql/operational.c +++ b/servers/slapd/back-sql/operational.c @@ -3,6 +3,7 @@ * * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2002 Pierangelo Masarati. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -15,7 +16,8 @@ */ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati. */ #include "portable.h" diff --git a/servers/slapd/back-sql/proto-sql.h b/servers/slapd/back-sql/proto-sql.h index 2dd2a59d79..b03f3ecbf5 100644 --- a/servers/slapd/back-sql/proto-sql.h +++ b/servers/slapd/back-sql/proto-sql.h @@ -16,7 +16,7 @@ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion * by OpenLDAP Software. Additional significant contributors include - * Pierangelo Mararati + * Pierangelo Masarati */ /* @@ -74,7 +74,6 @@ #define PROTO_SQL_H #include "back-sql.h" -#include "sql-types.h" /* * add.c diff --git a/servers/slapd/back-sql/schema-map.c b/servers/slapd/back-sql/schema-map.c index 14abdf71d1..2dbd05915e 100644 --- a/servers/slapd/back-sql/schema-map.c +++ b/servers/slapd/back-sql/schema-map.c @@ -3,6 +3,7 @@ * * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2002 Pierangelo Masarati. * Portions Copyright 2004 Mark Adamson. * All rights reserved. * @@ -16,7 +17,8 @@ */ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati and Mark Adamson. */ #include "portable.h" diff --git a/servers/slapd/back-sql/schema-map.h b/servers/slapd/back-sql/schema-map.h deleted file mode 100644 index 68ca575d6e..0000000000 --- a/servers/slapd/back-sql/schema-map.h +++ /dev/null @@ -1,116 +0,0 @@ -/* $OpenLDAP$ */ -/* This work is part of OpenLDAP Software . - * - * Copyright 1999-2005 The OpenLDAP Foundation. - * Portions Copyright 1999 Dmitry Kovalev. - * 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 - * . - */ -/* ACKNOWLEDGEMENTS: - * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. - */ - -#ifndef __BACKSQL_SCHEMA_MAP_H__ -#define __BACKSQL_SCHEMA_MAP_H__ - -typedef struct backsql_oc_map_rec { - /* - * Structure of corresponding LDAP objectClass definition - */ - ObjectClass *bom_oc; -#define BACKSQL_OC_NAME(ocmap) ((ocmap)->bom_oc->soc_cname.bv_val) - - struct berval bom_keytbl; - struct berval bom_keycol; - /* expected to return keyval of newly created entry */ - char *bom_create_proc; - /* in case create_proc does not return the keyval of the newly - * created row */ - char *bom_create_keyval; - /* supposed to expect keyval as parameter and delete - * all the attributes as well */ - char *bom_delete_proc; - /* flags whether delete_proc is a function (whether back-sql - * should bind first parameter as output for return code) */ - int bom_expect_return; - unsigned long bom_id; - Avlnode *bom_attrs; -} backsql_oc_map_rec; - -typedef struct backsql_at_map_rec { - /* Description of corresponding LDAP attribute type */ - AttributeDescription *bam_ad; - /* ObjectClass if bam_ad is objectClass */ - ObjectClass *bam_oc; - - struct berval bam_from_tbls; - struct berval bam_join_where; - struct berval bam_sel_expr; - - /* TimesTen, or, if a uppercase function is defined, - * an uppercased version of bam_sel_expr */ - struct berval bam_sel_expr_u; - - /* supposed to expect 2 binded values: entry keyval - * and attr. value to add, like "add_name(?,?,?)" */ - char *bam_add_proc; - /* supposed to expect 2 binded values: entry keyval - * and attr. value to delete */ - char *bam_delete_proc; - /* for optimization purposes attribute load query - * is preconstructed from parts on schemamap load time */ - char *bam_query; - /* following flags are bitmasks (first bit used for add_proc, - * second - for delete_proc) */ - /* order of parameters for procedures above; - * 1 means "data then keyval", 0 means "keyval then data" */ - int bam_param_order; - /* flags whether one or more of procedures is a function - * (whether back-sql should bind first parameter as output - * for return code) */ - int bam_expect_return; - - /* next mapping for attribute */ - struct backsql_at_map_rec *bam_next; -} backsql_at_map_rec; - -#define BACKSQL_AT_MAP_REC_INIT { NULL, NULL, BER_BVC(""), BER_BVC(""), BER_BVNULL, BER_BVNULL, NULL, NULL, NULL, 0, 0, NULL } - -/* define to uppercase filters only if the matching rule requires it - * (currently broken) */ -/* #define BACKSQL_UPPERCASE_FILTER */ -#define BACKSQL_AT_CANUPPERCASE(at) ((at)->bam_sel_expr_u.bv_val) - -/* defines to support bitmasks above */ -#define BACKSQL_ADD 0x1 -#define BACKSQL_DEL 0x2 - -#define BACKSQL_IS_ADD(x) ( BACKSQL_ADD & (x) ) -#define BACKSQL_IS_DEL(x) ( BACKSQL_DEL & (x) ) - -#define BACKSQL_NCMP(v1,v2) ber_bvcmp((v1),(v2)) - -int backsql_load_schema_map( backsql_info *si, SQLHDBC dbh ); -/* Deprecated */ -backsql_oc_map_rec *backsql_name2oc( backsql_info *si, struct berval *oc_name ); -backsql_oc_map_rec *backsql_oc2oc( backsql_info *si, ObjectClass *oc ); -backsql_oc_map_rec *backsql_id2oc( backsql_info *si, unsigned long id ); -/* Deprecated */ -backsql_at_map_rec *backsql_name2at( backsql_oc_map_rec *objclass, - struct berval *at_name ); -backsql_at_map_rec *backsql_ad2at( backsql_oc_map_rec *objclass, - AttributeDescription *ad ); -int backsql_supad2at( backsql_oc_map_rec *objclass, - AttributeDescription *supad, backsql_at_map_rec ***pret ); -int backsql_destroy_schema_map( backsql_info *si ); - -#endif /* __BACKSQL_SCHEMA_MAP_H__ */ - diff --git a/servers/slapd/back-sql/search.c b/servers/slapd/back-sql/search.c index b5c8766269..3097e18fea 100644 --- a/servers/slapd/back-sql/search.c +++ b/servers/slapd/back-sql/search.c @@ -3,6 +3,7 @@ * * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2002 Pierangelo Masarati. * Portions Copyright 2004 Mark Adamson. * All rights reserved. * @@ -16,7 +17,8 @@ */ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati and Mark Adamson. */ #include "portable.h" diff --git a/servers/slapd/back-sql/sql-types.h b/servers/slapd/back-sql/sql-types.h deleted file mode 100644 index b1f061dc9e..0000000000 --- a/servers/slapd/back-sql/sql-types.h +++ /dev/null @@ -1,35 +0,0 @@ -/* $OpenLDAP$ */ -/* This work is part of OpenLDAP Software . - * - * Copyright 1999-2005 The OpenLDAP Foundation. - * Portions Copyright 1999 Dmitry Kovalev. - * 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 - * . - */ -/* ACKNOWLEDGEMENTS: - * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. - */ -#ifndef __BACKSQL_SQL_TYPES_H__ -#define __BACKSQL_SQL_TYPES_H__ - -#include -#include - -typedef struct { - SWORD ncols; - BerVarray col_names; - UDWORD *col_prec; - char **cols; - SQLINTEGER *value_len; -} BACKSQL_ROW_NTS; - -#endif /* __BACKSQL_SQL_TYPES_H__ */ - diff --git a/servers/slapd/back-sql/sql-wrap.c b/servers/slapd/back-sql/sql-wrap.c index f69caae989..c691952c21 100644 --- a/servers/slapd/back-sql/sql-wrap.c +++ b/servers/slapd/back-sql/sql-wrap.c @@ -3,6 +3,7 @@ * * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2002 Pierangelo Masarati. * Portions Copyright 2004 Mark Adamson. * All rights reserved. * @@ -16,7 +17,8 @@ */ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati and Mark Adamson. */ #include "portable.h" diff --git a/servers/slapd/back-sql/util.c b/servers/slapd/back-sql/util.c index c302566838..dcc30bf20e 100644 --- a/servers/slapd/back-sql/util.c +++ b/servers/slapd/back-sql/util.c @@ -3,6 +3,7 @@ * * Copyright 1999-2005 The OpenLDAP Foundation. * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2002 Pierangelo Masarati. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -15,7 +16,8 @@ */ /* ACKNOWLEDGEMENTS: * This work was initially developed by Dmitry Kovalev for inclusion - * by OpenLDAP Software. + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati. */ #include "portable.h"