[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Tue Mar 29 18:01:14 MDT 2011


The branch, master has been updated
       via  72833e4 s3-ctdb_wrap: remove unused variable from db_ctdb_fetch_persistent().
       via  ab9a29e s3-rpc_server: move access check functions out of samr server.
       via  b1e3b9d s3: only include ntioctl.h where needed.
       via  c2d6260 s3: only include lib/privileges.h where needed.
       via  643b08d s3: include ../librpc/gen_ndr/lsa.h where needed.
       via  1d383da s3-passdb: move lsa_dom_info and lsa_name_info out of smb.h into passdb.
       via  6e3f0d2 s3-includes: only include ntdomain.h where needed.
       via  9115615 pidl: add an include for "ntdomain.h" for s3 server stubs.
       via  ab36d59 s3-messages: make ndr_messaging.h part of messages.h.
       via  b2af281 s3-messages: only include messages.h where needed.
       via  4bd5f51 s3-prototyes: user_in_netgroup and user_in_list moved to auth, out of smbd.
       via  3679c0b s3-includes: finally remove global include of auth.h.
       via  bd471d3 s3-auth: vfs modules need auth.h
       via  3061f44 s3-auth: printing needs auth.h
       via  af300a9 s3-auth: smbd needs auth.h
       via  146c1aa s3-auth: rpc_server needs auth.h
       via  7e73214 s3-auth: use auth.h where needed.
       via  1b6767d s3-auth: move auth prototypes to auth/proto.h.
       via  2473c2f s3-libsmb: put namequery headers to nmblib.h
       via  2377039 s3-locking: move locking prototypes out of proto.h.
       via  f064c8e s3: finally remove global include of smbd prototypes.
       via  20d8ae4 s3: rpc_server needs parts of smbd.
       via  84815d3 s3: printing needs parts of smbd.
       via  34a335a s3: auth also needs parts of smbd.
       via  45364f5 s3-vfs: include smbd/smbd.h in vfs modules.
       via  8c24ebf s3: include smbd/smbd.h where needed.
       via  ef990a1 s3-smbd: add smbd.h and move smbd prototypes to smbd/proto.h.
       via  8560c00 s3: move filename_util.c out of source3/smbd to source3/lib.
       via  6b76909 s3-build: only include intl protos where needed.
       via  60d2816 s3-passdb: finally stop including passdb.h globaly.
       via  235f148 s3-passdb: use passdb headers where needed.
       via  a22a53e s3-passdb: move util_builtin.c out of passdb.
       via  7d798ac s3-passdb: move util_unixsids.c out of passdb.
       via  bcee6c1 s3-passdb: move util_wellknown.c out of passdb.
       via  cc94bcb s3-winbindd: copy acct_info to wb_acct_info so we dont need passdb for it.
       via  f378f9f s3-passdb: add machine_sid.h and lookup_sid.h
       via  cd7e088 s3-proto: add some forward declarations.
       via  2f36ef7 s3-passdb: add passdb.h where needed.
       via  b0773aa s3-passdb: move mapping.h into passdb.h, its needed here.
       via  35c2d8e s3-passdb: move passdb headers to passdb/proto.h.
       via  bb04a70 s3-groupdb: move groupdb headers to groupdb/proto.h.
       via  03e6082 s3: create_builtin_users/administrators belongs to passdb not auth.
       via  9bd06f6 s3-build: only include transfer_file.h where needed.
       via  0a250f4 registry: create and use shared libcli/registry/util_reg.h header.
       via  49ccae1 s3-includes: no point in including all security headers globally.
       via  1d7b7ce s3-includes: remove EILSEQ check, this is handled by ../lib/replace/system/iconv.h already.
       via  0e77126 s3-includes: only include system/filesys.h when needed.
       via  64422d9 s3-includes: remove global include of "system/network.h"
       via  49fcf65 s3-includes: only include system/passwd.h when needed.
       via  7369ef1 s3-includes: only include system/shmem.h when needed.
       via  fd8b538 s3-includes: remove global include of "system/select.h".
       via  55f9579 s3-includes: only include system/terminal.h when needed.
       via  21a78b8 s3-includes: only include system/capability.h when needed.
       via  739ca0e s3-includes: only include system/glob.h when needed.
       via  310d268 s3-includes: only include system/iconv.h when needed.
       via  89ca487 s3-includes: only include system/syslog.h when needed.
       via  99f4a64 s3-trans2: only include trans2.h where needed.
       via  d85f140 s3-winbind: remove global inclusion of libwbclient.
       via  9648795 lib/util/util_pw: share more code between lib/util/util_pw.c and source3/lib/username.c
       via  6442112 lib/util/util_pw: share sys_get{pw,gr} group of calls.
       via  f4868ab lib/util/util_pw: temporary rename of getpwnam_alloc and getpwuid_alloc.
      from  0c5214e Ensure convert_string_XXX is always called with a valid converted_size pointer.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 72833e416f6ffc10eb547ec7d5d9a66ee912a0c1
Author: Günther Deschner <gd at samba.org>
Date:   Mon Mar 28 12:27:21 2011 +0200

    s3-ctdb_wrap: remove unused variable from db_ctdb_fetch_persistent().
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed Mar 30 02:00:50 CEST 2011 on sn-devel-104

commit ab9a29eb638143a93f70bb7880ca24f73bbb2118
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 25 14:12:59 2011 +0100

    s3-rpc_server: move access check functions out of samr server.
    
    Guenther

commit b1e3b9d7c118b5ba5260525e87796a98a5037144
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 25 13:42:42 2011 +0100

    s3: only include ntioctl.h where needed.
    
    Guenther

commit c2d6260f1042313ecb7540dd6ced1470db3001e9
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 25 11:56:52 2011 +0100

    s3: only include lib/privileges.h where needed.
    
    This finally removes the global lsa.h inclusion.
    
    Guenther

commit 643b08dd25f9b1891b55d6653d0b04403d9b8ea0
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 25 11:56:10 2011 +0100

    s3: include ../librpc/gen_ndr/lsa.h where needed.
    
    Guenther

commit 1d383daf399b08c3833e55d11135796e34cc2689
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 25 11:40:00 2011 +0100

    s3-passdb: move lsa_dom_info and lsa_name_info out of smb.h into passdb.
    
    Guenther

commit 6e3f0d28a4c0bc79cdbe4cfb50d105c4fe479d2b
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 24 22:33:07 2011 +0100

    s3-includes: only include ntdomain.h where needed.
    
    Guenther

commit 9115615663edf82afde5a3c934b53d53a0e508f0
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 24 22:32:17 2011 +0100

    pidl: add an include for "ntdomain.h" for s3 server stubs.
    
    Guenther

commit ab36d597e75286cca09abd75c67d8072c0ff64cf
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 24 15:56:32 2011 +0100

    s3-messages: make ndr_messaging.h part of messages.h.
    
    Guenther

commit b2af281e508194d9548ea1119c19ee96a0dd1f0a
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 24 15:31:06 2011 +0100

    s3-messages: only include messages.h where needed.
    
    Guenther

commit 4bd5f51c43147b74203711764390727bdda17a77
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 24 14:16:28 2011 +0100

    s3-prototyes: user_in_netgroup and user_in_list moved to auth, out of smbd.
    
    Guenther

commit 3679c0b8c101f9652858ea74a71556cdcdc88cb3
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 25 02:28:17 2011 +0100

    s3-includes: finally remove global include of auth.h.
    
    Guenther

commit bd471d30047e7053a0accf8b7a3caf0472d06486
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 24 14:15:54 2011 +0100

    s3-auth: vfs modules need auth.h
    
    Guenther

commit 3061f44fc9f6cf5b532cd59598d166e52c8cef36
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 24 14:12:42 2011 +0100

    s3-auth: printing needs auth.h
    
    Guenther

commit af300a9fcb96f99b37cbf3a47332a135bfe9722f
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 24 13:46:20 2011 +0100

    s3-auth: smbd needs auth.h
    
    Guenther

commit 146c1aac99b20afff30567e80fca7540853c446a
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 24 12:08:15 2011 +0100

    s3-auth: rpc_server needs auth.h
    
    Guenther

commit 7e73214ebf614a1f876bf80d374c1e1bc9379981
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 25 02:28:05 2011 +0100

    s3-auth: use auth.h where needed.
    
    Guenther

commit 1b6767d26218eaf85ec7af9281c6674bab36ce3f
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 25 02:27:24 2011 +0100

    s3-auth: move auth prototypes to auth/proto.h.
    
    Guenther

commit 2473c2fb1b9246e284b96cdf117bbb592a7c5309
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 23 14:18:59 2011 +0100

    s3-libsmb: put namequery headers to nmblib.h
    
    We might find a better name for it and merge other namequery related things as
    well here...
    
    Guenther

commit 2377039738ea6676b71d58db770ffcd594ca08b7
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 23 12:43:17 2011 +0100

    s3-locking: move locking prototypes out of proto.h.
    
    Will later become part of locking.h
    
    Guenther

commit f064c8e4f23b7d427b6e0cb11a6d7ec04964e773
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 25 11:15:55 2011 +0100

    s3: finally remove global include of smbd prototypes.
    
    Guenther

commit 20d8ae49b701bc2663dcecad8253863c9c979a40
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 22 23:49:33 2011 +0100

    s3: rpc_server needs parts of smbd.
    
    Guenther

commit 84815d38d204f3b6d0bbd2f419a20915078be70a
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 22 23:49:17 2011 +0100

    s3: printing needs parts of smbd.
    
    Guenther

commit 34a335a87db7d707c34a069f29b7cb97c8f36be9
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 22 23:49:03 2011 +0100

    s3: auth also needs parts of smbd.
    
    Guenther

commit 45364f5e69c4ef00f6870e11213da930e802b6d0
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 22 22:34:22 2011 +0100

    s3-vfs: include smbd/smbd.h in vfs modules.
    
    Guenther

commit 8c24ebf371d8aff4742a2ba063a8789e20eaaabc
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 22 16:57:01 2011 +0100

    s3: include smbd/smbd.h where needed.
    
    Guenther

commit ef990a1701646197abcc0cdc61bb07df6210f950
Author: Günther Deschner <gd at samba.org>
Date:   Sat Mar 19 00:47:12 2011 +0100

    s3-smbd: add smbd.h and move smbd prototypes to smbd/proto.h.
    
    Guenther

commit 8560c00a507126c0d315d0b790ab154a3a75a426
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

commit 6b76909f5ef5f279cb73decf83f23d3dbf8adaf8
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

commit 60d2816c5e914f1674267a3b388c302335f93466
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

commit 235f1485901774bfbeb0f052bc4e1397f4ef0b88
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

commit a22a53ea44c18378481d3a432fb0e667117da5bd
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

commit 7d798ac485b47483c9f99c67f7be196d55587a09
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

commit bcee6c1fe209b458e546b5788a9148eecc8715f1
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

commit cc94bcb952b1bf16e1d3f335e5288f793ee4ca96
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

commit f378f9f144d2b8ccb9c8443f3e605171e60ce3c2
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

commit cd7e088ddf37cb9f516e3a9d94232fa1e91221cd
Author: Günther Deschner <gd at samba.org>
Date:   Sat Mar 19 00:46:41 2011 +0100

    s3-proto: add some forward declarations.
    
    Guenther

commit 2f36ef72256cf3c2e36ed759427af07effda1069
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

commit b0773aa61a1fdecfd80f09454ff85c7bb4b7896b
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

commit 35c2d8ec1edd84714d9d6f8082d116d734b83161
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

commit bb04a70c0bf5fbc10733edd20feb5bb03386c084
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

commit 03e6082e3c8230f2ffc6b8a5d27109c41f7aca81
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

commit 9bd06f6bc72ffd414e417a99cca425f047810b3c
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

commit 0a250f4946a6045290229a276acf1e007c61450e
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

commit 49ccae1c2006806b36994992a9550cbb1bb8b769
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

commit 1d7b7ce42e1dd8c648bd62c317f1414b29ddbd08
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

commit 0e771263eed0b9bc364ce523765ea17dd1192841
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

commit 64422d973583a510e6ea2e655bf398ea85f445b5
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

commit 49fcf653b11ef7308b849027d342a3182f270dd3
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

commit 7369ef1f1cdeeeed89e454c588edb51d2ea0e962
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

commit fd8b5389f675c1ad54dcd81b05ebc12c046b484d
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

commit 55f9579110f3c7706d8008714ae69b49f0b463de
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

commit 21a78b88cc56731793f41a04114ec7277f723147
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

commit 739ca0e7db7acfd9d560ae361fd29f96f87c5755
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

commit 310d26852705c79194566eba971377bbac5f1c52
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

commit 89ca4875cd03ee7a4b8521a7ca838ce5d8391a21
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

commit 99f4a6454356c563704c6acb762679a6afa90737
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

commit d85f140826374dd5ad3e7099b6bdb74967c6b9da
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

commit 96487959e90b1aeec071d94e7f2c744af17fb5d0
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 2 16:11:00 2011 +0100

    lib/util/util_pw: share more code between lib/util/util_pw.c and source3/lib/username.c
    
    Guenther

commit 64421129b672d0ce55c5aa235e5038dd2ea1b32b
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 2 16:06:32 2011 +0100

    lib/util/util_pw: share sys_get{pw,gr} group of calls.
    
    Guenther

commit f4868ab6467ad7e6fae78bd14b83aeae68026769
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 2 16:31:01 2011 +0100

    lib/util/util_pw: temporary rename of getpwnam_alloc and getpwuid_alloc.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 lib/util/debug_s3.c                                |    1 +
 lib/util/util_pw.c                                 |   66 +-
 lib/util/util_pw.h                                 |   39 +
 lib/util/wscript_build                             |    5 +
 libcli/registry/util_reg.c                         |    1 +
 libcli/registry/util_reg.h                         |   32 +
 libgpo/gpext/gpext.c                               |    1 +
 libgpo/gpo_ldap.c                                  |    1 +
 libgpo/gpo_sec.c                                   |    1 +
 libgpo/gpo_util.c                                  |    2 +-
 pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm            |    1 +
 source3/Makefile.in                                |   13 +-
 source3/auth/auth.c                                |    1 +
 source3/auth/auth_builtin.c                        |    1 +
 source3/auth/auth_compat.c                         |    1 +
 source3/auth/auth_domain.c                         |    2 +
 source3/auth/auth_netlogond.c                      |    1 +
 source3/auth/auth_ntlmssp.c                        |    2 +
 source3/auth/auth_sam.c                            |    1 +
 source3/auth/auth_script.c                         |    1 +
 source3/auth/auth_server.c                         |    3 +
 source3/auth/auth_unix.c                           |    2 +
 source3/auth/auth_util.c                           |    4 +
 source3/auth/auth_wbc.c                            |    2 +
 source3/auth/auth_winbind.c                        |    2 +
 source3/auth/check_samsec.c                        |    2 +
 source3/auth/pampass.c                             |    1 +
 source3/auth/pass_check.c                          |    1 +
 source3/auth/proto.h                               |  268 +++
 source3/auth/server_info.c                         |    3 +
 source3/auth/server_info_sam.c                     |    2 +
 source3/auth/token_util.c                          |  135 +--
 source3/auth/user_info.c                           |    1 +
 source3/auth/user_krb5.c                           |    3 +
 source3/auth/user_util.c                           |    2 +
 source3/client/client.c                            |    3 +
 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/auth.h                             |    2 +
 source3/include/ctdbd_conn.h                       |    2 +
 source3/include/includes.h                         |   33 -
 source3/include/locking.h                          |    2 +
 source3/include/mapping.h                          |    1 +
 source3/include/messages.h                         |    2 +
 source3/include/passdb.h                           |    8 +
 source3/include/proto.h                            | 2271 +-------------------
 source3/include/secrets.h                          |    1 +
 source3/include/smb.h                              |   17 +-
 source3/include/smbldap.h                          |    1 +
 source3/include/vfs.h                              |    5 +-
 source3/intl/lang_tdb.c                            |    2 +
 source3/intl/lang_tdb.h                            |    7 +
 source3/lib/audit.c                                |    1 +
 source3/lib/conn_tdb.c                             |    1 +
 source3/lib/ctdbd_conn.c                           |    3 +-
 source3/lib/dbwrap_ctdb.c                          |    3 +-
 source3/lib/dmallocmsg.c                           |    2 +-
 source3/lib/dprintf.c                              |    1 +
 source3/lib/dumpcore.c                             |    1 +
 source3/lib/eventlog/eventlog.c                    |    1 +
 source3/lib/filename_util.c                        |  207 ++
 source3/lib/g_lock.c                               |    3 +-
 source3/lib/gencache.c                             |    2 +
 source3/lib/messages.c                             |    3 +-
 source3/lib/messages_ctdbd.c                       |    2 +-
 source3/lib/messages_local.c                       |    4 +-
 source3/lib/pidfile.c                              |    1 +
 source3/lib/popt_common.c                          |    1 +
 source3/lib/privileges.c                           |    2 +
 source3/lib/privileges.h                           |   18 +
 source3/lib/recvfile.c                             |    1 +
 source3/lib/server_contexts.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                           |    2 +
 source3/lib/sysacls.c                              |    1 +
 source3/lib/system.c                               |   48 +-
 source3/lib/system_smbd.c                          |    1 +
 source3/lib/tallocmsg.c                            |    2 +-
 source3/lib/tdb_validate.c                         |    3 +-
 source3/lib/username.c                             |   37 +-
 source3/lib/util.c                                 |    4 +
 source3/lib/util_builtin.c                         |  124 ++
 source3/lib/util_sconn.c                           |    1 +
 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                         |    2 +
 source3/lib/winbind_util.h                         |   62 +
 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.c                    |    1 +
 source3/libnet/libnet_samsync_display.c            |    1 +
 source3/libnet/libnet_samsync_ldif.c               |    2 +
 source3/libnet/libnet_samsync_passdb.c             |    2 +
 source3/librpc/rpc/dcerpc_ep.c                     |    1 +
 source3/librpc/rpc/dcerpc_helpers.c                |    1 +
 source3/libsmb/async_smb.c                         |    1 +
 source3/libsmb/cliconnect.c                        |    1 +
 source3/libsmb/clidfs.c                            |    2 +
 source3/libsmb/clidgram.c                          |    3 +-
 source3/libsmb/clifile.c                           |    3 +
 source3/libsmb/clifsinfo.c                         |    1 +
 source3/libsmb/clikrb5.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/libsmb_dir.c                        |    1 +
 source3/libsmb/libsmb_server.c                     |    1 +
 source3/libsmb/namequery.c                         |    2 +-
 source3/libsmb/nmblib.c                            |    1 +
 source3/libsmb/nmblib.h                            |   49 +
 source3/libsmb/ntlmssp.c                           |    1 +
 source3/libsmb/passchange.c                        |    1 +
 source3/libsmb/samlogon_cache.c                    |    1 +
 source3/libsmb/smb_share_modes.c                   |    1 +
 source3/libsmb/smbsock_connect.c                   |    1 +
 source3/libsmb/trusts_util.c                       |    1 +
 source3/libsmb/unexpected.c                        |    1 +
 source3/locking/brlock.c                           |    4 +-
 source3/locking/locking.c                          |    4 +-
 source3/locking/posix.c                            |    2 +
 source3/locking/proto.h                            |  201 ++
 source3/modules/gpfs.c                             |    1 +
 source3/modules/nfs4_acls.c                        |    3 +
 source3/modules/onefs_acl.c                        |    1 +
 source3/modules/onefs_cbrl.c                       |    1 +
 source3/modules/onefs_config.c                     |    1 +
 source3/modules/onefs_dir.c                        |    1 +
 source3/modules/onefs_notify.c                     |    1 +
 source3/modules/onefs_open.c                       |    1 +
 source3/modules/onefs_shadow_copy.c                |    1 +
 source3/modules/onefs_streams.c                    |    1 +
 source3/modules/onefs_system.c                     |    1 +
 source3/modules/perfcount_onefs.c                  |    1 +
 source3/modules/perfcount_test.c                   |    1 +
 source3/modules/vfs_acl_common.c                   |    2 +
 source3/modules/vfs_acl_tdb.c                      |    3 +
 source3/modules/vfs_acl_xattr.c                    |    2 +
 source3/modules/vfs_afsacl.c                       |    1 +
 source3/modules/vfs_aio_fork.c                     |    2 +
 source3/modules/vfs_aixacl.c                       |    1 +
 source3/modules/vfs_aixacl2.c                      |    1 +
 source3/modules/vfs_aixacl_util.c                  |    1 +
 source3/modules/vfs_audit.c                        |    3 +
 source3/modules/vfs_cacheprime.c                   |    1 +
 source3/modules/vfs_cap.c                          |    1 +
 source3/modules/vfs_catia.c                        |    1 +
 source3/modules/vfs_commit.c                       |    1 +
 source3/modules/vfs_crossrename.c                  |    3 +
 source3/modules/vfs_default.c                      |    4 +
 source3/modules/vfs_default_quota.c                |    1 +
 source3/modules/vfs_dirsort.c                      |    2 +
 source3/modules/vfs_expand_msdfs.c                 |    3 +
 source3/modules/vfs_extd_audit.c                   |    3 +
 source3/modules/vfs_fake_perms.c                   |    3 +
 source3/modules/vfs_fileid.c                       |    2 +
 source3/modules/vfs_full_audit.c                   |    5 +
 source3/modules/vfs_gpfs.c                         |    1 +
 source3/modules/vfs_hpuxacl.c                      |    1 +
 source3/modules/vfs_irixacl.c                      |    1 +
 source3/modules/vfs_linux_xfs_sgid.c               |    2 +
 source3/modules/vfs_netatalk.c                     |    2 +
 source3/modules/vfs_notify_fam.c                   |    1 +
 source3/modules/vfs_onefs.c                        |    1 +
 source3/modules/vfs_onefs_shadow_copy.c            |    1 +
 source3/modules/vfs_posixacl.c                     |    2 +
 source3/modules/vfs_prealloc.c                     |    1 +
 source3/modules/vfs_preopen.c                      |    2 +
 source3/modules/vfs_readahead.c                    |    2 +
 source3/modules/vfs_readonly.c                     |    1 +
 source3/modules/vfs_recycle.c                      |    3 +
 source3/modules/vfs_scannedonly.c                  |    2 +
 source3/modules/vfs_shadow_copy.c                  |    2 +
 source3/modules/vfs_shadow_copy2.c                 |    3 +
 source3/modules/vfs_smb_traffic_analyzer.c         |    2 +
 source3/modules/vfs_solarisacl.c                   |    1 +
 source3/modules/vfs_streams_depot.c                |    2 +
 source3/modules/vfs_streams_xattr.c                |    2 +
 source3/modules/vfs_syncops.c                      |    2 +
 source3/modules/vfs_time_audit.c                   |    2 +
 source3/modules/vfs_tru64acl.c                     |    1 +
 source3/modules/vfs_tsmsm.c                        |    1 +
 source3/modules/vfs_xattr_tdb.c                    |    2 +
 source3/modules/vfs_zfsacl.c                       |    1 +
 source3/nmbd/nmbd.c                                |    3 +-
 source3/nmbd/nmbd.h                                |    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                       |    4 +
 source3/passdb/login_cache.c                       |    2 +
 source3/passdb/lookup_sid.c                        |    2 +
 source3/passdb/lookup_sid.h                        |   49 +
 source3/passdb/machine_account_secrets.c           |    1 +
 source3/passdb/machine_sid.c                       |    1 +
 source3/passdb/machine_sid.h                       |    7 +
 source3/passdb/passdb.c                            |    3 +
 source3/passdb/pdb_ads.c                           |    1 +
 source3/passdb/pdb_compat.c                        |    1 +
 source3/passdb/pdb_get_set.c                       |    1 +
 source3/passdb/pdb_interface.c                     |    3 +
 source3/passdb/pdb_ipa.c                           |    1 +
 source3/passdb/pdb_ldap.c                          |    3 +
 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                     |  114 -
 source3/passdb/util_wellknown.c                    |  173 --
 source3/printing/notify.c                          |    2 +-
 source3/printing/nt_printing.c                     |    6 +-
 source3/printing/nt_printing_ads.c                 |    2 +
 source3/printing/nt_printing_migrate.c             |    2 +
 source3/printing/nt_printing_tdb.c                 |    1 +
 source3/printing/print_standard.c                  |    1 +
 source3/printing/printer_list.c                    |    1 +
 source3/printing/printing.c                        |    6 +-
 source3/printing/printing_db.c                     |    1 +
 source3/printing/printspoolss.c                    |    1 +
 source3/printing/spoolssd.c                        |    4 +-
 source3/printing/tests/vlp.c                       |    2 +
 source3/profile/profile.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_backend_smbconf.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.c                      |    1 +
 source3/rpc_client/cli_pipe_schannel.c             |    1 +
 source3/rpc_client/cli_spoolss.c                   |    1 +
 source3/rpc_client/cli_winreg.c                    |    1 +
 source3/rpc_client/cli_winreg_int.h                |    2 +
 source3/rpc_client/init_lsa.c                      |    1 +
 source3/rpc_client/init_lsa.h                      |    5 +
 source3/rpc_server/dcesrv_gssapi.c                 |    1 +
 source3/rpc_server/dcesrv_ntlmssp.c                |    1 +
 source3/rpc_server/dfs/srv_dfs_nt.c                |    3 +
 source3/rpc_server/dssetup/srv_dssetup_nt.c        |    1 +
 source3/rpc_server/echo/srv_echo_nt.c              |    1 +
 source3/rpc_server/epmapper/srv_epmapper.c         |    2 +
 source3/rpc_server/epmd.c                          |    2 +-
 source3/rpc_server/eventlog/srv_eventlog_nt.c      |    4 +-
 source3/rpc_server/eventlog/srv_eventlog_reg.c     |    1 +
 .../rpc_server/initshutdown/srv_initshutdown_nt.c  |    1 +
 source3/rpc_server/lsa/srv_lsa_nt.c                |    5 +
 source3/rpc_server/netlogon/srv_netlog_nt.c        |    7 +-
 source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c          |    2 +
 source3/rpc_server/rpc_handles.c                   |    2 +
 source3/rpc_server/rpc_ncacn_np.c                  |    2 +
 source3/rpc_server/rpc_server.c                    |    2 +
 source3/rpc_server/samr/srv_samr_chgpasswd.c       |    5 +
 source3/rpc_server/samr/srv_samr_nt.c              |  118 +-
 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        |    6 +-
 source3/rpc_server/spoolss/srv_spoolss_util.c      |    1 +
 source3/rpc_server/spoolss/srv_spoolss_util.h      |    1 +
 source3/rpc_server/srv_access_check.c              |  146 ++
 source3/rpc_server/srv_access_check.h              |   10 +
 source3/rpc_server/srv_pipe.c                      |    4 +
 source3/rpc_server/srv_pipe_hnd.c                  |    1 +
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c          |    7 +-
 source3/rpc_server/svcctl/srv_svcctl_nt.c          |    2 +
 source3/rpc_server/svcctl/srv_svcctl_reg.c         |    2 +
 source3/rpc_server/winreg/srv_winreg_nt.c          |    3 +
 source3/rpc_server/wkssvc/srv_wkssvc_nt.c          |    3 +
 source3/rpc_server/wscript_build                   |    6 +-
 source3/rpcclient/cmd_spoolss.c                    |    2 +
 source3/rpcclient/rpcclient.c                      |    2 +
 source3/services/svc_winreg_glue.h                 |    2 +
 source3/smbd/aio.c                                 |    1 +
 source3/smbd/avahi_register.c                      |    1 +
 source3/smbd/blocking.c                            |    3 +-
 source3/smbd/close.c                               |    6 +-
 source3/smbd/conn.c                                |    1 +
 source3/smbd/connection.c                          |    2 +
 source3/smbd/dfree.c                               |    1 +
 source3/smbd/dir.c                                 |    2 +
 source3/smbd/dmapi.c                               |    1 +
 source3/smbd/dnsregister.c                         |    1 +
 source3/smbd/dosmode.c                             |    2 +
 source3/smbd/error.c                               |    1 +
 source3/smbd/fake_file.c                           |    2 +
 source3/smbd/file_access.c                         |    2 +
 source3/smbd/fileio.c                              |    1 +
 source3/smbd/filename.c                            |    2 +
 source3/smbd/filename_util.c                       |  206 --
 source3/smbd/files.c                               |    1 +
 source3/smbd/globals.c                             |    2 +
 source3/smbd/ipc.c                                 |    1 +
 source3/smbd/lanman.c                              |    3 +
 source3/smbd/mangle.c                              |    1 +
 source3/smbd/mangle_hash.c                         |    2 +
 source3/smbd/mangle_hash2.c                        |    1 +
 source3/smbd/message.c                             |    1 +
 source3/smbd/msdfs.c                               |    3 +
 source3/smbd/msg_idmap.c                           |    5 +-
 source3/smbd/negprot.c                             |    3 +
 source3/smbd/noquotas.c                            |    1 +
 source3/smbd/notify.c                              |    1 +
 source3/smbd/notify_inotify.c                      |    1 +
 source3/smbd/notify_internal.c                     |    4 +-
 source3/smbd/ntquotas.c                            |    4 +
 source3/smbd/nttrans.c                             |    5 +
 source3/smbd/open.c                                |    5 +-
 source3/smbd/oplock.c                              |    3 +-
 source3/smbd/oplock_irix.c                         |    1 +
 source3/smbd/oplock_linux.c                        |    2 +
 source3/smbd/oplock_onefs.c                        |    1 +
 source3/smbd/password.c                            |    3 +
 source3/smbd/perfcount.c                           |    1 +
 source3/smbd/pipes.c                               |    1 +
 source3/smbd/posix_acls.c                          |    5 +
 source3/smbd/process.c                             |    6 +-
 source3/smbd/proto.h                               | 1129 ++++++++++
 source3/smbd/quotas.c                              |    1 +
 source3/smbd/reply.c                               |    4 +
 source3/smbd/seal.c                                |    2 +
 source3/smbd/sec_ctx.c                             |    2 +
 source3/smbd/server.c                              |    6 +-
 source3/smbd/server_exit.c                         |    2 +-
 source3/smbd/server_reload.c                       |    4 +-
 source3/smbd/service.c                             |    4 +
 source3/smbd/session.c                             |    2 +
 source3/smbd/sesssetup.c                           |    4 +-
 source3/smbd/share_access.c                        |    3 +
 source3/smbd/signing.c                             |    1 +
 source3/smbd/smb2_break.c                          |    1 +
 source3/smbd/smb2_close.c                          |    1 +
 source3/smbd/smb2_create.c                         |    1 +
 source3/smbd/smb2_find.c                           |    2 +
 source3/smbd/smb2_flush.c                          |    1 +
 source3/smbd/smb2_getinfo.c                        |    2 +
 source3/smbd/smb2_glue.c                           |    1 +
 source3/smbd/smb2_ioctl.c                          |    1 +
 source3/smbd/smb2_keepalive.c                      |    1 +
 source3/smbd/smb2_lock.c                           |    3 +-
 source3/smbd/smb2_negprot.c                        |    1 +
 source3/smbd/smb2_notify.c                         |    1 +
 source3/smbd/smb2_read.c                           |    2 +
 source3/smbd/smb2_server.c                         |    1 +
 source3/smbd/smb2_sesssetup.c                      |    2 +
 source3/smbd/smb2_setinfo.c                        |    2 +
 source3/smbd/smb2_signing.c                        |    1 +
 source3/smbd/smb2_tcon.c                           |    2 +
 source3/smbd/smb2_write.c                          |    1 +
 source3/smbd/smbd.h                                |   27 +
 source3/smbd/srvstr.c                              |    1 +
 source3/smbd/statcache.c                           |    3 +-
 source3/smbd/statvfs.c                             |    2 +
 source3/smbd/trans2.c                              |    4 +
 source3/smbd/uid.c                                 |    5 +
 source3/smbd/utmp.c                                |    1 +
 source3/smbd/vfs.c                                 |    4 +
 source3/torture/cmd_vfs.c                          |    4 +
 source3/torture/denytest.c                         |    1 +
 source3/torture/locktest.c                         |    3 +
 source3/torture/locktest2.c                        |    2 +
 source3/torture/mangle_test.c                      |    1 +
 source3/torture/masktest.c                         |    3 +
 source3/torture/msgtest.c                          |    2 +-
 source3/torture/pdbtest.c                          |    1 +
 source3/torture/scanner.c                          |    1 +
 source3/torture/smbiconv.c                         |    1 +
 source3/torture/torture.c                          |    3 +
 source3/torture/utable.c                           |    1 +
 source3/torture/vfstest.c                          |    1 +
 source3/utils/dbwrap_tool.c                        |    2 +
 source3/utils/dbwrap_torture.c                     |    2 +
 source3/utils/eventlogadm.c                        |    1 +
 source3/utils/net.c                                |    2 +
 source3/utils/net.h                                |    1 +
 source3/utils/net_conf.c                           |    1 +
 source3/utils/net_g_lock.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                    |    3 +
 source3/utils/net_rpc_registry.c                   |    2 +
 source3/utils/net_rpc_samsync.c                    |    1 +
 source3/utils/net_sam.c                            |    4 +
 source3/utils/net_status.c                         |    1 +
 source3/utils/net_time.c                           |    1 +
 source3/utils/net_usershare.c                      |    2 +
 source3/utils/nmblookup.c                          |    1 +
 source3/utils/pdbedit.c                            |    1 +
 source3/utils/profiles.c                           |    1 +
 source3/utils/sharesec.c                           |    1 +
 source3/utils/smbcacls.c                           |    1 +
 source3/utils/smbcontrol.c                         |    4 +-
 source3/utils/smbfilter.c                          |    2 +
 source3/utils/smbpasswd.c                          |    3 +
 source3/utils/status.c                             |    3 +
 source3/utils/testparm.c                           |    1 +
 source3/web/cgi.c                                  |    4 +
 source3/web/diagnose.c                             |    1 +
 source3/web/neg_lang.c                             |    1 +
 source3/web/statuspage.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.c                        |    3 +-
 source3/winbindd/winbindd.h                        |   10 +-
 source3/winbindd/winbindd_ads.c                    |    7 +-
 source3/winbindd/winbindd_cache.c                  |   10 +-
 source3/winbindd/winbindd_cm.c                     |    4 +-
 source3/winbindd/winbindd_dual.c                   |    3 +-
 source3/winbindd/winbindd_dual_ndr.c               |    1 +
 source3/winbindd/winbindd_dual_srv.c               |    3 +-
 source3/winbindd/winbindd_msrpc.c                  |    8 +-
 source3/winbindd/winbindd_pam.c                    |    3 +
 source3/winbindd/winbindd_reconnect.c              |    4 +-
 source3/winbindd/winbindd_rpc.c                    |   12 +-
 source3/winbindd/winbindd_rpc.h                    |    4 +-
 source3/winbindd/winbindd_samr.c                   |   12 +-
 source3/winbindd/winbindd_util.c                   |    1 +
 source3/winbindd/winbindd_wins.c                   |    1 +
 source3/wscript_build                              |   11 +-
 456 files changed, 4137 insertions(+), 3279 deletions(-)
 create mode 100644 lib/util/util_pw.h
 create mode 100644 libcli/registry/util_reg.h
 create mode 100644 source3/auth/proto.h
 create mode 100644 source3/groupdb/proto.h
 create mode 100644 source3/intl/lang_tdb.h
 create mode 100644 source3/lib/filename_util.c
 create mode 100644 source3/lib/privileges.h
 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/libsmb/nmblib.h
 create mode 100644 source3/locking/proto.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
 create mode 100644 source3/rpc_server/srv_access_check.c
 create mode 100644 source3/rpc_server/srv_access_check.h
 delete mode 100644 source3/smbd/filename_util.c
 create mode 100644 source3/smbd/proto.h
 create mode 100644 source3/smbd/smbd.h


Changeset truncated at 500 lines:

diff --git a/lib/util/debug_s3.c b/lib/util/debug_s3.c
index b81daea..cfb6755 100644
--- a/lib/util/debug_s3.c
+++ b/lib/util/debug_s3.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 /* This is the Samba3-specific implementation of reopen_logs(), which
  * calls out to the s3 loadparm code, and means that we don't depend
diff --git a/lib/util/util_pw.c b/lib/util/util_pw.c
index 11e46ec..c6e4680 100644
--- a/lib/util/util_pw.c
+++ b/lib/util/util_pw.c
@@ -3,7 +3,12 @@
 
    Safe versions of getpw* calls
 
+   Copyright (C) Andrew Tridgell 1992-1998
+   Copyright (C) Jeremy Allison  1998-2005
    Copyright (C) Andrew Bartlett 2002
+   Copyright (C) Timur Bakeyev        2005
+   Copyright (C) Bjoern Jacke    2006-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
@@ -20,9 +25,54 @@
 */
 
 #include "includes.h"
+#include "system/passwd.h"
+#include "lib/util/util_pw.h"
+
+/**************************************************************************
+ Wrappers for setpwent(), getpwent() and endpwent()
+****************************************************************************/
 
-static struct passwd *alloc_copy_passwd(TALLOC_CTX *mem_ctx, 
-					const struct passwd *from) 
+void sys_setpwent(void)
+{
+	setpwent();
+}
+
+struct passwd *sys_getpwent(void)
+{
+	return getpwent();
+}
+
+void sys_endpwent(void)
+{
+	endpwent();
+}
+
+/**************************************************************************
+ Wrappers for getpwnam(), getpwuid(), getgrnam(), getgrgid()
+****************************************************************************/
+
+struct passwd *sys_getpwnam(const char *name)
+{
+	return getpwnam(name);
+}
+
+struct passwd *sys_getpwuid(uid_t uid)
+{
+	return getpwuid(uid);
+}
+
+struct group *sys_getgrnam(const char *name)
+{
+	return getgrnam(name);
+}
+
+struct group *sys_getgrgid(gid_t gid)
+{
+	return getgrgid(gid);
+}
+
+struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx,
+			    const struct passwd *from)
 {
 	struct passwd *ret = talloc_zero(mem_ctx, struct passwd);
 
@@ -40,7 +90,7 @@ static struct passwd *alloc_copy_passwd(TALLOC_CTX *mem_ctx,
 	return ret;
 }
 
-struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name) 
+struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name)
 {
 	struct passwd *temp;
 
@@ -55,10 +105,14 @@ struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name)
 		return NULL;
 	}
 
