mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
84f81dc593
Call pthread_mutex_destroy() on not used mutex. Changed comments in .h and .c files from // -> /* */ Added detection of mutex on which one didn't call pthread_mutex_destroy() Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression" Added optimisation for ORDER BY NULL BitKeeper/deleted/.del-ChangeLog~dfc92e15bee6fc75: Delete: sql/ChangeLog BUILD/compile-pentium-valgrind-max: Don't use valgrind with safemalloc as this can hide some bugs Makefile.am: Added platform dirs bdb/os/os_handle.c: Portability fix client/mysql.cc: Fixes for Netware. Fixed duplicate output when using 'tee' Simple optimisations client/mysqldump.c: Portability fix client/mysqltest.c: Portability fix configure.in: Fixes for Netware extra/resolveip.c: Fixes for Netware include/Makefile.am: Fixes for Netware include/config-win.h: Portability fix include/my_global.h: Fixes for Netware include/my_net.h: Fixes for Netware include/my_pthread.h: Fixes for Netware Added detection of mutexes that was not destroyed include/my_sys.h: Fixes for Netware Added 'extern' before external functions include/mysql.h: Fixes for Netware innobase/configure.in: Fixes for Netware innobase/include/os0thread.h: Fixes for Netware innobase/os/os0sync.c: Fixes for Netware innobase/os/os0thread.c: Fixes for Netware innobase/srv/srv0srv.c: Fixes for Netware innobase/srv/srv0start.c: Fixes for Netware innobase/sync/sync0sync.c: Fixes for Netware isam/test3.c: Disable test on Netware libmysql/Makefile.shared: Added my_sleep libmysql/get_password.c: Fixes for Netware libmysql/libmysql.c: Fixes for Netware Made mysql_once_init() global libmysql/manager.c: Fixes for Netware myisam/mi_test3.c: Disable test for netware mysql-test/mysql-test-run.sh: Give warning if output file contains errors mysql-test/r/count_distinct.result: More tests mysql-test/r/group_by.result: Test of ORDER BY NULL mysql-test/t/backup.test: Fixes for Netware mysql-test/t/count_distinct.test: More tests mysql-test/t/func_crypt.test: Fixes for Netware mysql-test/t/grant_cache.test: Fixes for Netware mysql-test/t/group_by.test: Tests of ORDER BY NULL mysql-test/t/rpl000015.test: Fixes for Netware mysql-test/t/rpl000017.test: Fixes for Netware mysql-test/t/rpl_rotate_logs.test: Fixes for Netware mysys/Makefile.am: Added my_sleep.c and my_netware.c mysys/charset.c: Fixes for Netware mysys/default.c: Fixes for Netware mysys/mf_tempfile.c: Fixes for Netware mysys/my_clock.c: Fixes for Netware mysys/my_copy.c: Fixes for Netware mysys/my_getwd.c: Changed function comment from // -> /* */ mysys/my_init.c: Fixes for Netware mysys/my_lock.c: Fixes for Netware mysys/my_messnc.c: Fixes for Netware mysys/my_os2cond.c: Removed comment mysys/my_os2dirsrch.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2dirsrch.h: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2file64.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2mutex.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2thread.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2tls.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_pthread.c: Fixes for Netware mysys/my_redel.c: Fixes for Netware mysys/my_tempnam.c: Fixes for Netware mysys/my_thr_init.c: Remove created mutexes when program ends. mysys/mysys_priv.h: Cleanup mysys/safemalloc.c: Prefix error messages with "Error:" mysys/thr_alarm.c: Destroy internal mutex on end_thr_alarm. mysys/thr_mutex.c: Added detection of mutex on which one didn't call pthread_mutex_destroy() scripts/make_binary_distribution.sh: Fixes for Netware sql/des_key_file.cc: Free mutex at end sql/ha_innodb.cc: Free mutex at end sql/ha_myisam.cc: Changed warnings from REPAIR Note: (For mysql-test-run) sql/hostname.cc: Fixes for Netware sql/item.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/item_func.cc: Free used mutexes sql/item_sum.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/log.cc: Free used mutexes sql/my_lock.c: Fixes for Netware sql/mysql_priv.h: Fixes for Netware sql/mysqld.cc: Fixes for Netware Added Have_crypt Properly free mutexes from MYSQL_LOG by calling cleanup Free mutex before exit sql/repl_failsafe.cc: Fixes for Netware sql/set_var.cc: Added have_crypt sql/share/english/errmsg.txt: Added version socket and port to stderr log sql/slave.cc: Remove global MASTER_INFO variable and use instead an allocated variable. This allows us to correctly free used mutex. sql/slave.h: Move constructors and destuctors to slave.cc (To make it easier to clear all needed variables) sql/sql_base.cc: Safety fix sql/sql_class.h: Portability fixes. Added 'cleanup' to log handling to be able to free mutexes. sql/sql_insert.cc: Fixes for Netware mysys/my_sleep.c: E sql/sql_parse.cc: Fixes for Netware sql/sql_select.cc: Added optimisation for ORDER BY NULL sql/sql_select.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_table.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_udf.cc: Free mutex on end vio/test-ssl.c: Simple code cleanup vio/test-sslclient.c: Simple code cleanup vio/test-sslserver.c: Simple code cleanup vio/viotest-ssl.c: Simple code cleanup
150 lines
4.5 KiB
C
150 lines
4.5 KiB
C
/* Copyright (C) 2003 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
Function specific to netware
|
|
*/
|
|
|
|
#include <mysys_priv.h>
|
|
#ifdef __NETWARE__
|
|
#include <library.h>
|
|
|
|
/*
|
|
PMUserLicenseRequest is an API exported by the polimgr.nlm
|
|
(loaded by the NetWare OS when it comes up) for use by other
|
|
NLM-based NetWare products/services.
|
|
PMUserLicenseRequest provides a couple of functions:
|
|
1) it will optionally request a User license or ensure that
|
|
one already exists for the specified User in userInfo
|
|
2) it utilizes the NetWare usage metering service to
|
|
record usage information about your product/service.
|
|
*/
|
|
|
|
long PMMeteredUsageRequest
|
|
(
|
|
/*
|
|
NDS distinguished name or IP address or ??. asciiz string, e.g.
|
|
".CN=Admin.O=this.T=MYTREE."
|
|
*/
|
|
char *userInfo,
|
|
long infoType, /* see defined values */
|
|
/*
|
|
string used to identify the calling service, used to index the
|
|
metered info e.g. "iPrint"
|
|
*/
|
|
char *serviceID,
|
|
char tranAddrType, /* type of address that follows */
|
|
char *tranAddr, /* ptr to a 10-byte array */
|
|
long flags, /* see defined values */
|
|
/* NLS error code, if any. NULL input is okay */
|
|
long *licRequestErrCode,
|
|
/* meter service error code, if any. NULL input is okay */
|
|
long *storeMeterInfoErrCode,
|
|
/*
|
|
error code from NLSMeter if
|
|
storeMeterInfoErrCode == PM_LICREQ_NLSMETERERROR.
|
|
NULL input is okay
|
|
*/
|
|
long *NLSMeterErrCode
|
|
);
|
|
|
|
ypedef long(*PMUR)(char*, long, char*, char, char*, long, long*, long*,
|
|
long*);
|
|
|
|
/* infoType */
|
|
/* indicates that the info in the userInfo param is an NDS user */
|
|
#define PM_USERINFO_TYPE_NDS 1
|
|
/* indicates that the info in the userInfo param is NOT an NDS user */
|
|
#define PM_USERINFO_TYPE_ADDRESS 2
|
|
|
|
/* Flags */
|
|
|
|
/*
|
|
Tells the service that it should not check to see if the NDS user
|
|
contained in the userInfo param has a NetWare User License - just
|
|
record metering information; this is ignored if infoType !=
|
|
PM_USERINFO_TYPE_NDS
|
|
*/
|
|
|
|
#define PM_FLAGS_METER_ONLY 0x0000001
|
|
|
|
/*
|
|
Indicates that the values in the userInfo and serviceID parameters
|
|
are unicode strings, so that the metering service bypasses
|
|
converting these to unicode (again)
|
|
*/
|
|
#define PM_LICREQ_ALREADY_UNICODE 0x0000002
|
|
/*
|
|
Useful only if infoType is PM_USERINFO_TYPE_NDS - indicates a "no
|
|
stop" policy of the calling service
|
|
*/
|
|
#define PM_LICREQ_ALWAYS_METER 0x0000004
|
|
|
|
|
|
/*
|
|
net Address Types - system-defined types of net addresses that can
|
|
be used in the tranAddrType field
|
|
*/
|
|
|
|
#define NLS_TRAN_TYPE_IPX 0x00000001 /* An IPX address */
|
|
#define NLS_TRAN_TYPE_IP 0x00000008 /* An IP address */
|
|
#define NLS_ADDR_TYPE_MAC 0x000000F1 /* a MAC address */
|
|
|
|
/*
|
|
Net Address Sizes - lengths that correspond to the tranAddrType
|
|
field (just fyi)
|
|
*/
|
|
#define NLS_IPX_ADDR_SIZE 10 /* the size of an IPX address */
|
|
#define NLS_IP_ADDR_SIZE 4 /* the size of an IP address */
|
|
#define NLS_MAC_ADDR_SIZE 6 /* the size of a MAC address */
|
|
|
|
|
|
void netware_reg_user(const char *ip, const char *user,
|
|
const char *application)
|
|
{
|
|
PMUR usage_request;
|
|
long licRequestErrCode = 0;
|
|
long storeMeterInfoErrCode = 0;
|
|
long nlsMeterErrCode = 0;
|
|
|
|
/* import the symbol */
|
|
usage_request= ((PMUR)ImportPublicObject(getnlmhandle(),
|
|
"PMMeteredUsageRequest"));
|
|
if (usage_request != NULL)
|
|
{
|
|
unsigned long iaddr;
|
|
char addr[NLS_IPX_ADDR_SIZE];
|
|
|
|
/* create address */
|
|
iaddr = htonl(inet_addr(ip));
|
|
bzero(addr, NLS_IPX_ADDR_SIZE);
|
|
memcpy(addr, &iaddr, NLS_IP_ADDR_SIZE);
|
|
|
|
/* call to NLS */
|
|
usage_request(user,
|
|
PM_USERINFO_TYPE_ADDRESS,
|
|
application,
|
|
NLS_TRAN_TYPE_IP,
|
|
addr,
|
|
PM_FLAGS_METER_ONLY,
|
|
&licRequestErrCode,
|
|
&storeMeterInfoErrCode,
|
|
&nlsMeterErrCode);
|
|
/* release symbol */
|
|
UnImportPublicObject(getnlmhandle(), "PMMeteredUsageRequest");
|
|
}
|
|
}
|
|
#endif /* __NETWARE__ */
|