summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1999-03-08 18:41:58 +0000
committerLuke Leighton <lkcl@samba.org>1999-03-08 18:41:58 +0000
commit26c08067f0b3a1dc8b8304eeba27879ed586e3b0 (patch)
tree92c07e57636d21e6ac6a8dd5831eb13008e78f55 /source3/include
parent3e99124f210185485335c47c9fd644acabce27cc (diff)
downloadsamba-26c08067f0b3a1dc8b8304eeba27879ed586e3b0.tar.gz
samba-26c08067f0b3a1dc8b8304eeba27879ed586e3b0.tar.bz2
samba-26c08067f0b3a1dc8b8304eeba27879ed586e3b0.zip
Bejamin Kuit. #define MYSQL and MYSQL_ROW to void iff <mysql.h> not found.
(This used to be commit 188d9a75edb41e8a0cc0ea6e17c9497771cf3b96)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h4
-rw-r--r--source3/include/proto.h9
2 files changed, 13 insertions, 0 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 46bb4d9e5c..0d2561f6bc 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -332,6 +332,10 @@
#if defined(HAVE_MYSQL_H)
#include <mysql.h>
+#else
+/* needed to get make proto to work with no <mysql.h> */
+#define MYSQL void
+#define MYSQL_ROW void
#endif
#ifndef uchar
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 063bcc2c45..bf280df1cd 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1403,19 +1403,28 @@ struct smb_passdb_ops *ldap_initialise_password_db(void);
/*The following definitions come from passdb/mysqlpass.c */
+int mysql_db_lock_connect( MYSQL *handle );
void *mysql_startpwent( BOOL update );
void mysql_endpwent( void *ptr );
SMB_BIG_UINT mysql_getpwpos(void *vp);
BOOL mysql_setpwpos(void *vp, SMB_BIG_UINT pos);
+void *mysql_fill_smb_passwd( MYSQL_ROW *row );
struct smb_passwd *mysql_getsmbpwent(void *vp);
+void *mysql_fetch_passwd( void *(*filler)(MYSQL_ROW*), char *where );
+void *mysql_getpwuid(void *(*filler)(MYSQL_ROW *), uid_t uid);
struct smb_passwd *mysql_getsmbpwuid(uid_t uid);
+void *mysql_getpwnam(void *(*filler)(MYSQL_ROW *), char *field, const char *name);
struct smb_passwd *mysql_getsmbpwnam(const char *unix_name);
+BOOL mysql_del_smb( MYSQL *handle, char *unix_name );
+BOOL mysql_add_smb( MYSQL *handle, struct smb_passwd *smb );
+BOOL mysql_mod_smb( MYSQL *handle, struct smb_passwd *smb, BOOL override );
BOOL mysql_add_smbpwd_entry(struct smb_passwd *smb);
BOOL mysql_mod_smbpwd_entry(struct smb_passwd *smb, BOOL override);
struct smb_passdb_ops *mysql_initialise_password_db(void);
/*The following definitions come from passdb/mysqlsampass.c */
+void *mysql_fill_sam_passwd( MYSQL_ROW *row );
struct sam_passwd *mysql_getsampwent(void *vp);
struct sam_passwd *mysql_getsampwrid(uint32 rid);
struct sam_passwd *mysql_getsampwuid(uid_t uid);