-	return alloc_copy_passwd(mem_ctx, temp);
+	return tcopy_passwd(mem_ctx, temp);
 }
 
-struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid) 
+/****************************************************************************
+ talloc'ed version of getpwuid.
+****************************************************************************/
+
+struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid)
 {
 	struct passwd *temp;
 
@@ -73,5 +127,5 @@ struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid)
 		return NULL;
 	}
 
-	return alloc_copy_passwd(mem_ctx, temp);
+	return tcopy_passwd(mem_ctx, temp);
 }
diff --git a/lib/util/util_pw.h b/lib/util/util_pw.h
new file mode 100644
index 0000000..2967963
--- /dev/null
+++ b/lib/util/util_pw.h
@@ -0,0 +1,39 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Safe versions of getpw* calls
+
+   Copyright (C) Andrew Tridgell 1992-1998
+   Copyright (C) Jeremy Allison 1997-2001.
+   Copyright (C) Andrew Bartlett 2002
+
+   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 __LIB_UTIL_UTIL_PW_H__
+#define __LIB_UTIL_UTIL_PW_H__
+
+void sys_setpwent(void);
+struct passwd *sys_getpwent(void);
+void sys_endpwent(void);
+struct passwd *sys_getpwnam(const char *name);
+struct passwd *sys_getpwuid(uid_t uid);
+struct group *sys_getgrnam(const char *name);
+struct group *sys_getgrgid(gid_t gid);
+struct passwd *tcopy_passwd(TALLOC_CTX *mem_ctx,
+			    const struct passwd *from);
+struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char *name);
+struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid);
+
+#endif /* __LIB_UTIL_UTIL_PW_H__ */
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 7f5b1d2..6aaf04c 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -86,3 +86,8 @@ bld.SAMBA_SUBSYSTEM('UTIL_RUNCMD',
 	public_deps='tevent'
 	)
 
