From 30191d1a5704ad2b158386b511558972d539ce47 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 18 Oct 2007 17:40:25 -0700 Subject: RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f) --- source3/pam_smbpass/pam_smb_acct.c | 2 +- source3/pam_smbpass/pam_smb_auth.c | 8 ++++---- source3/pam_smbpass/pam_smb_passwd.c | 2 +- source3/pam_smbpass/support.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/pam_smbpass') diff --git a/source3/pam_smbpass/pam_smb_acct.c b/source3/pam_smbpass/pam_smb_acct.c index 909585bceb..c7622fbaa2 100644 --- a/source3/pam_smbpass/pam_smb_acct.c +++ b/source3/pam_smbpass/pam_smb_acct.c @@ -55,7 +55,7 @@ int pam_sm_acct_mgmt( pam_handle_t *pamh, int flags, const char *name; struct samu *sampass = NULL; void (*oldsig_handler)(int); - extern BOOL in_client; + extern bool in_client; /* Samba initialization. */ load_case_tables(); diff --git a/source3/pam_smbpass/pam_smb_auth.c b/source3/pam_smbpass/pam_smb_auth.c index 4ec1e6ebe3..b29f7c838f 100644 --- a/source3/pam_smbpass/pam_smb_auth.c +++ b/source3/pam_smbpass/pam_smb_auth.c @@ -54,7 +54,7 @@ do { \ } while (0) static int _smb_add_user(pam_handle_t *pamh, unsigned int ctrl, - const char *name, struct samu *sampass, BOOL exist); + const char *name, struct samu *sampass, bool exist); /* @@ -72,10 +72,10 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, unsigned int ctrl; int retval, *ret_data = NULL; struct samu *sampass = NULL; - extern BOOL in_client; + extern bool in_client; const char *name; void (*oldsig_handler)(int) = NULL; - BOOL found; + bool found; /* Points to memory managed by the PAM library. Do not free. */ char *p = NULL; @@ -187,7 +187,7 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags, /* Helper function for adding a user to the db. */ static int _smb_add_user(pam_handle_t *pamh, unsigned int ctrl, - const char *name, struct samu *sampass, BOOL exist) + const char *name, struct samu *sampass, bool exist) { pstring err_str; pstring msg_str; diff --git a/source3/pam_smbpass/pam_smb_passwd.c b/source3/pam_smbpass/pam_smb_passwd.c index 729d8b97a5..25b7e2b623 100644 --- a/source3/pam_smbpass/pam_smb_passwd.c +++ b/source3/pam_smbpass/pam_smb_passwd.c @@ -101,7 +101,7 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags, unsigned int ctrl; int retval; - extern BOOL in_client; + extern bool in_client; struct samu *sampass = NULL; void (*oldsig_handler)(int); diff --git a/source3/pam_smbpass/support.h b/source3/pam_smbpass/support.h index 0b2863d7b9..5ac48c3afa 100644 --- a/source3/pam_smbpass/support.h +++ b/source3/pam_smbpass/support.h @@ -21,10 +21,10 @@ extern char *smbpXstrDup(const char *); extern void _cleanup_failures(pam_handle_t *, void *, int); /* compare 2 strings */ -extern BOOL strequal(const char *, const char *); +extern bool strequal(const char *, const char *); extern struct smb_passwd * -_my_get_smbpwnam(FILE *, const char *, BOOL *, BOOL *, long *); +_my_get_smbpwnam(FILE *, const char *, bool *, bool *, long *); extern int _smb_verify_password( pam_handle_t *pamh , struct samu *sampass, const char *p, unsigned int ctrl ); -- cgit