X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0756eb3cb50d73a77b486e47528f7cb1bffdb299..42c7f0b4ea09d8971a19beeef743ec8981d4aacc:/src/src/lookups/oracle.c diff --git a/src/src/lookups/oracle.c b/src/src/lookups/oracle.c index b438b3bb1..d106c519f 100644 --- a/src/src/lookups/oracle.c +++ b/src/src/lookups/oracle.c @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/src/lookups/oracle.c,v 1.1 2004/10/07 13:10:01 ph10 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2004 */ +/* Copyright (c) University of Cambridge 1995 - 2015 */ /* See the file NOTICE for conditions of use and distribution. */ /* Interface to an Oracle database. This code was originally supplied by @@ -15,36 +13,26 @@ some comments from my position of Oracle ignorance. */ #include "../exim.h" -/* We can't just compile this code and allow the library mechanism to omit the -functions if they are not wanted, because we need to have the ORACLE headers -available for compiling. Therefore, compile these functions only if -LOOKUP_ORACLE is defined. However, some compilers don't like compiling empty -modules, so keep them happy with a dummy when skipping the rest. Make it -reference itself to stop picky compilers complaining that it is unused, and put -in a dummy argument to stop even pickier compilers complaining about infinite -loops. */ - -#ifndef LOOKUP_ORACLE -static void dummy(int x) { dummy(x-1); } -#else - /* The Oracle system headers */ #include #include #include -#include "oracle.h" /* The local header */ - #define PARSE_NO_DEFER 0 /* parse straight away */ #define PARSE_V7_LNG 2 #define MAX_ITEM_BUFFER_SIZE 1024 /* largest size of a cell of data */ #define MAX_SELECT_LIST_SIZE 32 /* maximum number of columns (not rows!) */ /* Paul's comment on this was "change this to 512 for 64bit cpu", but I don't -understand why. The Oracle manual just asks for 256 bytes. */ +understand why. The Oracle manual just asks for 256 bytes. -#define HDA_SIZE 256 +That was years ago. Jin Choi suggested (March 2007) that this change should +be made in the source, as at worst it wastes 256 bytes, and it saves people +having to discover about this for themselves as more and more systems are +64-bit. So I have changed 256 to 512. */ + +#define HDA_SIZE 512 /* Internal/external datatype codes */ @@ -207,7 +195,7 @@ return col; /* See local README for interface description. */ -void * +static void * oracle_open(uschar *filename, uschar **errmsg) { return (void *)(1); /* Just return something non-null */ @@ -221,14 +209,14 @@ return (void *)(1); /* Just return something non-null */ /* See local README for interface description. */ -void +static void oracle_tidy(void) { oracle_connection *cn; while ((cn = oracle_connections) != NULL) { oracle_connections = cn->next; - DEBUG(D_lookup) debug_printf("close ORACLE connection: %s\n", cn->server); + DEBUG(D_lookup) debug_printf_indent("close ORACLE connection: %s\n", cn->server); ologof(cn->handle); } } @@ -266,23 +254,19 @@ Ora_Describe *desc = NULL; Ora_Define *def = NULL; void *hda = NULL; -int i; -int ssize = 0; -int offset = 0; int yield = DEFER; unsigned int num_fields = 0; -uschar *result = NULL; +gstring * result = NULL; oracle_connection *cn = NULL; uschar *server_copy = NULL; uschar *sdata[4]; -uschar tmp[1024]; /* Disaggregate the parameters from the server argument. The order is host, database, user, password. We can write to the string, since it is in a nextinlist temporary buffer. The copy of the string that is used for caching has the password removed. This copy is also used for debugging output. */ -for (i = 3; i > 0; i--) +for (int i = 3; i > 0; i--) { uschar *pp = Ustrrchr(server, '/'); if (pp == NULL) @@ -304,21 +288,19 @@ if (sdata[1][0] == 0) sdata[1] = NULL; /* See if we have a cached connection to the server */ -for (cn = oracle_connections; cn != NULL; cn = cn->next) - { +for (cn = oracle_connections; cn; cn = cn->next) if (strcmp(cn->server, server_copy) == 0) { oracle_handle = cn->handle; hda = cn->hda_mem; break; } - } /* If no cached connection, we must set one up */ -if (cn == NULL) +if (!cn) { - DEBUG(D_lookup) debug_printf("ORACLE new connection: host=%s database=%s " + DEBUG(D_lookup) debug_printf_indent("ORACLE new connection: host=%s database=%s " "user=%s\n", sdata[0], sdata[1], sdata[2]); /* Get store for a new connection, initialize it, and connect to the server */ @@ -361,7 +343,7 @@ to obliterate the password because it is in a nextinlist temporary buffer. */ else { DEBUG(D_lookup) - debug_printf("ORACLE using cached connection for %s\n", server_copy); + debug_printf_indent("ORACLE using cached connection for %s\n", server_copy); } /* We have a connection. Open a cursor and run the query */ @@ -412,16 +394,16 @@ while (cda->rc != NO_DATA_FOUND) /* Loop for each row */ ofetch(cda); if(cda->rc == NO_DATA_FOUND) break; - if (result != NULL) result = string_cat(result, &ssize, &offset, "\n", 1); + if (result) result = string_catn(result, "\n", 1); /* Single field - just add on the data */ if (num_fields == 1) - result = string_cat(result, &ssize, &offset, def[0].buf, def[0].col_retlen); + result = string_catn(result, def[0].buf, def[0].col_retlen); /* Multiple fields - precede by file name, removing {lead,trail}ing WS */ - else for (i = 0; i < num_fields; i++) + else for (int i = 0; i < num_fields; i++) { int slen; uschar *s = US desc[i].buf; @@ -429,51 +411,47 @@ while (cda->rc != NO_DATA_FOUND) /* Loop for each row */ while (*s != 0 && isspace(*s)) s++; slen = Ustrlen(s); while (slen > 0 && isspace(s[slen-1])) slen--; - result = string_cat(result, &ssize, &offset, s, slen); - result = string_cat(result, &ssize, &offset, US"=", 1); + result = string_catn(result, s, slen); + result = string_catn(result, US"=", 1); - /* int and float type wont ever need escaping. Otherwise, quote the value + /* int and float type won't ever need escaping. Otherwise, quote the value if it contains spaces or is empty. */ if (desc[i].dbtype != INT_TYPE && desc[i].dbtype != FLOAT_TYPE && (def[i].buf[0] == 0 || strchr(def[i].buf, ' ') != NULL)) { - int j; - result = string_cat(result, &ssize, &offset, "\"", 1); - for (j = 0; j < def[i].col_retlen; j++) + result = string_catn(result, "\"", 1); + for (int j = 0; j < def[i].col_retlen; j++) { if (def[i].buf[j] == '\"' || def[i].buf[j] == '\\') - result = string_cat(result, &ssize, &offset, "\\", 1); - result = string_cat(result, &ssize, &offset, def[i].buf+j, 1); + result = string_catn(result, "\\", 1); + result = string_catn(result, def[i].buf+j, 1); } - result = string_cat(result, &ssize, &offset, "\"", 1); + result = string_catn(result, "\"", 1); } else switch(desc[i].dbtype) { case INT_TYPE: - sprintf(CS tmp, "%d", def[i].int_buf); - result = string_cat(result, &ssize, &offset, tmp, Ustrlen(tmp)); - break; + result = string_cat(result, string_sprintf("%d", def[i].int_buf)); + break; case FLOAT_TYPE: - sprintf(CS tmp, "%f", def[i].flt_buf); - result = string_cat(result, &ssize, &offset, tmp, Ustrlen(tmp)); - break; + result = string_cat(result, string_sprintf("%f", def[i].flt_buf)); + break; case STRING_TYPE: - result = string_cat(result, &ssize, &offset, def[i].buf, - def[i].col_retlen); - break; + result = string_catn(result, def[i].buf, def[i].col_retlen); + break; default: - *errmsg = string_sprintf("ORACLE: unknown field type %d", desc[i].dbtype); - *defer_break = FALSE; - result = NULL; - goto ORACLE_EXIT; + *errmsg = string_sprintf("ORACLE: unknown field type %d", desc[i].dbtype); + *defer_break = FALSE; + result = NULL; + goto ORACLE_EXIT; } - result = string_cat(result, &ssize, &offset, " ", 1); + result = string_catn(result, " ", 1); } } @@ -481,16 +459,13 @@ while (cda->rc != NO_DATA_FOUND) /* Loop for each row */ Otherwise, we must terminate the string which has been built; string_cat() always leaves enough room for a terminating zero. */ -if (result == NULL) +if (!result) { yield = FAIL; *errmsg = "ORACLE: no data found"; } else - { - result[offset] = 0; - store_reset(result + offset + 1); - } + store_reset(result->s + result->ptr + 1); /* Get here by goto from various error checks. */ @@ -502,16 +477,16 @@ oclose(cda); ORACLE_EXIT_NO_VALS: -/* Non-NULL result indicates a sucessful result */ +/* Non-NULL result indicates a successful result */ -if (result != NULL) +if (result) { - *resultptr = result; + *resultptr = string_from_gstring(result); return OK; } else { - DEBUG(D_lookup) debug_printf("%s\n", *errmsg); + DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg); return yield; /* FAIL or DEFER */ } } @@ -527,9 +502,9 @@ else arguments are not used. Loop through a list of servers while the query is deferred with a retryable error. */ -int +static int oracle_find(void *handle, uschar *filename, uschar *query, int length, - uschar **result, uschar **errmsg, BOOL *do_cache) + uschar **result, uschar **errmsg, uint *do_cache) { int sep = 0; uschar *server; @@ -538,7 +513,7 @@ uschar buffer[512]; do_cache = do_cache; /* Placate picky compilers */ -DEBUG(D_lookup) debug_printf("ORACLE query: %s\n", query); +DEBUG(D_lookup) debug_printf_indent("ORACLE query: %s\n", query); while ((server = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL) { @@ -572,7 +547,7 @@ Arguments: Returns: the processed string or NULL for a bad option */ -uschar * +static uschar * oracle_quote(uschar *s, uschar *opt) { register int c; @@ -614,6 +589,41 @@ while ((c = *s++) != 0) return quoted; } -#endif /* LOOKUP_ORACLE */ + +/************************************************* +* Version reporting entry point * +*************************************************/ + +/* See local README for interface description. */ + +#include "../version.h" + +void +oracle_version_report(FILE *f) +{ +#ifdef DYNLOOKUP +fprintf(f, "Library version: Oracle: Exim version %s\n", EXIM_VERSION_STR); +#endif +} + + +static lookup_info _lookup_info = { + US"oracle", /* lookup name */ + lookup_querystyle, /* query-style lookup */ + oracle_open, /* open function */ + NULL, /* check function */ + oracle_find, /* find function */ + NULL, /* no close function */ + oracle_tidy, /* tidy function */ + oracle_quote, /* quoting function */ + oracle_version_report /* version reporting */ +}; + +#ifdef DYNLOOKUP +#define oracle_lookup_module_info _lookup_module_info +#endif + +static lookup_info *_lookup_list[] = { &_lookup_info }; +lookup_module_info oracle_lookup_module_info = { LOOKUP_MODULE_INFO_MAGIC, _lookup_list, 1 }; /* End of lookups/oracle.c */