+bld.SAMBA_SUBSYSTEM('UTIL_PW',
+	source='util_pw.c',
+	local_include=False,
+	public_deps='talloc'
+	)
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_ldap.c b/libgpo/gpo_ldap.c
index e6b9609..6abaf29 100644
--- a/libgpo/gpo_ldap.c
+++ b/libgpo/gpo_ldap.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "libgpo/gpo.h"
+#include "auth.h"
 #if _SAMBA_BUILD_ == 4
 #include "libgpo/gpo_s4.h"
 #include "source4/libgpo/ads_convenience.h"
diff --git a/libgpo/gpo_sec.c b/libgpo/gpo_sec.c
index e0304d4..4e1612d 100644
--- a/libgpo/gpo_sec.c
+++ b/libgpo/gpo_sec.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "libcli/security/security.h"
 #include "../libgpo/gpo.h"
+#include "auth.h"
 #if _SAMBA_BUILD_ == 4
 #include "libgpo/ads_convenience.h"
 #include "librpc/gen_ndr/security.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/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index 64a4ec5..c4374ba 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -294,6 +294,7 @@ sub Parse($$$)
 	pidl " */";
 	pidl "";
 	pidl "#include \"includes.h\"";
+	pidl "#include \"ntdomain.h\"";
 	pidl "#include \"$header\"";
 	pidl_hdr "#include \"$ndr_header\"";
 	pidl "";
