[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-73-gf35a266
Jeremy Allison
jra at samba.org
Fri Oct 19 00:41:22 GMT 2007
The branch, v3-2-test has been updated
via f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f (commit)
from ea3173a9457f9095a70d401abfd1af8c913211a0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f
Author: Jeremy Allison <jra at samba.org>
Date: Thu Oct 18 17:40:25 2007 -0700
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.
-----------------------------------------------------------------------
Summary of changes:
examples/VFS/shadow_copy_test.c | 2 +-
examples/VFS/skel_opaque.c | 8 +-
examples/VFS/skel_transparent.c | 8 +-
source/auth/auth.c | 8 +-
source/auth/auth_compat.c | 8 +-
source/auth/auth_domain.c | 6 +-
source/auth/auth_ntlmssp.c | 4 +-
source/auth/auth_sam.c | 10 +-
source/auth/auth_server.c | 10 +-
source/auth/auth_unix.c | 4 +-
source/auth/auth_util.c | 50 ++--
source/auth/pampass.c | 24 +-
source/auth/pass_check.c | 8 +-
source/auth/token_util.c | 8 +-
source/client/client.c | 68 ++--
source/client/clitar.c | 38 +-
source/client/smbctool.c | 64 ++--
source/client/smbmount.c | 18 +-
source/client/smbspool.c | 2 +-
source/groupdb/mapping.c | 18 +-
source/groupdb/mapping.h | 16 +-
source/groupdb/mapping_ldb.c | 24 +-
source/groupdb/mapping_tdb.c | 26 +-
source/include/ads_protos.h | 12 +-
source/include/adt_tree.h | 8 +-
source/include/asn_1.h | 2 +-
source/include/auth.h | 10 +-
source/include/client.h | 20 +-
source/include/ctdbd_conn.h | 2 +-
source/include/debug.h | 6 +-
source/include/idmap.h | 6 +-
source/include/includes.h | 15 +-
source/include/libmsrpc.h | 22 +-
source/include/libmsrpc_internal.h | 6 +-
source/include/libsmb_internal.h | 14 +-
source/include/locking.h | 4 +-
source/include/mangle.h | 12 +-
source/include/messages.h | 2 +-
source/include/msdfs.h | 2 +-
source/include/nameserv.h | 30 +-
source/include/nt_printing.h | 12 +-
source/include/nt_status.h | 2 +-
source/include/ntdomain.h | 30 +-
source/include/ntlmssp.h | 6 +-
source/include/ntquotas.h | 2 +-
source/include/packet.h | 4 +-
source/include/passdb.h | 34 +-
source/include/popt_common.h | 4 +-
source/include/printing.h | 4 +-
source/include/privileges.h | 7 +-
source/include/reg_objects.h | 6 +-
source/include/regfio.h | 2 +-
source/include/rpc_misc.h | 2 +-
source/include/smb.h | 96 +++---
source/include/smb_ldap.h | 8 +-
source/include/smbldap.h | 8 +-
source/include/smbprofile.h | 4 +-
source/include/util_tdb.h | 21 +-
source/include/vfs.h | 9 +-
source/intl/lang_tdb.c | 6 +-
source/lib/account_pol.c | 18 +-
source/lib/adt_tree.c | 6 +-
source/lib/afs.c | 8 +-
source/lib/afs_settoken.c | 10 +-
source/lib/audit.c | 2 +-
source/lib/bitmap.c | 6 +-
source/lib/charcnv.c | 12 +-
source/lib/conn_tdb.c | 4 +-
source/lib/ctdbd_conn.c | 4 +-
source/lib/debug.c | 42 ++--
source/lib/dummysmbd.c | 2 +-
source/lib/events.c | 10 +-
source/lib/file_id.c | 2 +-
source/lib/gencache.c | 22 +-
source/lib/genrand.c | 4 +-
source/lib/iconv.c | 4 +-
source/lib/messages.c | 2 +-
source/lib/module.c | 2 +-
source/lib/ms_fnmatch.c | 6 +-
source/lib/packet.c | 4 +-
source/lib/popt_common.c | 8 +-
source/lib/privileges.c | 22 +-
source/lib/privileges_basic.c | 26 +-
source/lib/readline.c | 2 +-
source/lib/secace.c | 6 +-
source/lib/secacl.c | 4 +-
source/lib/secdesc.c | 6 +-
source/lib/server_mutex.c | 2 +-
source/lib/sharesec.c | 14 +-
source/lib/signal.c | 2 +-
source/lib/smbldap.c | 24 +-
source/lib/smbldap_util.c | 2 +-
source/lib/smbrun.c | 2 +-
source/lib/substitute.c | 10 +-
source/lib/sysquotas.c | 4 +-
source/lib/system.c | 4 +-
source/lib/system_smbd.c | 4 +-
source/lib/time.c | 24 +-
source/lib/util.c | 84 +++---
source/lib/util_file.c | 6 +-
source/lib/util_reg.c | 2 +-
source/lib/util_reg_smbconf.c | 4 +-
source/lib/util_seaccess.c | 4 +-
source/lib/util_sec.c | 6 +-
source/lib/util_sid.c | 30 +-
source/lib/util_tdb.c | 22 +-
source/lib/util_unistr.c | 32 +-
source/lib/util_uuid.c | 4 +-
source/lib/version.c | 2 +-
source/lib/wins_srv.c | 4 +-
source/libaddns/dns.h | 6 -
source/libads/ads_struct.c | 2 +-
source/libads/authdata.c | 38 +-
source/libads/cldap.c | 2 +-
source/libads/dns.c | 18 +-
source/libads/kerberos.c | 24 +-
source/libads/kerberos_keytab.c | 2 +-
source/libads/kerberos_verify.c | 14 +-
source/libads/krb5_setpw.c | 6 +-
source/libads/ldap.c | 42 ++--
source/libads/ldap_printer.c | 12 +-
source/libads/ldap_utils.c | 4 +-
source/libads/sasl.c | 4 +-
source/libgpo/gpo_filesync.c | 2 +-
source/libgpo/gpo_ldap.c | 8 +-
source/libgpo/gpo_sec.c | 8 +-
source/librpc/gen_ndr/srv_dfs.c | 46 ++--
source/librpc/gen_ndr/srv_echo.c | 20 +-
source/librpc/gen_ndr/srv_epmapper.c | 16 +-
source/librpc/gen_ndr/srv_eventlog.c | 48 ++--
source/librpc/gen_ndr/srv_initshutdown.c | 6 +-
source/librpc/gen_ndr/srv_lsa.c | 164 +++++-----
source/librpc/gen_ndr/srv_netlogon.c | 94 +++---
source/librpc/gen_ndr/srv_srvsvc.c | 108 +++---
source/librpc/gen_ndr/srv_svcctl.c | 88 +++---
source/librpc/gen_ndr/srv_unixinfo.c | 10 +-
source/librpc/gen_ndr/srv_winreg.c | 70 ++--
source/librpc/gen_ndr/srv_wkssvc.c | 62 ++--
source/librpc/ndr/libndr.h | 2 +-
source/librpc/ndr/ndr.c | 2 +-
source/librpc/ndr/ndr_misc.c | 8 +-
source/libsmb/asn1.c | 46 ++--
source/libsmb/cliconnect.c | 30 +-
source/libsmb/clidfs.c | 22 +-
source/libsmb/clidgram.c | 6 +-
source/libsmb/clientgen.c | 18 +-
source/libsmb/clierror.c | 6 +-
source/libsmb/clifile.c | 86 +++---
source/libsmb/clifsinfo.c | 20 +-
source/libsmb/clikrb5.c | 28 +-
source/libsmb/clilist.c | 4 +-
source/libsmb/climessage.c | 6 +-
source/libsmb/clioplock.c | 6 +-
source/libsmb/cliprint.c | 2 +-
source/libsmb/cliquota.c | 30 +-
source/libsmb/clirap.c | 30 +-
source/libsmb/clirap2.c | 16 +-
source/libsmb/clireadwrite.c | 14 +-
source/libsmb/clisecdesc.c | 6 +-
source/libsmb/clispnego.c | 18 +-
source/libsmb/clitrans.c | 12 +-
source/libsmb/credentials.c | 8 +-
source/libsmb/dsgetdcname.c | 12 +-
source/libsmb/libsmbclient.c | 82 +++---
source/libsmb/namecache.c | 20 +-
source/libsmb/namequery.c | 52 ++--
source/libsmb/namequery_dc.c | 12 +-
source/libsmb/nmblib.c | 24 +-
source/libsmb/ntlm_check.c | 8 +-
source/libsmb/ntlmssp.c | 6 +-
source/libsmb/ntlmssp_parse.c | 4 +-
source/libsmb/ntlmssp_sign.c | 2 +-
source/libsmb/passchange.c | 2 +-
source/libsmb/samlogon_cache.c | 14 +-
source/libsmb/smb_share_modes.c | 2 +-
source/libsmb/smb_signing.c | 64 ++--
source/libsmb/smbencrypt.c | 20 +-
source/libsmb/spnego.c | 12 +-
source/libsmb/trustdom_cache.c | 12 +-
source/libsmb/trusts_util.c | 4 +-
source/locking/brlock.c | 56 ++--
source/locking/locking.c | 52 ++--
source/locking/posix.c | 30 +-
source/modules/gpfs.c | 6 +-
source/modules/nfs4_acls.c | 10 +-
source/modules/nfs4_acls.h | 2 +-
source/modules/vfs_afsacl.c | 26 +-
source/modules/vfs_aixacl2.c | 12 +-
source/modules/vfs_cacheprime.c | 2 +-
source/modules/vfs_cap.c | 6 +-
source/modules/vfs_catia.c | 4 +-
source/modules/vfs_default.c | 14 +-
source/modules/vfs_expand_msdfs.c | 6 +-
source/modules/vfs_full_audit.c | 30 +-
source/modules/vfs_gpfs.c | 2 +-
source/modules/vfs_hpuxacl.c | 40 +-
source/modules/vfs_netatalk.c | 2 +-
source/modules/vfs_notify_fam.c | 2 +-
source/modules/vfs_posixacl.c | 4 +-
source/modules/vfs_readahead.c | 4 +-
source/modules/vfs_recycle.c | 32 +-
source/modules/vfs_shadow_copy.c | 4 +-
source/modules/vfs_solarisacl.c | 30 +-
source/modules/vfs_tru64acl.c | 4 +-
source/modules/vfs_zfsacl.c | 2 +-
source/nmbd/asyncdns.c | 8 +-
source/nmbd/nmbd.c | 34 +-
source/nmbd/nmbd_become_lmb.c | 20 +-
source/nmbd/nmbd_elections.c | 6 +-
source/nmbd/nmbd_incomingdgrams.c | 2 +-
source/nmbd/nmbd_incomingrequests.c | 14 +-
source/nmbd/nmbd_lmhosts.c | 2 +-
source/nmbd/nmbd_mynames.c | 2 +-
source/nmbd/nmbd_namelistdb.c | 10 +-
source/nmbd/nmbd_namequery.c | 10 +-
source/nmbd/nmbd_nameregister.c | 8 +-
source/nmbd/nmbd_namerelease.c | 8 +-
source/nmbd/nmbd_nodestatus.c | 2 +-
source/nmbd/nmbd_packets.c | 48 ++--
source/nmbd/nmbd_processlogon.c | 2 +-
source/nmbd/nmbd_responserecordsdb.c | 2 +-
source/nmbd/nmbd_sendannounce.c | 2 +-
source/nmbd/nmbd_serverlistdb.c | 4 +-
source/nmbd/nmbd_subnetdb.c | 4 +-
source/nmbd/nmbd_synclists.c | 4 +-
source/nmbd/nmbd_winsserver.c | 42 ++--
source/nmbd/nmbd_workgroupdb.c | 2 +-
source/nsswitch/wb_client.c | 30 +-
source/nsswitch/wbinfo.c | 72 ++--
source/nsswitch/wins.c | 4 +-
source/pam_smbpass/pam_smb_acct.c | 2 +-
source/pam_smbpass/pam_smb_auth.c | 8 +-
source/pam_smbpass/pam_smb_passwd.c | 2 +-
source/pam_smbpass/support.h | 4 +-
source/param/loadparm.c | 565 +++++++++++++++---------------
source/param/params.c | 18 +-
source/passdb/login_cache.c | 10 +-
source/passdb/lookup_sid.c | 42 ++--
source/passdb/machine_sid.c | 8 +-
source/passdb/passdb.c | 42 ++--
source/passdb/pdb_compat.c | 4 +-
source/passdb/pdb_get_set.c | 78 ++--
source/passdb/pdb_interface.c | 114 +++---
source/passdb/pdb_ldap.c | 82 +++---
source/passdb/pdb_nds.c | 4 +-
source/passdb/pdb_smbpasswd.c | 28 +-
source/passdb/pdb_tdb.c | 50 ++--
source/passdb/secrets.c | 58 ++--
source/passdb/util_builtin.c | 8 +-
source/passdb/util_unixsids.c | 16 +-
source/passdb/util_wellknown.c | 8 +-
source/printing/lpq_parse.c | 28 +-
source/printing/notify.c | 12 +-
source/printing/nt_printing.c | 72 ++--
source/printing/pcap.c | 10 +-
source/printing/print_aix.c | 2 +-
source/printing/print_cups.c | 8 +-
source/printing/print_generic.c | 2 +-
source/printing/print_iprint.c | 4 +-
source/printing/print_svid.c | 2 +-
source/printing/printing.c | 74 ++--
source/printing/printing_db.c | 4 +-
source/profile/profile.c | 10 +-
source/registry/reg_api.c | 2 +-
source/registry/reg_cachehook.c | 4 +-
source/registry/reg_db.c | 12 +-
source/registry/reg_dynamic.c | 2 +-
source/registry/reg_eventlog.c | 6 +-
source/registry/reg_frontend.c | 2 +-
source/registry/reg_frontend_hilvl.c | 6 +-
source/registry/reg_objects.c | 4 +-
source/registry/reg_perfcount.c | 42 ++--
source/registry/reg_printing.c | 14 +-
source/registry/reg_shares.c | 8 +-
source/registry/reg_smbconf.c | 8 +-
source/registry/reg_util.c | 4 +-
source/registry/regfio.c | 46 ++--
source/rpc_client/cli_lsarpc.c | 10 +-
source/rpc_client/cli_pipe.c | 8 +-
source/rpc_client/cli_spoolss.c | 28 +-
source/rpc_parse/parse_buffer.c | 14 +-
source/rpc_parse/parse_ds.c | 16 +-
source/rpc_parse/parse_eventlog.c | 22 +-
source/rpc_parse/parse_lsa.c | 236 +++++++-------
source/rpc_parse/parse_misc.c | 94 +++---
source/rpc_parse/parse_net.c | 130 ++++----
source/rpc_parse/parse_ntsvcs.c | 28 +-
source/rpc_parse/parse_prs.c | 104 +++---
source/rpc_parse/parse_rpc.c | 34 +-
source/rpc_parse/parse_samr.c | 304 ++++++++--------
source/rpc_parse/parse_sec.c | 10 +-
source/rpc_parse/parse_spoolss.c | 450 ++++++++++++------------
source/rpc_parse/parse_srv.c | 142 ++++----
source/rpc_parse/parse_svcctl.c | 76 ++--
source/rpc_server/srv_dfs_nt.c | 20 +-
source/rpc_server/srv_eventlog.c | 14 +-
source/rpc_server/srv_eventlog_lib.c | 14 +-
source/rpc_server/srv_eventlog_nt.c | 14 +-
source/rpc_server/srv_lsa.c | 72 ++--
source/rpc_server/srv_lsa_ds.c | 4 +-
source/rpc_server/srv_lsa_hnd.c | 12 +-
source/rpc_server/srv_netlog.c | 22 +-
source/rpc_server/srv_netlog_nt.c | 10 +-
source/rpc_server/srv_ntsvcs.c | 14 +-
source/rpc_server/srv_pipe.c | 52 ++--
source/rpc_server/srv_pipe_hnd.c | 26 +-
source/rpc_server/srv_samr.c | 96 +++---
source/rpc_server/srv_samr_nt.c | 86 +++---
source/rpc_server/srv_spoolss.c | 104 +++---
source/rpc_server/srv_spoolss_nt.c | 80 +++---
source/rpc_server/srv_srvsvc.c | 40 +-
source/rpc_server/srv_srvsvc_nt.c | 22 +-
source/rpc_server/srv_svcctl.c | 34 +-
source/rpc_server/srv_svcctl_nt.c | 2 +-
source/rpc_server/srv_winreg_nt.c | 10 +-
source/rpcclient/cmd_samr.c | 10 +-
source/rpcclient/cmd_shutdown.c | 4 +-
source/rpcclient/cmd_spoolss.c | 48 ++--
source/rpcclient/cmd_wkssvc.c | 2 +-
source/rpcclient/rpcclient.c | 2 +-
source/script/mkbuildoptions.awk | 8 +-
source/script/mkproto.awk | 8 +-
source/services/services_db.c | 6 +-
source/smbd/aio.c | 24 +-
source/smbd/blocking.c | 30 +-
source/smbd/chgpasswd.c | 40 +-
source/smbd/close.c | 8 +-
source/smbd/conn.c | 4 +-
source/smbd/connection.c | 18 +-
source/smbd/dfree.c | 6 +-
source/smbd/dir.c | 54 ++--
source/smbd/dmapi.c | 4 +-
source/smbd/dosmode.c | 8 +-
source/smbd/error.c | 6 +-
source/smbd/fileio.c | 10 +-
source/smbd/filename.c | 20 +-
source/smbd/ipc.c | 6 +-
source/smbd/lanman.c | 100 +++---
source/smbd/mangle.c | 14 +-
source/smbd/mangle_hash.c | 28 +-
source/smbd/mangle_hash2.c | 38 +-
source/smbd/map_username.c | 8 +-
source/smbd/msdfs.c | 56 ++--
source/smbd/negprot.c | 8 +-
source/smbd/noquotas.c | 2 +-
source/smbd/notify.c | 8 +-
source/smbd/notify_inotify.c | 2 +-
source/smbd/ntquotas.c | 2 +-
source/smbd/nttrans.c | 28 +-
source/smbd/open.c | 42 ++--
source/smbd/oplock.c | 24 +-
source/smbd/oplock_irix.c | 6 +-
source/smbd/oplock_linux.c | 6 +-
source/smbd/password.c | 16 +-
source/smbd/pipes.c | 4 +-
source/smbd/posix_acls.c | 102 +++---
source/smbd/process.c | 18 +-
source/smbd/quotas.c | 34 +-
source/smbd/reply.c | 104 +++---
source/smbd/sec_ctx.c | 10 +-
source/smbd/server.c | 30 +-
source/smbd/service.c | 18 +-
source/smbd/session.c | 6 +-
source/smbd/sesssetup.c | 34 +-
source/smbd/share_access.c | 12 +-
source/smbd/statcache.c | 8 +-
source/smbd/trans2.c | 90 +++---
source/smbd/uid.c | 20 +-
source/smbd/utmp.c | 10 +-
source/smbd/vfs.c | 22 +-
source/torture/cmd_vfs.c | 2 +-
source/torture/denytest.c | 10 +-
source/torture/locktest.c | 18 +-
source/torture/locktest2.c | 18 +-
source/torture/mangle_test.c | 6 +-
source/torture/masktest.c | 8 +-
source/torture/pdbtest.c | 6 +-
source/torture/rpctorture.c | 4 +-
source/torture/scanner.c | 8 +-
source/torture/t_asn1.c | 2 +-
source/torture/torture.c | 248 +++++++-------
source/torture/utable.c | 4 +-
source/torture/vfstest.c | 6 +-
source/utils/eventlogadm.c | 6 +-
source/utils/net.c | 20 +-
source/utils/net.h | 10 +-
source/utils/net_ads.c | 20 +-
source/utils/net_conf.c | 16 +-
source/utils/net_groupmap.c | 10 +-
source/utils/net_idmap.c | 6 +-
source/utils/net_lookup.c | 2 +-
source/utils/net_rpc.c | 40 +-
source/utils/net_rpc_audit.c | 2 +-
source/utils/net_rpc_printer.c | 66 ++--
source/utils/net_rpc_registry.c | 6 +-
source/utils/net_rpc_samsync.c | 12 +-
source/utils/net_rpc_sh_acct.c | 2 +-
source/utils/net_rpc_shell.c | 4 +-
source/utils/net_sam.c | 4 +-
source/utils/net_status.c | 6 +-
source/utils/net_usershare.c | 10 +-
source/utils/net_util.c | 2 +-
source/utils/netlookup.c | 2 +-
source/utils/nmblookup.c | 22 +-
source/utils/ntlm_auth.c | 28 +-
source/utils/ntlm_auth_diagnostics.c | 54 ++--
source/utils/passwd_util.c | 2 +-
source/utils/pdbedit.c | 50 ++--
source/utils/profiles.c | 8 +-
source/utils/sharesec.c | 14 +-
source/utils/smbcacls.c | 20 +-
source/utils/smbcontrol.c | 72 ++--
source/utils/smbcquotas.c | 24 +-
source/utils/smbpasswd.c | 10 +-
source/utils/smbtree.c | 12 +-
source/utils/status.c | 12 +-
source/utils/status_profile.c | 10 +-
source/utils/testparm.c | 8 +-
source/web/cgi.c | 12 +-
source/web/diagnose.c | 6 +-
source/web/statuspage.c | 2 +-
source/web/swat.c | 30 +-
source/winbindd/idmap.c | 8 +-
source/winbindd/idmap_ad.c | 2 +-
source/winbindd/idmap_cache.c | 2 +-
source/winbindd/idmap_ldap.c | 8 +-
source/winbindd/idmap_nss.c | 4 +-
source/winbindd/idmap_tdb.c | 14 +-
source/winbindd/nss_info.c | 2 +-
source/winbindd/winbindd.c | 58 ++--
source/winbindd/winbindd.h | 44 ++--
source/winbindd/winbindd_ads.c | 2 +-
source/winbindd/winbindd_async.c | 168 +++++-----
source/winbindd/winbindd_cache.c | 52 ++--
source/winbindd/winbindd_ccache_access.c | 4 +-
source/winbindd/winbindd_cm.c | 36 +-
source/winbindd/winbindd_cred_cache.c | 6 +-
source/winbindd/winbindd_dual.c | 32 +-
source/winbindd/winbindd_group.c | 46 ++--
source/winbindd/winbindd_misc.c | 10 +-
source/winbindd/winbindd_pam.c | 16 +-
source/winbindd/winbindd_passdb.c | 2 +-
source/winbindd/winbindd_rpc.c | 2 +-
source/winbindd/winbindd_sid.c | 28 +-
source/winbindd/winbindd_user.c | 26 +-
source/winbindd/winbindd_util.c | 44 ++--
446 files changed, 5317 insertions(+), 5344 deletions(-)
mode change 100755 => 100644 source/client/mount.cifs.c
mode change 100755 => 100644 source/include/rap.h
mode change 100755 => 100644 source/include/rpc_spoolss.h
mode change 100755 => 100644 source/rpc_server/srv_spoolss.c
Changeset truncated at 500 lines:
diff --git a/examples/VFS/shadow_copy_test.c b/examples/VFS/shadow_copy_test.c
index 86b61dc..1ba46b7 100644
--- a/examples/VFS/shadow_copy_test.c
+++ b/examples/VFS/shadow_copy_test.c
@@ -49,7 +49,7 @@
Directories are always displayed...
*/
-static int test_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, BOOL labels)
+static int test_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
{
uint32 num = 3;
uint32 i;
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 173644f..244c02e 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -53,7 +53,7 @@ static void skel_disconnect(vfs_handle_struct *handle, connection_struct *conn)
}
static SMB_BIG_UINT skel_disk_free(vfs_handle_struct *handle, const char *path,
- BOOL small_query, SMB_BIG_UINT *bsize,
+ bool small_query, SMB_BIG_UINT *bsize,
SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize)
{
return vfswrap_disk_free(NULL, path, small_query, bsize,
@@ -70,7 +70,7 @@ static int skel_set_quota(vfs_handle_struct *handle, enum SMB_QUOTA_TYPE qtype,
return vfswrap_set_quota(NULL, qtype, id, dq);
}
-static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, BOOL labels)
+static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
{
return vfswrap_get_shadow_copy_data(NULL, fsp, shadow_copy_data, labels);
}
@@ -230,12 +230,12 @@ static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, int fd,
return vfswrap_ftruncate(NULL, fsp, fd, offset);
}
-static BOOL skel_lock(vfs_handle_struct *handle, files_struct *fsp, int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
+static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
{
return vfswrap_lock(NULL, fsp, fd, op, offset, count, type);
}
-static BOOL skel_getlock(vfs_handle_struct *handle, files_struct *fsp, int fd, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid)
+static bool skel_getlock(vfs_handle_struct *handle, files_struct *fsp, int fd, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid)
{
return vfswrap_getlock(NULL, fsp, fd, poffset, pcount, ptype, ppid);
}
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 411dc31..66ea112 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -47,7 +47,7 @@ static void skel_disconnect(vfs_handle_struct *handle)
}
static SMB_BIG_UINT skel_disk_free(vfs_handle_struct *handle, const char *path,
- BOOL small_query, SMB_BIG_UINT *bsize,
+ bool small_query, SMB_BIG_UINT *bsize,
SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize)
{
return SMB_VFS_NEXT_DISK_FREE(handle, path, small_query, bsize,
@@ -64,7 +64,7 @@ static int skel_set_quota(vfs_handle_struct *handle, enum SMB_QUOTA_TYPE qtype,
return SMB_VFS_NEXT_SET_QUOTA(handle, qtype, id, dq);
}
-static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, BOOL labels)
+static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
{
return SMB_VFS_NEXT_GET_SHADOW_COPY_DATA(handle, fsp, shadow_copy_data, labels);
}
@@ -224,12 +224,12 @@ static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, int fd,
return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, fd, offset);
}
-static BOOL skel_lock(vfs_handle_struct *handle, files_struct *fsp, int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
+static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
{
return SMB_VFS_NEXT_LOCK(handle, fsp, fd, op, offset, count, type);
}
-static BOOL skel_getlock(vfs_handle_struct *handle, files_struct *fsp, int fd, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid)
+static bool skel_getlock(vfs_handle_struct *handle, files_struct *fsp, int fd, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid)
{
return SMB_VFS_NEXT_GETLOCK(handle, fsp, fd, poffset, pcount, ptype, ppid);
}
diff --git a/source/auth/auth.c b/source/auth/auth.c
index 29f9be9..0a9ae32 100644
--- a/source/auth/auth.c
+++ b/source/auth/auth.c
@@ -156,7 +156,7 @@ static const uint8 *get_ntlm_challenge(struct auth_context *auth_context)
* False otherwise.
**/
-static BOOL check_domain_match(const char *user, const char *domain)
+static bool check_domain_match(const char *user, const char *domain)
{
/*
* If we aren't serving to trusted domains, we must make sure that
@@ -366,16 +366,16 @@ static NTSTATUS make_auth_context(struct auth_context **auth_context)
return NT_STATUS_OK;
}
-BOOL load_auth_module(struct auth_context *auth_context,
+bool load_auth_module(struct auth_context *auth_context,
const char *module, auth_methods **ret)
{
- static BOOL initialised_static_modules = False;
+ static bool initialised_static_modules = False;
struct auth_init_function_entry *entry;
char *module_name = smb_xstrdup(module);
char *module_params = NULL;
char *p;
- BOOL good = False;
+ bool good = False;
/* Initialise static modules if not done so yet */
if(!initialised_static_modules) {
diff --git a/source/auth/auth_compat.c b/source/auth/auth_compat.c
index 9035f89..f10585d 100644
--- a/source/auth/auth_compat.c
+++ b/source/auth/auth_compat.c
@@ -20,7 +20,7 @@
#include "includes.h"
extern struct auth_context *negprot_global_auth_context;
-extern BOOL global_encrypted_passwords_negotiated;
+extern bool global_encrypted_passwords_negotiated;
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
@@ -66,7 +66,7 @@ static NTSTATUS pass_check_smb(const char *smb_name,
DATA_BLOB lm_pwd,
DATA_BLOB nt_pwd,
DATA_BLOB plaintext_password,
- BOOL encrypted)
+ bool encrypted)
{
NTSTATUS nt_status;
@@ -92,11 +92,11 @@ check if a username/password pair is ok via the auth subsystem.
return True if the password is correct, False otherwise
****************************************************************************/
-BOOL password_ok(char *smb_name, DATA_BLOB password_blob)
+bool password_ok(char *smb_name, DATA_BLOB password_blob)
{
DATA_BLOB null_password = data_blob_null;
- BOOL encrypted = (global_encrypted_passwords_negotiated && (password_blob.length == 24 || password_blob.length > 46));
+ bool encrypted = (global_encrypted_passwords_negotiated && (password_blob.length == 24 || password_blob.length > 46));
if (encrypted) {
/*
diff --git a/source/auth/auth_domain.c b/source/auth/auth_domain.c
index 1e68572..72bdbab 100644
--- a/source/auth/auth_domain.c
+++ b/source/auth/auth_domain.c
@@ -23,7 +23,7 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
-extern BOOL global_machine_password_needs_changing;
+extern bool global_machine_password_needs_changing;
/**
* Connect to a remote server for (inter)domain security authenticaion.
@@ -44,7 +44,7 @@ static NTSTATUS connect_to_domain_password_server(struct cli_state **cli,
const char *dc_name,
struct in_addr dc_ip,
struct rpc_pipe_client **pipe_ret,
- BOOL *retry)
+ bool *retry)
{
NTSTATUS result;
struct rpc_pipe_client *netlogon_pipe = NULL;
@@ -191,7 +191,7 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
struct rpc_pipe_client *netlogon_pipe = NULL;
NTSTATUS nt_status = NT_STATUS_NO_LOGON_SERVERS;
int i;
- BOOL retry = True;
+ bool retry = True;
/*
* At this point, smb_apasswd points to the lanman response to
diff --git a/source/auth/auth_ntlmssp.c b/source/auth/auth_ntlmssp.c
index 742be21..526f2c9 100644
--- a/source/auth/auth_ntlmssp.c
+++ b/source/auth/auth_ntlmssp.c
@@ -39,7 +39,7 @@ static const uint8 *auth_ntlmssp_get_challenge(const struct ntlmssp_state *ntlms
*
* @return If the effective challenge used by the auth subsystem may be modified
*/
-static BOOL auth_ntlmssp_may_set_challenge(const struct ntlmssp_state *ntlmssp_state)
+static bool auth_ntlmssp_may_set_challenge(const struct ntlmssp_state *ntlmssp_state)
{
AUTH_NTLMSSP_STATE *auth_ntlmssp_state =
(AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context;
@@ -83,7 +83,7 @@ static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state,
(AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context;
auth_usersupplied_info *user_info = NULL;
NTSTATUS nt_status;
- BOOL username_was_mapped;
+ bool username_was_mapped;
/* the client has given us its machine name (which we otherwise would not get on port 445).
we need to possibly reload smb.conf if smb.conf includes depend on the machine name */
diff --git a/source/auth/auth_sam.c b/source/auth/auth_sam.c
index 9070de1..13fc968 100644
--- a/source/auth/auth_sam.c
+++ b/source/auth/auth_sam.c
@@ -70,7 +70,7 @@ static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
bitmask.
****************************************************************************/
-static BOOL logon_hours_ok(struct samu *sampass)
+static bool logon_hours_ok(struct samu *sampass)
{
/* In logon hours first bit is Sunday from 12AM to 1AM */
const uint8 *hours;
@@ -187,7 +187,7 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
return NT_STATUS_NO_MEMORY;
if (*workstation_list) {
- BOOL invalid_ws = True;
+ bool invalid_ws = True;
fstring tok;
const char *s = workstation_list;
@@ -251,12 +251,12 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context,
auth_serversupplied_info **server_info)
{
struct samu *sampass=NULL;
- BOOL ret;
+ bool ret;
NTSTATUS nt_status;
NTSTATUS update_login_attempts_status;
DATA_BLOB user_sess_key = data_blob_null;
DATA_BLOB lm_sess_key = data_blob_null;
- BOOL updated_autolock = False, updated_badpw = False;
+ bool updated_autolock = False, updated_badpw = False;
if (!user_info || !auth_context) {
return NT_STATUS_UNSUCCESSFUL;
@@ -395,7 +395,7 @@ static NTSTATUS check_samstrict_security(const struct auth_context *auth_context
const auth_usersupplied_info *user_info,
auth_serversupplied_info **server_info)
{
- BOOL is_local_name, is_my_domain;
+ bool is_local_name, is_my_domain;
if (!user_info || !auth_context) {
return NT_STATUS_LOGON_FAILURE;
diff --git a/source/auth/auth_server.c b/source/auth/auth_server.c
index 44f36dc..815c119 100644
--- a/source/auth/auth_server.c
+++ b/source/auth/auth_server.c
@@ -36,7 +36,7 @@ static struct cli_state *server_cryptkey(TALLOC_CTX *mem_ctx)
struct in_addr dest_ip;
const char *p;
char *pserver;
- BOOL connected_ok = False;
+ bool connected_ok = False;
if (!(cli = cli_initialise()))
return NULL;
@@ -148,7 +148,7 @@ struct server_security_state {
Send a 'keepalive' packet down the cli pipe.
****************************************************************************/
-static BOOL send_server_keepalive(const struct timeval *now,
+static bool send_server_keepalive(const struct timeval *now,
void *private_data)
{
struct server_security_state *state = talloc_get_type_abort(
@@ -265,10 +265,10 @@ static NTSTATUS check_smbserver_security(const struct auth_context *auth_context
struct cli_state *cli;
static unsigned char badpass[24];
static fstring baduser;
- static BOOL tested_password_server = False;
- static BOOL bad_password_server = False;
+ static bool tested_password_server = False;
+ static bool bad_password_server = False;
NTSTATUS nt_status = NT_STATUS_NOT_IMPLEMENTED;
- BOOL locally_made_cli = False;
+ bool locally_made_cli = False;
cli = (struct cli_state *)my_private_data;
diff --git a/source/auth/auth_unix.c b/source/auth/auth_unix.c
index b79e736..4fca5bc 100644
--- a/source/auth/auth_unix.c
+++ b/source/auth/auth_unix.c
@@ -27,10 +27,10 @@
*
* this ugly hack needs to die, but not quite yet, I think people still use it...
**/
-static BOOL update_smbpassword_file(const char *user, const char *password)
+static bool update_smbpassword_file(const char *user, const char *password)
{
struct samu *sampass;
- BOOL ret;
+ bool ret;
if ( !(sampass = samu_new( NULL )) ) {
return False;
diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 2c05f04..99eea6c 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -62,7 +62,7 @@ static NTSTATUS make_user_info(auth_usersupplied_info **user_info,
DATA_BLOB *lm_pwd, DATA_BLOB *nt_pwd,
DATA_BLOB *lm_interactive_pwd, DATA_BLOB *nt_interactive_pwd,
DATA_BLOB *plaintext,
- BOOL encrypted)
+ bool encrypted)
{
DEBUG(5,("attempting to make a user_info for %s (%s)\n", internal_username, smb_name));
@@ -141,11 +141,11 @@ NTSTATUS make_user_info_map(auth_usersupplied_info **user_info,
DATA_BLOB *lm_pwd, DATA_BLOB *nt_pwd,
DATA_BLOB *lm_interactive_pwd, DATA_BLOB *nt_interactive_pwd,
DATA_BLOB *plaintext,
- BOOL encrypted)
+ bool encrypted)
{
const char *domain;
NTSTATUS result;
- BOOL was_mapped;
+ bool was_mapped;
fstring internal_username;
fstrcpy(internal_username, smb_name);
was_mapped = map_username(internal_username);
@@ -186,7 +186,7 @@ NTSTATUS make_user_info_map(auth_usersupplied_info **user_info,
Decrypt and encrypt the passwords.
****************************************************************************/
-BOOL make_user_info_netlogon_network(auth_usersupplied_info **user_info,
+bool make_user_info_netlogon_network(auth_usersupplied_info **user_info,
const char *smb_name,
const char *client_domain,
const char *wksta_name,
@@ -196,7 +196,7 @@ BOOL make_user_info_netlogon_network(auth_usersupplied_info **user_info,
const uchar *nt_network_pwd,
int nt_pwd_len)
{
- BOOL ret;
+ bool ret;
NTSTATUS status;
DATA_BLOB lm_blob = data_blob(lm_network_pwd, lm_pwd_len);
DATA_BLOB nt_blob = data_blob(nt_network_pwd, nt_pwd_len);
@@ -224,7 +224,7 @@ BOOL make_user_info_netlogon_network(auth_usersupplied_info **user_info,
Decrypt and encrypt the passwords.
****************************************************************************/
-BOOL make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
+bool make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
const char *smb_name,
const char *client_domain,
const char *wksta_name,
@@ -286,7 +286,7 @@ BOOL make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
ZERO_STRUCT(key);
{
- BOOL ret;
+ bool ret;
NTSTATUS nt_status;
DATA_BLOB local_lm_blob;
DATA_BLOB local_nt_blob;
@@ -337,7 +337,7 @@ BOOL make_user_info_netlogon_interactive(auth_usersupplied_info **user_info,
Create an auth_usersupplied_data structure
****************************************************************************/
-BOOL make_user_info_for_reply(auth_usersupplied_info **user_info,
+bool make_user_info_for_reply(auth_usersupplied_info **user_info,
const char *smb_name,
const char *client_domain,
const uint8 chal[8],
@@ -413,7 +413,7 @@ NTSTATUS make_user_info_for_reply_enc(auth_usersupplied_info **user_info,
Create a guest user_info blob, for anonymous authenticaion.
****************************************************************************/
-BOOL make_user_info_guest(auth_usersupplied_info **user_info)
+bool make_user_info_guest(auth_usersupplied_info **user_info)
{
NTSTATUS nt_status;
@@ -680,7 +680,7 @@ NTSTATUS create_local_token(auth_serversupplied_info *server_info)
*/
NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
- BOOL is_guest,
+ bool is_guest,
uid_t *uid, gid_t *gid,
char **found_username,
struct nt_user_token **token)
@@ -721,7 +721,7 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
}
if (sid_check_is_in_our_domain(&user_sid)) {
- BOOL ret;
+ bool ret;
/* This is a passdb user, so ask passdb */
@@ -900,14 +900,14 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
member of a particular group.
***************************************************************************/
-BOOL user_in_group_sid(const char *username, const DOM_SID *group_sid)
+bool user_in_group_sid(const char *username, const DOM_SID *group_sid)
{
NTSTATUS status;
uid_t uid;
gid_t gid;
char *found_username;
struct nt_user_token *token;
- BOOL result;
+ bool result;
TALLOC_CTX *mem_ctx;
@@ -933,11 +933,11 @@ BOOL user_in_group_sid(const char *username, const DOM_SID *group_sid)
}
-BOOL user_in_group(const char *username, const char *groupname)
+bool user_in_group(const char *username, const char *groupname)
{
TALLOC_CTX *mem_ctx;
DOM_SID group_sid;
- BOOL ret;
+ bool ret;
mem_ctx = talloc_new(NULL);
if (mem_ctx == NULL) {
@@ -1078,7 +1078,7 @@ static NTSTATUS make_new_server_info_guest(auth_serversupplied_info **server_inf
NTSTATUS status;
struct samu *sampass = NULL;
DOM_SID guest_sid;
- BOOL ret;
+ bool ret;
static const char zeros[16] = { 0, };
if ( !(sampass = samu_new( NULL )) ) {
@@ -1177,7 +1177,7 @@ static auth_serversupplied_info *copy_serverinfo(auth_serversupplied_info *src)
static auth_serversupplied_info *guest_info = NULL;
-BOOL init_guest_info(void)
+bool init_guest_info(void)
{
if (guest_info != NULL)
return True;
@@ -1191,7 +1191,7 @@ NTSTATUS make_server_info_guest(auth_serversupplied_info **server_info)
return (*server_info != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
}
-BOOL copy_current_user(struct current_user *dst, struct current_user *src)
+bool copy_current_user(struct current_user *dst, struct current_user *src)
{
gid_t *groups;
NT_USER_TOKEN *nt_token;
@@ -1218,7 +1218,7 @@ BOOL copy_current_user(struct current_user *dst, struct current_user *src)
return True;
}
-BOOL set_current_user_guest(struct current_user *dst)
+bool set_current_user_guest(struct current_user *dst)
{
gid_t *groups;
NT_USER_TOKEN *nt_token;
@@ -1261,7 +1261,7 @@ static NTSTATUS fill_sam_account(TALLOC_CTX *mem_ctx,
char **found_username,
uid_t *uid, gid_t *gid,
struct samu *account,
- BOOL *username_was_mapped)
+ bool *username_was_mapped)
{
NTSTATUS nt_status;
fstring dom_user, lower_username;
@@ -1308,7 +1308,7 @@ static NTSTATUS fill_sam_account(TALLOC_CTX *mem_ctx,
****************************************************************************/
struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, char *domuser,
- fstring save_username, BOOL create )
+ fstring save_username, bool create )
{
struct passwd *pw = NULL;
char *p;
@@ -1405,7 +1405,7 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
struct samu *sam_account = NULL;
DOM_SID user_sid;
DOM_SID group_sid;
- BOOL username_was_mapped;
+ bool username_was_mapped;
uid_t uid;
--
Samba Shared Repository
More information about the samba-cvs
mailing list