[SCM] Samba Shared Repository - branch v3-6-test updated
Günther Deschner
gd at samba.org
Tue Apr 5 13:46:46 MDT 2011
The branch, v3-6-test has been updated
via 7a6fc7e s3: move filename_util.c out of source3/smbd to source3/lib.
via cbdaee6 s3-build: only include intl protos where needed.
via 5fc6d3a s3-passdb: finally stop including passdb.h globaly.
via 8932b4d s3-passdb: use passdb headers where needed.
via a902431 s3-passdb: move util_builtin.c out of passdb.
via 35287ce s3-passdb: move util_unixsids.c out of passdb.
via 7298bd1 s3-passdb: move util_wellknown.c out of passdb.
via 207a731 s3-winbindd: copy acct_info to wb_acct_info so we dont need passdb for it.
via 15102b8 s3-passdb: add machine_sid.h and lookup_sid.h
via 70f1709 s3-proto: add some forward declarations.
via 0aeaa36 s3-passdb: add passdb.h where needed.
via 63389f6 s3-passdb: move mapping.h into passdb.h, its needed here.
via a2ad545 s3-passdb: move passdb headers to passdb/proto.h.
via ed81ef5 s3-groupdb: move groupdb headers to groupdb/proto.h.
via 66beea4 s3: create_builtin_users/administrators belongs to passdb not auth.
via 735dc19 s3-build: only include transfer_file.h where needed.
via 867d243 registry: create and use shared libcli/registry/util_reg.h header.
via 07a91bd s3-includes: no point in including all security headers globally.
via 8f13c73 s3-includes: remove EILSEQ check, this is handled by ../lib/replace/system/iconv.h already.
via 335adb7 s3-includes: only include system/filesys.h when needed.
via 6de3ef1 s3-includes: remove global include of "system/network.h"
via 28e82ee s3-includes: only include system/passwd.h when needed.
via 0354b4a s3-includes: only include system/shmem.h when needed.
via 2843bc4 s3-includes: remove global include of "system/select.h".
via cf63a08 s3-includes: only include system/terminal.h when needed.
via 5155b66 s3-includes: only include system/capability.h when needed.
via 2912e03 s3-includes: only include system/glob.h when needed.
via 631a86d s3-includes: only include system/iconv.h when needed.
via a5331b6 s3-includes: only include system/syslog.h when needed.
via f423255 s3-trans2: only include trans2.h where needed.
via 6cbd884 s3-winbind: remove global inclusion of libwbclient.
from 9c5c43d s3-waf: fix typo in ctdb checks.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 7a6fc7e2dcb736dd3dff33a35f49b60dbf0dd1aa
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 22 21:45:44 2011 +0100
s3: move filename_util.c out of source3/smbd to source3/lib.
Guenther
(cherry picked from commit 8560c00a507126c0d315d0b790ab154a3a75a426)
commit cbdaee6ce7d07c0d9be5b815c35bbb2f53b07e75
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 22 23:58:21 2011 +0100
s3-build: only include intl protos where needed.
Guenther
(cherry picked from commit 6b76909f5ef5f279cb73decf83f23d3dbf8adaf8)
commit 5fc6d3a35113b51b05e4c2756023161e1fb6451b
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 22 23:32:56 2011 +0100
s3-passdb: finally stop including passdb.h globaly.
Guenther
(cherry picked from commit 60d2816c5e914f1674267a3b388c302335f93466)
commit 8932b4d391ab16341cb33cbee7c527aaadc6fe0c
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 22 16:50:02 2011 +0100
s3-passdb: use passdb headers where needed.
Guenther
(cherry picked from commit 235f1485901774bfbeb0f052bc4e1397f4ef0b88)
commit a902431b89cb34bc392b1efc7823e6936d11ac97
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 23 14:57:08 2011 +0100
s3-passdb: move util_builtin.c out of passdb.
Guenther
(cherry picked from commit a22a53ea44c18378481d3a432fb0e667117da5bd)
commit 35287ce18909763e410e97f42347d5440cada929
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 22 23:23:17 2011 +0100
s3-passdb: move util_unixsids.c out of passdb.
Guenther
(cherry picked from commit 7d798ac485b47483c9f99c67f7be196d55587a09)
commit 7298bd1547ef638b779b65fa19a48c9719437b06
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 22 23:20:49 2011 +0100
s3-passdb: move util_wellknown.c out of passdb.
Guenther
(cherry picked from commit bcee6c1fe209b458e546b5788a9148eecc8715f1)
commit 207a7318fb4f9e58b275c2e43d406ba0195f324e
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 22 17:43:39 2011 +0100
s3-winbindd: copy acct_info to wb_acct_info so we dont need passdb for it.
Guenther
(cherry picked from commit cc94bcb952b1bf16e1d3f335e5288f793ee4ca96)
commit 15102b871bf5f0e68eccfd54f4aea82c21324b73
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 22 16:48:05 2011 +0100
s3-passdb: add machine_sid.h and lookup_sid.h
Guenther
(cherry picked from commit f378f9f144d2b8ccb9c8443f3e605171e60ce3c2)
commit 70f1709872723ec53e3700c96080fd949b1f13ff
Author: Günther Deschner <gd at samba.org>
Date: Sat Mar 19 00:46:41 2011 +0100
s3-proto: add some forward declarations.
Guenther
(cherry picked from commit cd7e088ddf37cb9f516e3a9d94232fa1e91221cd)
commit 0aeaa3689d4f0e448c03227f6efdc378fe4870e4
Author: Günther Deschner <gd at samba.org>
Date: Fri Mar 18 18:58:37 2011 +0100
s3-passdb: add passdb.h where needed.
Guenther
(cherry picked from commit 2f36ef72256cf3c2e36ed759427af07effda1069)
commit 63389f69a3e4dce028389e14b3625a3b1e56bb4a
Author: Günther Deschner <gd at samba.org>
Date: Fri Mar 18 16:22:14 2011 +0100
s3-passdb: move mapping.h into passdb.h, its needed here.
Guenther
(cherry picked from commit b0773aa61a1fdecfd80f09454ff85c7bb4b7896b)
commit a2ad545eaae2bd223d45e2b291e552129b8b4df6
Author: Günther Deschner <gd at samba.org>
Date: Fri Mar 18 16:05:55 2011 +0100
s3-passdb: move passdb headers to passdb/proto.h.
Guenther
(cherry picked from commit 35c2d8ec1edd84714d9d6f8082d116d734b83161)
commit ed81ef5b6f610fc2ffd4ee7f416df89dcafca643
Author: Günther Deschner <gd at samba.org>
Date: Fri Mar 18 16:05:26 2011 +0100
s3-groupdb: move groupdb headers to groupdb/proto.h.
Guenther
(cherry picked from commit bb04a70c0bf5fbc10733edd20feb5bb03386c084)
commit 66beea47cebe7d4029539c7e9c94e373b8670327
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 24 13:16:20 2011 +0100
s3: create_builtin_users/administrators belongs to passdb not auth.
Guenther
(cherry picked from commit 03e6082e3c8230f2ffc6b8a5d27109c41f7aca81)
commit 735dc1984dc876db81a6bda94662e5352aa00c47
Author: Günther Deschner <gd at samba.org>
Date: Sat Feb 26 00:56:46 2011 +0100
s3-build: only include transfer_file.h where needed.
Guenther
(cherry picked from commit 9bd06f6bc72ffd414e417a99cca425f047810b3c)
commit 867d243aaf2dadda3efbe5ddf6df3ca628877e0f
Author: Günther Deschner <gd at samba.org>
Date: Sat Feb 26 00:28:15 2011 +0100
registry: create and use shared libcli/registry/util_reg.h header.
Guenther
(cherry picked from commit 0a250f4946a6045290229a276acf1e007c61450e)
commit 07a91bd057eaab0d4be59d9e015400148af4e2c0
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 25 23:34:23 2011 +0100
s3-includes: no point in including all security headers globally.
Guenther
(cherry picked from commit 49ccae1c2006806b36994992a9550cbb1bb8b769)
commit 8f13c73ffdeb85a310f93761fa0b5b0b30c80842
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 25 23:36:14 2011 +0100
s3-includes: remove EILSEQ check, this is handled by
../lib/replace/system/iconv.h already.
Guenther
(cherry picked from commit 1d7b7ce42e1dd8c648bd62c317f1414b29ddbd08)
commit 335adb7e5bd378ad78dba1357a564abfff24fca6
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 25 23:20:06 2011 +0100
s3-includes: only include system/filesys.h when needed.
Guenther
(cherry picked from commit 0e771263eed0b9bc364ce523765ea17dd1192841)
commit 6de3ef14b4d7d095aeb7fbb35bb437a445e0296f
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 25 23:05:22 2011 +0100
s3-includes: remove global include of "system/network.h"
Guenther
(cherry picked from commit 64422d973583a510e6ea2e655bf398ea85f445b5)
commit 28e82ee706066f658c1183677648d8e8f0f46188
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 25 17:14:22 2011 +0100
s3-includes: only include system/passwd.h when needed.
Guenther
(cherry picked from commit 49fcf653b11ef7308b849027d342a3182f270dd3)
commit 0354b4ab24d7d99bc9e8f167a7a1c08971d1bc52
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 25 17:03:27 2011 +0100
s3-includes: only include system/shmem.h when needed.
Guenther
(cherry picked from commit 7369ef1f1cdeeeed89e454c588edb51d2ea0e962)
commit 2843bc44ba1aafb573f2c37f599502ed47a486e8
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 25 16:52:51 2011 +0100
s3-includes: remove global include of "system/select.h".
Guenther
(cherry picked from commit fd8b5389f675c1ad54dcd81b05ebc12c046b484d)
commit cf63a08f490fba230afd2b3ac03c61f6204090d6
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 25 16:48:10 2011 +0100
s3-includes: only include system/terminal.h when needed.
Guenther
(cherry picked from commit 55f9579110f3c7706d8008714ae69b49f0b463de)
commit 5155b66ce364c6935161e3c66a866d16058f76c6
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 25 16:39:14 2011 +0100
s3-includes: only include system/capability.h when needed.
Guenther
(cherry picked from commit 21a78b88cc56731793f41a04114ec7277f723147)
commit 2912e03f68bcf34f1691067ebfe49743831d5957
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 25 16:34:46 2011 +0100
s3-includes: only include system/glob.h when needed.
Guenther
(cherry picked from commit 739ca0e7db7acfd9d560ae361fd29f96f87c5755)
commit 631a86df9453247fd1338706a83eb90584ee24e3
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 25 16:29:14 2011 +0100
s3-includes: only include system/iconv.h when needed.
Guenther
(cherry picked from commit 310d26852705c79194566eba971377bbac5f1c52)
commit a5331b6deaf2a5adfcd7b27a64e1a2d709a6b4ea
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 25 16:19:10 2011 +0100
s3-includes: only include system/syslog.h when needed.
Guenther
(cherry picked from commit 89ca4875cd03ee7a4b8521a7ca838ce5d8391a21)
commit f4232559019d7bff5db378b3d541ead53017fc12
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 25 00:03:01 2011 +0100
s3-trans2: only include trans2.h where needed.
Guenther
(cherry picked from commit 99f4a6454356c563704c6acb762679a6afa90737)
commit 6cbd8849c4517f458b94d894050f2ea7b35320b9
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 24 22:30:16 2011 +0100
s3-winbind: remove global inclusion of libwbclient.
Guenther
(cherry picked from commit d85f140826374dd5ad3e7099b6bdb74967c6b9da)
-----------------------------------------------------------------------
Summary of changes:
libcli/registry/util_reg.c | 1 +
libcli/registry/util_reg.h | 32 ++
libgpo/gpext/gpext.c | 1 +
libgpo/gpo_util.c | 2 +-
source3/Makefile.in | 9 +-
source3/auth/auth_domain.c | 1 +
source3/auth/auth_server.c | 1 +
source3/auth/auth_unix.c | 1 +
source3/auth/auth_util.c | 2 +
source3/auth/auth_wbc.c | 1 +
source3/auth/auth_winbind.c | 1 +
source3/auth/check_samsec.c | 1 +
source3/auth/server_info.c | 2 +
source3/auth/server_info_sam.c | 1 +
source3/auth/token_util.c | 132 +------
source3/auth/user_krb5.c | 2 +
source3/auth/user_util.c | 1 +
source3/client/client.c | 2 +
source3/client/clitar.c | 1 +
source3/client/smbspool.c | 2 +
source3/groupdb/mapping.c | 3 +
source3/groupdb/mapping_tdb.c | 2 +
source3/groupdb/proto.h | 75 ++++
source3/include/includes.h | 27 --
source3/include/mapping.h | 1 +
source3/include/passdb.h | 6 +
source3/include/proto.h | 566 +++---------------------
source3/include/secrets.h | 1 +
source3/include/smbldap.h | 1 +
source3/intl/lang_tdb.c | 2 +
source3/intl/lang_tdb.h | 7 +
source3/lib/conn_tdb.c | 1 +
source3/lib/dbwrap_ctdb.c | 1 +
source3/lib/dprintf.c | 1 +
source3/lib/eventlog/eventlog.c | 1 +
source3/lib/fault.c | 1 +
source3/{smbd => lib}/filename_util.c | 0
source3/lib/g_lock.c | 1 +
source3/lib/gencache.c | 2 +
source3/lib/messages_local.c | 1 +
source3/lib/pidfile.c | 1 +
source3/lib/popt_common.c | 1 +
source3/lib/privileges.c | 1 +
source3/lib/recvfile.c | 1 +
source3/lib/server_mutex.c | 1 +
source3/lib/serverid.c | 1 +
source3/lib/sessionid_tdb.c | 1 +
source3/lib/sharesec.c | 1 +
source3/lib/smbconf/smbconf_reg.c | 1 +
source3/lib/smbldap_util.c | 1 +
source3/lib/substitute.c | 1 +
source3/lib/sysacls.c | 1 +
source3/lib/system.c | 4 +
source3/lib/system_smbd.c | 1 +
source3/lib/tdb_validate.c | 3 +-
source3/lib/username.c | 1 +
source3/lib/util.c | 2 +
source3/lib/util_builtin.c | 124 ++++++
source3/lib/util_sock.c | 1 +
source3/lib/util_tdb.c | 1 +
source3/lib/util_transfer_file.c | 1 +
source3/lib/util_unixsids.c | 116 +++++
source3/lib/util_wellknown.c | 173 ++++++++
source3/lib/winbind_util.c | 1 +
source3/lib/winbind_util.h | 60 +++
source3/libads/disp_sec.c | 1 +
source3/libads/kerberos.c | 1 +
source3/libgpo/gpext/scripts.c | 1 +
source3/libgpo/gpo_filesync.c | 1 +
source3/libgpo/gpo_reg.c | 1 +
source3/libnet/libnet_dssync_passdb.c | 2 +
source3/libnet/libnet_join.c | 1 +
source3/libnet/libnet_samsync_display.c | 1 +
source3/libnet/libnet_samsync_ldif.c | 2 +
source3/libnet/libnet_samsync_passdb.c | 2 +
source3/libsmb/clidfs.c | 1 +
source3/libsmb/clifile.c | 2 +
source3/libsmb/clifsinfo.c | 1 +
source3/libsmb/clilist.c | 1 +
source3/libsmb/cliquota.c | 1 +
source3/libsmb/clirap.c | 1 +
source3/libsmb/clireadwrite.c | 1 +
source3/libsmb/errormap.c | 1 -
source3/libsmb/ntlmssp.c | 1 +
source3/libsmb/samlogon_cache.c | 1 +
source3/libsmb/smb_share_modes.c | 1 +
source3/libsmb/trusts_util.c | 1 +
source3/locking/brlock.c | 1 +
source3/locking/locking.c | 1 +
source3/locking/posix.c | 1 +
source3/modules/nfs4_acls.c | 2 +
source3/modules/vfs_acl_common.c | 1 +
source3/modules/vfs_acl_tdb.c | 1 +
source3/modules/vfs_aio_fork.c | 1 +
source3/modules/vfs_audit.c | 2 +
source3/modules/vfs_crossrename.c | 2 +
source3/modules/vfs_default.c | 1 +
source3/modules/vfs_dirsort.c | 1 +
source3/modules/vfs_expand_msdfs.c | 1 +
source3/modules/vfs_extd_audit.c | 2 +
source3/modules/vfs_fake_perms.c | 1 +
source3/modules/vfs_fileid.c | 1 +
source3/modules/vfs_full_audit.c | 2 +
source3/modules/vfs_linux_xfs_sgid.c | 1 +
source3/modules/vfs_netatalk.c | 1 +
source3/modules/vfs_posixacl.c | 1 +
source3/modules/vfs_preopen.c | 1 +
source3/modules/vfs_readahead.c | 1 +
source3/modules/vfs_recycle.c | 1 +
source3/modules/vfs_scannedonly.c | 1 +
source3/modules/vfs_shadow_copy2.c | 1 +
source3/modules/vfs_streams_depot.c | 1 +
source3/modules/vfs_streams_xattr.c | 1 +
source3/modules/vfs_syncops.c | 1 +
source3/modules/vfs_xattr_tdb.c | 1 +
source3/nmbd/nmbd.c | 1 +
source3/nmbd/nmbd_namelistdb.c | 1 +
source3/nmbd/nmbd_serverlistdb.c | 1 +
source3/nmbd/nmbd_synclists.c | 1 +
source3/nmbd/nmbd_winsserver.c | 1 +
source3/pam_smbpass/general.h | 1 +
source3/param/loadparm.c | 1 +
source3/passdb/account_pol.c | 2 +
source3/passdb/login_cache.c | 2 +
source3/passdb/lookup_sid.c | 2 +
source3/passdb/lookup_sid.h | 33 ++
source3/passdb/machine_account_secrets.c | 1 +
source3/passdb/machine_sid.c | 1 +
source3/passdb/machine_sid.h | 7 +
source3/passdb/passdb.c | 2 +
source3/passdb/pdb_ads.c | 1 +
source3/passdb/pdb_compat.c | 1 +
source3/passdb/pdb_get_set.c | 1 +
source3/passdb/pdb_interface.c | 2 +
source3/passdb/pdb_ipa.c | 1 +
source3/passdb/pdb_ldap.c | 2 +
source3/passdb/pdb_nds.c | 1 +
source3/passdb/pdb_smbpasswd.c | 3 +
source3/passdb/pdb_tdb.c | 2 +
source3/passdb/pdb_util.c | 158 +++++++
source3/passdb/pdb_wbc_sam.c | 2 +
source3/passdb/proto.h | 302 +++++++++++++
source3/passdb/secrets.c | 2 +
source3/passdb/util_builtin.c | 124 ------
source3/passdb/util_unixsids.c | 115 -----
source3/passdb/util_wellknown.c | 173 --------
source3/printing/nt_printing.c | 1 +
source3/printing/nt_printing_ads.c | 1 +
source3/printing/nt_printing_migrate.c | 1 +
source3/printing/nt_printing_tdb.c | 1 +
source3/printing/print_standard.c | 1 +
source3/printing/printer_list.c | 1 +
source3/printing/printing.c | 2 +
source3/printing/printing_db.c | 1 +
source3/printing/tests/vlp.c | 2 +
source3/registry/reg_api_regf.c | 1 +
source3/registry/reg_backend_db.c | 2 +-
source3/registry/reg_backend_netlogon_params.c | 1 +
source3/registry/reg_objects.c | 1 +
source3/registry/reg_parse.c | 1 +
source3/registry/reg_parse_internal.h | 1 +
source3/registry/reg_perfcount.c | 2 +
source3/registry/regfio.c | 2 +
source3/rpc_client/cli_pipe_schannel.c | 1 +
source3/rpc_client/cli_winreg.c | 1 +
source3/rpc_server/lsa/srv_lsa_nt.c | 1 +
source3/rpc_server/netlogon/srv_netlog_nt.c | 3 +
source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c | 1 +
source3/rpc_server/samr/srv_samr_chgpasswd.c | 4 +
source3/rpc_server/samr/srv_samr_nt.c | 2 +
source3/rpc_server/samr/srv_samr_util.c | 1 +
source3/rpc_server/samr/srv_samr_util.h | 2 +
source3/rpc_server/spoolss/srv_spoolss_nt.c | 1 +
source3/rpc_server/spoolss/srv_spoolss_util.c | 1 +
source3/rpc_server/srv_pipe.c | 1 +
source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 1 +
source3/rpc_server/svcctl/srv_svcctl_reg.c | 1 +
source3/rpcclient/cmd_spoolss.c | 2 +
source3/rpcclient/rpcclient.c | 1 +
source3/smbd/close.c | 2 +
source3/smbd/dir.c | 1 +
source3/smbd/dosmode.c | 1 +
source3/smbd/file_access.c | 1 +
source3/smbd/filename.c | 1 +
source3/smbd/lanman.c | 1 +
source3/smbd/mangle_hash.c | 1 +
source3/smbd/msdfs.c | 1 +
source3/smbd/msg_idmap.c | 1 +
source3/smbd/notify_internal.c | 1 +
source3/smbd/ntquotas.c | 2 +
source3/smbd/nttrans.c | 2 +
source3/smbd/open.c | 1 +
source3/smbd/oplock_linux.c | 1 +
source3/smbd/password.c | 1 +
source3/smbd/posix_acls.c | 3 +
source3/smbd/process.c | 2 +
source3/smbd/reply.c | 1 +
source3/smbd/server.c | 2 +
source3/smbd/service.c | 2 +
source3/smbd/share_access.c | 1 +
source3/smbd/smb2_find.c | 1 +
source3/smbd/smb2_getinfo.c | 1 +
source3/smbd/smb2_read.c | 1 +
source3/smbd/smb2_setinfo.c | 1 +
source3/smbd/statvfs.c | 1 +
source3/smbd/trans2.c | 2 +
source3/smbd/uid.c | 2 +
source3/smbd/vfs.c | 2 +
source3/torture/cmd_vfs.c | 2 +
source3/torture/denytest.c | 1 +
source3/torture/locktest.c | 1 +
source3/torture/locktest2.c | 1 +
source3/torture/mangle_test.c | 1 +
source3/torture/masktest.c | 2 +
source3/torture/pdbtest.c | 1 +
source3/torture/scanner.c | 1 +
source3/torture/smbiconv.c | 1 +
source3/torture/torture.c | 2 +
source3/torture/utable.c | 1 +
source3/utils/dbwrap_tool.c | 1 +
source3/utils/dbwrap_torture.c | 1 +
source3/utils/eventlogadm.c | 1 +
source3/utils/net.c | 1 +
source3/utils/net_conf.c | 1 +
source3/utils/net_groupmap.c | 2 +
source3/utils/net_idmap.c | 1 +
source3/utils/net_lookup.c | 1 +
source3/utils/net_printing.c | 1 +
source3/utils/net_registry.c | 3 +
source3/utils/net_registry_util.c | 1 +
source3/utils/net_rpc.c | 2 +
source3/utils/net_rpc_printer.c | 2 +
source3/utils/net_rpc_registry.c | 2 +
source3/utils/net_rpc_samsync.c | 1 +
source3/utils/net_sam.c | 3 +
source3/utils/net_usershare.c | 2 +
source3/utils/pdbedit.c | 1 +
source3/utils/profiles.c | 1 +
source3/utils/sharesec.c | 1 +
source3/utils/smbcacls.c | 1 +
source3/utils/smbcontrol.c | 1 +
source3/utils/smbfilter.c | 1 +
source3/utils/smbpasswd.c | 2 +
source3/utils/status.c | 1 +
source3/utils/testparm.c | 1 +
source3/web/cgi.c | 3 +
source3/web/diagnose.c | 1 +
source3/web/neg_lang.c | 1 +
source3/web/swat.c | 3 +
source3/winbindd/idmap.c | 1 +
source3/winbindd/idmap_autorid.c | 1 +
source3/winbindd/idmap_nss.c | 2 +
source3/winbindd/idmap_passdb.c | 1 +
source3/winbindd/idmap_tdb.c | 1 +
source3/winbindd/wb_gettoken.c | 1 +
source3/winbindd/wb_next_grent.c | 1 +
source3/winbindd/wb_next_pwent.c | 1 +
source3/winbindd/winbindd.h | 10 +-
source3/winbindd/winbindd_ads.c | 7 +-
source3/winbindd/winbindd_cache.c | 10 +-
source3/winbindd/winbindd_cm.c | 1 +
source3/winbindd/winbindd_dual_srv.c | 2 +-
source3/winbindd/winbindd_msrpc.c | 8 +-
source3/winbindd/winbindd_pam.c | 1 +
source3/winbindd/winbindd_reconnect.c | 4 +-
source3/winbindd/winbindd_rpc.c | 12 +-
source3/winbindd/winbindd_rpc.h | 4 +-
source3/winbindd/winbindd_samr.c | 11 +-
source3/winbindd/winbindd_util.c | 1 +
source3/wscript_build | 9 +-
270 files changed, 1512 insertions(+), 1123 deletions(-)
create mode 100644 libcli/registry/util_reg.h
create mode 100644 source3/groupdb/proto.h
create mode 100644 source3/intl/lang_tdb.h
rename source3/{smbd => lib}/filename_util.c (100%)
create mode 100644 source3/lib/util_builtin.c
create mode 100644 source3/lib/util_unixsids.c
create mode 100644 source3/lib/util_wellknown.c
create mode 100644 source3/lib/winbind_util.h
create mode 100644 source3/passdb/lookup_sid.h
create mode 100644 source3/passdb/machine_sid.h
create mode 100644 source3/passdb/pdb_util.c
create mode 100644 source3/passdb/proto.h
delete mode 100644 source3/passdb/util_builtin.c
delete mode 100644 source3/passdb/util_unixsids.c
delete mode 100644 source3/passdb/util_wellknown.c
Changeset truncated at 500 lines:
diff --git a/libcli/registry/util_reg.c b/libcli/registry/util_reg.c
index 3a1168f..3139fc3 100644
--- a/libcli/registry/util_reg.c
+++ b/libcli/registry/util_reg.c
@@ -21,6 +21,7 @@
#include "includes.h"
#include "../librpc/gen_ndr/ndr_misc.h"
+#include "../libcli/registry/util_reg.h"
/**
* @file
diff --git a/libcli/registry/util_reg.h b/libcli/registry/util_reg.h
new file mode 100644
index 0000000..0250b45
--- /dev/null
+++ b/libcli/registry/util_reg.h
@@ -0,0 +1,32 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Registry helper routines
+ * Copyright (C) Volker Lendecke 2006
+ * Copyright (C) Guenther Deschner 2009
+ * Copyright (C) Jelmer Vernooij 2003-2007
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __LIBCLI_REGISTRY_UTIL_REG_H__
+#define __LIBCLI_REGISTRY_UTIL_REG_H__
+
+const char *str_regtype(int type);
+int regtype_by_string(const char *str);
+bool push_reg_sz(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, const char *s);
+bool push_reg_multi_sz(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, const char **a);
+bool pull_reg_sz(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, const char **s);
+bool pull_reg_multi_sz(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, const char ***a);
+
+#endif /* __LIBCLI_REGISTRY_UTIL_REG_H__ */
diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c
index 8c70f65..080bf07 100644
--- a/libgpo/gpext/gpext.c
+++ b/libgpo/gpext/gpext.c
@@ -22,6 +22,7 @@
#include "../libgpo/gpext/gpext.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "lib/util/dlinklist.h"
+#include "../libcli/registry/util_reg.h"
#if _SAMBA_BUILD_ == 3
#include "libgpo/gpo_proto.h"
#include "registry.h"
diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index 9e4687d..553402a 100644
--- a/libgpo/gpo_util.c
+++ b/libgpo/gpo_util.c
@@ -18,12 +18,12 @@
*/
#define TALLOC_DEPRECATED 1
#include "includes.h"
+#include "system/filesys.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "../librpc/gen_ndr/ndr_security.h"
#include "../libgpo/gpo.h"
#include "../libcli/security/security.h"
#if _SAMBA_BUILD_ == 4
-#include "system/filesys.h"
#include "auth/auth.h"
#include <talloc.h>
#include "source4/libgpo/ads_convenience.h"
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 75faa0c..fc58140 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -759,11 +759,12 @@ PRIVILEGES_OBJ = lib/privileges.o
PASSDB_GET_SET_OBJ = passdb/pdb_get_set.o
PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \
- passdb/util_wellknown.o passdb/util_builtin.o passdb/pdb_compat.o \
- passdb/util_unixsids.o passdb/lookup_sid.o \
+ lib/util_wellknown.o lib/util_builtin.o passdb/pdb_compat.o \
+ lib/util_unixsids.o passdb/lookup_sid.o \
passdb/login_cache.o @PDB_STATIC@ \
passdb/account_pol.o $(PRIVILEGES_OBJ) \
- lib/util_nscd.o lib/winbind_util.o $(SERVER_MUTEX_OBJ)
+ lib/util_nscd.o lib/winbind_util.o $(SERVER_MUTEX_OBJ) \
+ passdb/pdb_util.o
DEVEL_HELP_WEIRD_OBJ = modules/weird.o
CP850_OBJ = modules/CP850.o
@@ -786,7 +787,7 @@ OPLOCK_OBJ = smbd/oplock.o smbd/oplock_irix.o smbd/oplock_linux.o \
NOTIFY_OBJ = smbd/notify.o smbd/notify_inotify.o smbd/notify_internal.o \
librpc/gen_ndr/ndr_notify.o librpc/gen_ndr/ndr_file_id.o
-FNAME_UTIL_OBJ = smbd/filename_util.o
+FNAME_UTIL_OBJ = lib/filename_util.o
VFS_DEFAULT_OBJ = modules/vfs_default.o
VFS_AUDIT_OBJ = modules/vfs_audit.o
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 65b0f20..c69ae63 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -24,6 +24,7 @@
#include "rpc_client/cli_pipe.h"
#include "rpc_client/cli_netlogon.h"
#include "secrets.h"
+#include "passdb.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/auth_server.c b/source3/auth/auth_server.c
index 5fee1e4..47b6e36 100644
--- a/source3/auth/auth_server.c
+++ b/source3/auth/auth_server.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "system/passwd.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/auth_unix.c b/source3/auth/auth_unix.c
index 072ad84..5d89ca8 100644
--- a/source3/auth/auth_unix.c
+++ b/source3/auth/auth_unix.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "system/passwd.h"
#include "../librpc/gen_ndr/samr.h"
#include "smbd/globals.h"
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 688aac4..72217af 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -28,6 +28,8 @@
#include "rpc_client/init_lsa.h"
#include "../libcli/security/security.h"
#include "../lib/util/util_pw.h"
+#include "lib/winbind_util.h"
+#include "passdb.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/auth_wbc.c b/source3/auth/auth_wbc.c
index 7ab9665..06ddbb1 100644
--- a/source3/auth/auth_wbc.c
+++ b/source3/auth/auth_wbc.c
@@ -38,6 +38,7 @@
*/
#include "includes.h"
+#include "nsswitch/libwbclient/wbclient.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c
index 9328b66..ff738be 100644
--- a/source3/auth/auth_winbind.c
+++ b/source3/auth/auth_winbind.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "nsswitch/libwbclient/wbclient.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/check_samsec.c b/source3/auth/check_samsec.c
index db5f68f..98d7ce8 100644
--- a/source3/auth/check_samsec.c
+++ b/source3/auth/check_samsec.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "../libcli/auth/libcli_auth.h"
+#include "passdb.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index e218ca9..ca35ba7 100644
--- a/source3/auth/server_info.c
+++ b/source3/auth/server_info.c
@@ -22,6 +22,8 @@
#include "../librpc/gen_ndr/netlogon.h"
#include "../libcli/security/security.h"
#include "rpc_client/util_netlogon.h"
+#include "nsswitch/libwbclient/wbclient.h"
+#include "passdb.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/server_info_sam.c b/source3/auth/server_info_sam.c
index c09ae76..35bbeba 100644
--- a/source3/auth/server_info_sam.c
+++ b/source3/auth/server_info_sam.c
@@ -25,6 +25,7 @@
#include "smbd/globals.h"
#include "../libcli/auth/libcli_auth.h"
#include "nsswitch/winbind_client.h"
+#include "passdb.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index f88511d..c2f4571 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -30,6 +30,8 @@
#include "../librpc/gen_ndr/netlogon.h"
#include "../libcli/security/security.h"
#include "../lib/util/util_pw.h"
+#include "lib/winbind_util.h"
+#include "passdb.h"
/****************************************************************************
Check for a SID in an struct security_token
@@ -203,136 +205,6 @@ static NTSTATUS add_builtin_administrators(struct security_token *token,
return NT_STATUS_OK;
}
-/**
- * Create the requested BUILTIN if it doesn't already exist. This requires
- * winbindd to be running.
- *
- * @param[in] rid BUILTIN rid to create
- * @return Normal NTSTATUS return.
- */
-static NTSTATUS create_builtin(uint32 rid)
-{
- NTSTATUS status = NT_STATUS_OK;
- struct dom_sid sid;
- gid_t gid;
-
- if (!sid_compose(&sid, &global_sid_Builtin, rid)) {
- return NT_STATUS_NO_SUCH_ALIAS;
- }
-
- if (!sid_to_gid(&sid, &gid)) {
- if (!lp_winbind_nested_groups() || !winbind_ping()) {
- return NT_STATUS_PROTOCOL_UNREACHABLE;
- }
- status = pdb_create_builtin_alias(rid);
- }
- return status;
-}
-
-/**
- * Add sid as a member of builtin_sid.
- *
- * @param[in] builtin_sid An existing builtin group.
- * @param[in] dom_sid sid to add as a member of builtin_sid.
- * @return Normal NTSTATUS return
- */
-static NTSTATUS add_sid_to_builtin(const struct dom_sid *builtin_sid,
- const struct dom_sid *dom_sid)
-{
- NTSTATUS status = NT_STATUS_OK;
-
- if (!dom_sid || !builtin_sid) {
- return NT_STATUS_INVALID_PARAMETER;
- }
-
- status = pdb_add_aliasmem(builtin_sid, dom_sid);
-
- if (NT_STATUS_EQUAL(status, NT_STATUS_MEMBER_IN_ALIAS)) {
- DEBUG(5, ("add_sid_to_builtin %s is already a member of %s\n",
- sid_string_dbg(dom_sid),
- sid_string_dbg(builtin_sid)));
- return NT_STATUS_OK;
- }
-
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(4, ("add_sid_to_builtin %s could not be added to %s: "
- "%s\n", sid_string_dbg(dom_sid),
- sid_string_dbg(builtin_sid), nt_errstr(status)));
- }
- return status;
-}
-
-/*******************************************************************
-*******************************************************************/
-
-NTSTATUS create_builtin_users(const struct dom_sid *dom_sid)
-{
- NTSTATUS status;
- struct dom_sid dom_users;
-
- status = create_builtin(BUILTIN_RID_USERS);
- if ( !NT_STATUS_IS_OK(status) ) {
- DEBUG(5,("create_builtin_users: Failed to create Users\n"));
- return status;
- }
-
- /* add domain users */
- if ((IS_DC || (lp_server_role() == ROLE_DOMAIN_MEMBER))
- && sid_compose(&dom_users, dom_sid, DOMAIN_RID_USERS))
- {
- status = add_sid_to_builtin(&global_sid_Builtin_Users,
- &dom_users);
- }
-
- return status;
-}
-
-/*******************************************************************
-*******************************************************************/
-
-NTSTATUS create_builtin_administrators(const struct dom_sid *dom_sid)
-{
- NTSTATUS status;
- struct dom_sid dom_admins, root_sid;
- fstring root_name;
- enum lsa_SidType type;
- TALLOC_CTX *ctx;
- bool ret;
-
- status = create_builtin(BUILTIN_RID_ADMINISTRATORS);
- if ( !NT_STATUS_IS_OK(status) ) {
- DEBUG(5,("create_builtin_administrators: Failed to create Administrators\n"));
- return status;
- }
-
- /* add domain admins */
- if ((IS_DC || (lp_server_role() == ROLE_DOMAIN_MEMBER))
- && sid_compose(&dom_admins, dom_sid, DOMAIN_RID_ADMINS))
- {
- status = add_sid_to_builtin(&global_sid_Builtin_Administrators,
- &dom_admins);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
- }
- }
-
- /* add root */
- if ( (ctx = talloc_init("create_builtin_administrators")) == NULL ) {
- return NT_STATUS_NO_MEMORY;
- }
- fstr_sprintf( root_name, "%s\\root", get_global_sam_name() );
- ret = lookup_name(ctx, root_name, LOOKUP_NAME_DOMAIN, NULL, NULL,
- &root_sid, &type);
- TALLOC_FREE( ctx );
-
- if ( ret ) {
- status = add_sid_to_builtin(&global_sid_Builtin_Administrators,
- &root_sid);
- }
-
- return status;
-}
-
static NTSTATUS finalize_local_nt_token(struct security_token *result,
bool is_guest);
diff --git a/source3/auth/user_krb5.c b/source3/auth/user_krb5.c
index 50716fd..481af6a 100644
--- a/source3/auth/user_krb5.c
+++ b/source3/auth/user_krb5.c
@@ -19,6 +19,8 @@
#include "includes.h"
#include "librpc/gen_ndr/krb5pac.h"
+#include "nsswitch/libwbclient/wbclient.h"
+#include "passdb.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/user_util.c b/source3/auth/user_util.c
index d6c47a8..4ed6db1 100644
--- a/source3/auth/user_util.c
+++ b/source3/auth/user_util.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "system/filesys.h"
/*******************************************************************
Map a username from a dos name to a unix name by looking in the username
diff --git a/source3/client/client.c b/source3/client/client.c
index 749a987..c3f6059 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -22,6 +22,7 @@
*/
#include "includes.h"
+#include "system/filesys.h"
#include "popt_common.h"
#include "rpc_client/cli_pipe.h"
#include "client/client_proto.h"
@@ -32,6 +33,7 @@
#include "../libcli/security/security.h"
#include "system/select.h"
#include "libsmb/clirap.h"
+#include "trans2.h"
#ifndef REGISTER
#define REGISTER 0
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index ac891aa..b46115b 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -35,6 +35,7 @@
#include "includes.h"
+#include "system/filesys.h"
#include "clitar.h"
#include "client/client_proto.h"
diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index c80ad42..98c350d 100644
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -23,6 +23,8 @@
*/
#include "includes.h"
+#include "system/filesys.h"
+#include "system/passwd.h"
/*
* Starting with CUPS 1.3, Kerberos support is provided by cupsd including
diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index d76e344..3646e04 100644
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -21,8 +21,11 @@
*/
#include "includes.h"
+#include "system/passwd.h"
+#include "passdb.h"
#include "groupdb/mapping.h"
#include "../libcli/security/security.h"
+#include "lib/winbind_util.h"
static const struct mapping_backend *backend;
diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index cd9a59c..1137b8f 100644
--- a/source3/groupdb/mapping_tdb.c
+++ b/source3/groupdb/mapping_tdb.c
@@ -21,6 +21,8 @@
*/
#include "includes.h"
+#include "system/filesys.h"
+#include "passdb.h"
#include "groupdb/mapping.h"
#include "dbwrap.h"
#include "../libcli/security/security.h"
diff --git a/source3/groupdb/proto.h b/source3/groupdb/proto.h
new file mode 100644
index 0000000..11162e6
--- /dev/null
+++ b/source3/groupdb/proto.h
@@ -0,0 +1,75 @@
+
+/* The following definitions come from groupdb/mapping.c */
+
+NTSTATUS add_initial_entry(gid_t gid, const char *sid, enum lsa_SidType sid_name_use, const char *nt_name, const char *comment);
+bool get_domain_group_from_sid(struct dom_sid sid, GROUP_MAP *map);
+int smb_create_group(const char *unix_group, gid_t *new_gid);
+int smb_delete_group(const char *unix_group);
+int smb_set_primary_group(const char *unix_group, const char* unix_user);
+int smb_add_user_group(const char *unix_group, const char *unix_user);
+int smb_delete_user_group(const char *unix_group, const char *unix_user);
+NTSTATUS pdb_default_getgrsid(struct pdb_methods *methods, GROUP_MAP *map,
+ struct dom_sid sid);
+NTSTATUS pdb_default_getgrgid(struct pdb_methods *methods, GROUP_MAP *map,
+ gid_t gid);
+NTSTATUS pdb_default_getgrnam(struct pdb_methods *methods, GROUP_MAP *map,
+ const char *name);
+NTSTATUS pdb_default_add_group_mapping_entry(struct pdb_methods *methods,
+ GROUP_MAP *map);
+NTSTATUS pdb_default_update_group_mapping_entry(struct pdb_methods *methods,
+ GROUP_MAP *map);
+NTSTATUS pdb_default_delete_group_mapping_entry(struct pdb_methods *methods,
+ struct dom_sid sid);
+NTSTATUS pdb_default_enum_group_mapping(struct pdb_methods *methods,
+ const struct dom_sid *sid, enum lsa_SidType sid_name_use,
+ GROUP_MAP **pp_rmap, size_t *p_num_entries,
+ bool unix_only);
--
Samba Shared Repository
More information about the samba-cvs
mailing list