diff --git a/source3/Makefile.in b/source3/Makefile.in
index b2f4594..15279ee 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -424,7 +424,7 @@ UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \
 		   ../lib/util/tevent_werror.o \
 		   ../lib/util/smb_threads.o ../lib/util/util_id.o \
 		   ../lib/util/blocking.o ../lib/util/rfc1738.o \
-		   ../lib/util/select.o
+		   ../lib/util/select.o ../lib/util/util_pw.o
 
 CRYPTO_OBJ = ../lib/crypto/crc32.o ../lib/crypto/md5.o \
 			 ../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \
@@ -714,7 +714,7 @@ NPA_TSTREAM_OBJ = ../libcli/named_pipe_auth/npa_tstream.o \
 		  ../auth/auth_sam_reply.o librpc/gen_ndr/ndr_auth.o
 
 RPC_NCACN_NP = rpc_server/srv_pipe_register.o rpc_server/rpc_ncacn_np.o \
-	       rpc_server/rpc_handles.o
+	       rpc_server/rpc_handles.o rpc_server/srv_access_check.o
 
 RPC_SERVICE = rpc_server/rpc_server.o
 
@@ -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.c b/source3/auth/auth.c
index 790bfac..dbe337f 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "auth.h"
 #include "smbd/globals.h"
 
 #undef DBGC_CLASS
diff --git a/source3/auth/auth_builtin.c b/source3/auth/auth_builtin.c
index bf6d701..afe71ee 100644
--- a/source3/auth/auth_builtin.c
+++ b/source3/auth/auth_builtin.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/auth_compat.c b/source3/auth/auth_compat.c
index ffad36e..0ae712a 100644
--- a/source3/auth/auth_compat.c
+++ b/source3/auth/auth_compat.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "auth.h"
 
 extern struct auth_context *negprot_global_auth_context;
 extern bool global_encrypted_passwords_negotiated;
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 65b0f20..5824d91 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -19,11 +19,13 @@
 */
 
 #include "includes.h"
+#include "auth.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #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_netlogond.c b/source3/auth/auth_netlogond.c
index 5c76542..8e332c8 100644
--- a/source3/auth/auth_netlogond.c
+++ b/source3/auth/auth_netlogond.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "auth.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_schannel.h"
diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index ad45d81..ae29c30 100644
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -21,9 +21,11 @@
 */
 
 #include "includes.h"
+#include "auth.h"
 #include "../libcli/auth/ntlmssp.h"
 #include "ntlmssp_wrap.h"
 #include "../librpc/gen_ndr/netlogon.h"
+#include "smbd/smbd.h"
 
 NTSTATUS auth_ntlmssp_steal_session_info(TALLOC_CTX *mem_ctx,
 					struct auth_ntlmssp_state *auth_ntlmssp_state,
diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index ffbe5b4..8d2300d 100644
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "auth.h"
 #include "../libcli/auth/libcli_auth.h"
 
 #undef DBGC_CLASS
diff --git a/source3/auth/auth_script.c b/source3/auth/auth_script.c
index ee01733..ad97310 100644
--- a/source3/auth/auth_script.c
+++ b/source3/auth/auth_script.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "auth.h"
 
 #undef malloc
 
diff --git a/source3/auth/auth_server.c b/source3/auth/auth_server.c
index 5fee1e4..5dc8ea7 100644
--- a/source3/auth/auth_server.c
+++ b/source3/auth/auth_server.c
@@ -19,6 +19,9 @@
 */
 
 #include "includes.h"
+#include "auth.h"
+#include "system/passwd.h"
+#include "smbd/smbd.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..8f9eacf 100644
--- a/source3/auth/auth_unix.c
+++ b/source3/auth/auth_unix.c
@@ -18,6 +18,8 @@
 */
 
 #include "includes.h"
+#include "auth.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 c75b12e..c84e3d3 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -22,11 +22,15 @@
 */
 
 #include "includes.h"
+#include "auth.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../lib/crypto/arcfour.h"
 #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..6150040 100644
--- a/source3/auth/auth_wbc.c
+++ b/source3/auth/auth_wbc.c
@@ -38,6 +38,8 @@
  */
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list