[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0rc1-119-g7a5a3d3

Karolin Seeger kseeger at samba.org
Fri Dec 12 11:41:18 GMT 2008


The branch, v3-3-stable has been updated
       via  7a5a3d3944ad7d9fa16f37cde2de43d2eceffd0f (commit)
       via  e7c630056a8f4cbe5e3c4c3dbc4c804ae11ac5fa (commit)
       via  487d5d95463d27c3bef0fbe35de036870b29b81d (commit)
       via  d9f031511031e2c5bdbc8692a4ddc2a4d44c5964 (commit)
       via  36e283bcadba1759c74cac644f453e1227934475 (commit)
       via  1773183898c0a08c8b5348212b309bfbeb139831 (commit)
       via  4c7c45ea38db248f376215df8c0df811873a2b4c (commit)
       via  29d93a3c3c28a6a11d6c60c765ec698a4fc2ebc6 (commit)
       via  5de8ef3cce6ff9673d9f2deace1a04f5ab3d47bd (commit)
       via  e025cdefd60030b91cec7eec5cbb0cc32173f777 (commit)
       via  1a922482002560865784418dd108721c03b89b4e (commit)
       via  b1483541577ac867fdefff2a795f34333fd878f6 (commit)
       via  61e050ff2e0cd97eab54abc275ccc9311145d4d6 (commit)
       via  daae07437627be1d739909ceeefec6354ec92563 (commit)
       via  d2d9b198237e9607483e21ab9372a9c12d0da526 (commit)
       via  8a1a9475bde7d845ca47b000500344e635fd823c (commit)
       via  10ad73091bdf043335a4be3f614ac4dbb14b172f (commit)
       via  91d18c1d0f2034b80ee3fd830868fd9f4e1b5dc9 (commit)
       via  86ea6a10c09db7a06abdd072a0b9ac46f70d659e (commit)
       via  0ef8ecf2117ab3f6b6c67a7c07bd36cced7d92be (commit)
       via  214f9e81314d19efdeb2f716e9abcc3a2d25d4e5 (commit)
       via  91bf681dc4b35b2609079cd6ea37f47be94c5e31 (commit)
       via  6dc13c51d2f0910161607d287d943b0adfe31f3c (commit)
       via  3be74289b712fdbad69b985f4d686a7b469a7fce (commit)
       via  333d0f7f556e06139fae62e79d7016df86a1aa95 (commit)
       via  9f6b80ea5c90cfcb6167e946f4c9c0c31d1b16ad (commit)
       via  57b60c78a209a4e4769c2128b25da331b5843fc1 (commit)
       via  be88e942c14950d1ee3400c0deff6d6b0011a848 (commit)
       via  88b664382e45cc990f3f3519ea0d275f293f2190 (commit)
       via  d5dda549bf088b8805adc283cfaa9bd0590c4c18 (commit)
       via  ff890b8e83189ec4b43b54c877226826cf1124de (commit)
       via  68a4c6573cab0fa319115fe4681ba33bdb406d11 (commit)
       via  ce6a2c4a68f3ced39b73b99bcc8c369164b8f4e9 (commit)
       via  18d1d796fc6025797624647ccc3b4eec59134430 (commit)
       via  d7ecc6f2072fe51e556c6ff43b7cf5c879b22ca6 (commit)
       via  da30272dfc7148957919989671aee7a87a267f77 (commit)
       via  d4ed7524babc681f1ff6c28ce31b0a960bc13a1c (commit)
       via  7dc38a9a3b4d4a65a94a278a34afb18170d57a98 (commit)
       via  c3ad2510b9d34cabe43de2c5f46ab03f648843a4 (commit)
       via  c353405e7ff07f1a2592d735736a08344226bb2b (commit)
      from  7584fe4e8bcbaf73f509d6981a70ff9dde92db1c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable


- Log -----------------------------------------------------------------
commit 7a5a3d3944ad7d9fa16f37cde2de43d2eceffd0f
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 24 01:57:28 2008 +0200

    netapi: fix access bits in netapi.
    
    Guenther
    (cherry picked from commit a42b38b34d4e97d2c196e67aef3b01d4f043b646)

commit e7c630056a8f4cbe5e3c4c3dbc4c804ae11ac5fa
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 23 22:26:21 2008 +0200

    s3-samr-server: remove unused historic code.
    
    Guenther
    (cherry picked from commit 273edcb97c19e6318002aa9af950da22018a64dd)

commit 487d5d95463d27c3bef0fbe35de036870b29b81d
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 27 18:23:50 2008 +0100

    s3-netlogon: kill an fstring in rpc_server.
    
    Guenther
    (cherry picked from commit b39c3b6445a80cb04e131947408da6af689c5ac7)

commit d9f031511031e2c5bdbc8692a4ddc2a4d44c5964
Author: Volker Lendecke <vl at sernet.de>
Date:   Tue Sep 2 09:44:39 2008 +0200

    Remove unused CLI_DO_RPC macros (This used to be commit f5212c64d23a28fa40a14b45a8d1c0181f01a6da)
    (cherry picked from commit a9b2522b6c400c5594073ff4b2a40983b5c492e7)

commit 36e283bcadba1759c74cac644f453e1227934475
Author: Günther Deschner <gd at samba.org>
Date:   Sat Nov 29 01:51:38 2008 +0100

    s3-passdb: remove unused (now samr.idl) ACCT_NT/LM_PWD_SET flags.
    
    Guenther
    (cherry picked from commit 210e4cb42833fc6e4f934bd5f4406f37ee0a347d)

commit 1773183898c0a08c8b5348212b309bfbeb139831
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 11 23:14:38 2008 +0100

    make installmo.sh executeable.
    
    Guenther
    (cherry picked from commit c1b0bfeefa57cdb0e2234474027003257a521ab8)

commit 4c7c45ea38db248f376215df8c0df811873a2b4c
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 23 19:37:36 2008 +0100

    Fix an uninitialized variable warning
    
    Andreas Schneider, please check!
    (cherry picked from commit 3673581e02baa1c65d8d08df041f2ebf9ee1780c)

commit 29d93a3c3c28a6a11d6c60c765ec698a4fc2ebc6
Author: Günther Deschner <gd at samba.org>
Date:   Sat Nov 29 00:29:47 2008 +0100

    samr: fix samr_UserInfo21 (order of lm_password_set and nt_password_set).
    
    Guenther
    (cherry picked from commit 9e8aa924f34c1db89151e83f3b561c043da0c994)

commit 5de8ef3cce6ff9673d9f2deace1a04f5ab3d47bd
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 5 15:10:52 2008 +0100

    s3-build: re-run make samba3-idl.
    
    Guenther
    (cherry picked from commit c38e067dffea512ff67384e6e2850ab682c27f46)

commit e025cdefd60030b91cec7eec5cbb0cc32173f777
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 5 02:02:50 2008 +0100

    s3-samr-idl: fix samr_ValidatePassword.
    
    Guenther
    (cherry picked from commit 7b2b810d30bf58df83ec3f2ec7505c43187d62f9)

commit 1a922482002560865784418dd108721c03b89b4e
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 5 02:03:16 2008 +0100

    s3-samr-idl: fix samr_QueryUserInfo2.
    
    Guenther
    (cherry picked from commit a8484c418afb5bb611e3b126e09e90d375f40b22)

commit b1483541577ac867fdefff2a795f34333fd878f6
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 11 22:55:27 2008 +0100

    messaging: move types to IDL.
    
    Guenther
    (This used to be commit 6c346d0eb20af5ba9b09f30319420f7c91480da6)
    (cherry picked from commit f97468bfecd3d227c7e942cb56f32c6aecf0887b)

commit 61e050ff2e0cd97eab54abc275ccc9311145d4d6
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 11 11:25:45 2008 +0100

    s3-libnet: fix DEBUG statement in libnet_keytab.
    
    Guenther
    (cherry picked from commit 2dfeb2d5970f52e4948e22a2a4e4f47479a550dc)

commit daae07437627be1d739909ceeefec6354ec92563
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 9 14:48:10 2008 +0100

    s3-libnet: fix build warning (missing prototype).
    
    Guenther
    (cherry picked from commit 60222a78c00ad9d1d09789024184c430bff0f68b)

commit d2d9b198237e9607483e21ab9372a9c12d0da526
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 4 14:34:23 2008 +0100

    s3-libnet_samsync: print new line in display output.
    
    Guenther
    (cherry picked from commit 650077c22b2e67815c9a2fd8a1cc56986c0aaced)

commit 8a1a9475bde7d845ca47b000500344e635fd823c
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 11 22:20:08 2008 +0100

    s3-samr: avoid code duplication for identical code in _samr_Connect2, 4 and 5.
    
    Guenther
    (cherry picked from commit 704b0d35707483a8fbf89da55a2d161375e56b3a)

commit 10ad73091bdf043335a4be3f614ac4dbb14b172f
Author: Dan Sledz <dsledz at isilon.com>
Date:   Mon Dec 8 14:52:14 2008 -0800

    Use strtoul since id types are unsigned
    (cherry picked from commit 7eea7edfd02778599771edd3356888c848578766)

commit 91d18c1d0f2034b80ee3fd830868fd9f4e1b5dc9
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 11 19:13:43 2008 +0100

    s3-samr: fix rpcclient after idl change.
    
    Guenther
    (cherry picked from commit 7a3091a48b844bbad93c61a0570fd23bd87f76e1)

commit 86ea6a10c09db7a06abdd072a0b9ac46f70d659e
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 11 19:04:24 2008 +0100

    s3-samr: modify logging in _samr_Connect2 so that it can be called from other calls as well.
    
    Guenther
    (cherry picked from commit 332456f09bfea29e5a6558b5bd3b8c585892a3f5)

commit 0ef8ecf2117ab3f6b6c67a7c07bd36cced7d92be
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 9 12:39:47 2008 +0100

    s3-samr: a level 18 password set needs to set the pwdlastset as well.
    
    Guenther
    (cherry picked from commit 4260aadc2e00b6856d5cc2365ab751f3458472d5)

commit 214f9e81314d19efdeb2f716e9abcc3a2d25d4e5
Author: Günther Deschner <gd at samba.org>
Date:   Fri Dec 5 16:13:28 2008 +0100

    s3-samr: fix samr_SetUserInfo level 18 server-side.
    
    Guenther
    (cherry picked from commit e22e9c09d1cb9102180b2a5401d21f391894f1ac)

commit 91bf681dc4b35b2609079cd6ea37f47be94c5e31
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 4 18:15:03 2008 +0100

    s3-samr: fix SAMR_FIELD_PASSWORD callers.
    
    Guenther
    (cherry picked from commit 2edf2cef9cb43a65ce8ee8e8a782d248856030dd)

commit 6dc13c51d2f0910161607d287d943b0adfe31f3c
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 4 18:12:45 2008 +0100

    samr: make more explicit what SAMR_FIELD_PASSWORD{2} means.
    
    Guenther
    (cherry picked from commit c94cd674409f01d71bd9174829b1f05b95c50703)

commit 3be74289b712fdbad69b985f4d686a7b469a7fce
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 4 13:09:38 2008 +0100

    samr: fill in two unknowns in samr_UserInfo21.
    
    Guenther
    (cherry picked from commit e00a25dbba3daf06c744f998967c27c8a539e558)

commit 333d0f7f556e06139fae62e79d7016df86a1aa95
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 2 23:25:16 2008 +0100

    samr: fill in two unknowns in samr_DomInfo13.
    
    Guenther
    (cherry picked from commit b5e5124439b0215c2a82bf816f364661b4ba7785)

commit 9f6b80ea5c90cfcb6167e946f4c9c0c31d1b16ad
Author: Günther Deschner <gd at samba.org>
Date:   Sat Nov 29 00:36:23 2008 +0100

    s3-samr: fix init_samr_user_info2{1,3,5} callers.
    
    Guenther
    (cherry picked from commit ec3f80f86daa392a42c75edaee0865b6127347b1)

commit 57b60c78a209a4e4769c2128b25da331b5843fc1
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 4 18:21:10 2008 +0100

    s3-samr: fix samr callers of samr_UserInfo18.
    
    Guenther
    (cherry picked from commit 1cbbda7adcd6a5558fa259261c527aff6fc82477)

commit be88e942c14950d1ee3400c0deff6d6b0011a848
Author: Günther Deschner <gd at samba.org>
Date:   Sat Nov 29 00:30:21 2008 +0100

    s3-build: re-run make samba3-idl.
    
    Guenther
    (cherry picked from commit aed5272422f7842ac7aad6be5eadf813bdaf90d6)

commit 88b664382e45cc990f3f3519ea0d275f293f2190
Author: Günther Deschner <gd at samba.org>
Date:   Fri Dec 5 12:40:19 2008 +0100

    samr: fix samr_UserInfo18, lm/nt pwd mixup.
    
    Guenther
    (cherry picked from commit 299190ee53bc024abb832dfd6a832c4a756b99ee)

commit d5dda549bf088b8805adc283cfaa9bd0590c4c18
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 4 18:19:29 2008 +0100

    samr: fix samr_UserInfo18. It also contains password_expired, thanks metze.
    
    Guenther
    (cherry picked from commit 6f466b2aeca8b3052dd8cf59ec1560bb23fe9c93)

commit ff890b8e83189ec4b43b54c877226826cf1124de
Author: Günther Deschner <gd at samba.org>
Date:   Sat Nov 29 00:23:16 2008 +0100

    s3-samr: refuse do process UserSetInfo with 0 fields_present.
    
    Guenther
    (cherry picked from commit bfcff837ebde5b4d726bfccd62d72e5d062adbc0)

commit 68a4c6573cab0fa319115fe4681ba33bdb406d11
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 2 02:08:05 2008 +0100

    s3-samr: simplify _samr_QueryUserInfo a lot and fix some few potential memleaks.
    
    Guenther
    (cherry picked from commit d5b7884b8e0ab5a92b9c69c4d1a812689f8d183e)

commit ce6a2c4a68f3ced39b73b99bcc8c369164b8f4e9
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 2 00:58:53 2008 +0100

    s3-samr: fix samr_SetUserInfo{2} level 23.
    
    Do not just start decoding/setting passwords when fields_present
    do not indicate there is a password to be set.
    
    Guenther
    (cherry picked from commit 90786ee2012e038b3ea5f5600903e7c208c6083b)

commit 18d1d796fc6025797624647ccc3b4eec59134430
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 2 00:08:56 2008 +0100

    s3-samr: _samr_EnumDomainUsers always returns a sam array (even w/o users).
    
    Guenther
    (cherry picked from commit fb575f6ce7915a41079afc8762fbf83e256c6631)

commit d7ecc6f2072fe51e556c6ff43b7cf5c879b22ca6
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 27 01:22:39 2008 +0100

    s3-samr: fix return code for invalid name in _samr_LookupDomain.
    
    Guenther
    (cherry picked from commit d444a0d29c35715f5e1cf48d26f3d4064d93ff68)

commit da30272dfc7148957919989671aee7a87a267f77
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 27 01:21:49 2008 +0100

    s3-samr: avoid enumeration and user creation on builtin domain handle.
    
    Guenther
    (cherry picked from commit 85a2c0607e25b8a3ca91c50f71f4d649d29bd0e3)

commit d4ed7524babc681f1ff6c28ce31b0a960bc13a1c
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 25 15:51:35 2008 +0100

    s3-samr: support samr_CreateUser as well.
    
    Guenther
    (cherry picked from commit 584249dfffe5ed9efd67bfc598413d5d19eb80cf)

commit 7dc38a9a3b4d4a65a94a278a34afb18170d57a98
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 25 15:50:28 2008 +0100

    s3-samr: support samr_QueryUserInfo2 as well.
    
    Guenther
    (cherry picked from commit 9b0f3359fc7cb27c5e4726b87ae4035e1908736a)

commit c3ad2510b9d34cabe43de2c5f46ab03f648843a4
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 25 12:21:37 2008 +0100

    s3-samr: add support for _samr_QueryUserInfo level 5.
    
    Guenther
    (cherry picked from commit e273479c7bdb57bbfaaae997a32fb3f2d8f7f896)

commit c353405e7ff07f1a2592d735736a08344226bb2b
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 25 12:18:39 2008 +0100

    s3-samr: add init_samr_user_info5.
    
    Guenther
    (cherry picked from commit 11a4ccc2b0f54324bbed2360fa48055fa43fee6d)

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

Summary of changes:
 source/include/includes.h              |    1 +
 source/include/messages.h              |   85 -----
 source/include/passdb.h                |   10 -
 source/include/proto.h                 |   22 ++-
 source/include/rpc_client.h            |   48 ---
 source/lib/netapi/user.c               |    4 +-
 source/libnet/libnet_keytab.c          |    2 +-
 source/libnet/libnet_samsync.c         |    4 +-
 source/libnet/libnet_samsync_display.c |    6 +-
 source/librpc/gen_ndr/cli_samr.c       |    6 +-
 source/librpc/gen_ndr/cli_samr.h       |    6 +-
 source/librpc/gen_ndr/messaging.h      |  116 ++++++-
 source/librpc/gen_ndr/ndr_messaging.c  |   81 ++++-
 source/librpc/gen_ndr/ndr_messaging.h  |    3 +
 source/librpc/gen_ndr/ndr_samr.c       |  145 +++++---
 source/librpc/gen_ndr/samr.h           |   24 +-
 source/librpc/gen_ndr/srv_samr.c       |    4 +-
 source/librpc/idl/messaging.idl        |   84 +++++-
 source/librpc/idl/samr.idl             |   24 +-
 source/nsswitch/pam_winbind.c          |    2 +-
 source/nsswitch/wbinfo.c               |    4 +-
 source/rpc_client/init_samr.c          |   63 +++-
 source/rpc_server/srv_netlog_nt.c      |    9 +-
 source/rpc_server/srv_samr_nt.c        |  620 +++++++++++++++-----------------
 source/rpcclient/cmd_samr.c            |    5 +-
 source/utils/net_rpc.c                 |    2 +-
 26 files changed, 790 insertions(+), 590 deletions(-)
 mode change 100644 => 100755 source/script/installmo.sh


Changeset truncated at 500 lines:

diff --git a/source/include/includes.h b/source/include/includes.h
index ea0af9f..b90f12a 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -703,6 +703,7 @@ typedef char fstring[FSTRING_LEN];
 #include "librpc/gen_ndr/notify.h"
 #include "librpc/gen_ndr/xattr.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
+#include "librpc/gen_ndr/messaging.h"
 #include "librpc/rpc/dcerpc.h"
 #include "nt_printing.h"
 #include "idmap.h"
diff --git a/source/include/messages.h b/source/include/messages.h
index b3ac5e4..db805a2 100644
--- a/source/include/messages.h
+++ b/source/include/messages.h
@@ -24,91 +24,6 @@
 /* change the message version with any incompatible changes in the protocol */
 #define MESSAGE_VERSION 2
 
-
-#define MSG_TYPE_MASK			0xFFFF
-
-/* general messages */
-#define MSG_DEBUG			0x0001
-#define MSG_PING			0x0002
-#define MSG_PONG			0x0003
-#define MSG_PROFILE			0x0004
-#define MSG_REQ_DEBUGLEVEL		0x0005
-#define MSG_DEBUGLEVEL			0x0006
-#define MSG_REQ_PROFILELEVEL		0x0007
-#define MSG_PROFILELEVEL		0x0008
-#define MSG_REQ_POOL_USAGE		0x0009
-#define MSG_POOL_USAGE			0x000A
-
-/* If dmalloc is included, set a steady-state mark */
-#define MSG_REQ_DMALLOC_MARK		0x000B
-
-/* If dmalloc is included, dump to the dmalloc log a description of
- * what has changed since the last MARK */
-#define MSG_REQ_DMALLOC_LOG_CHANGED	0x000C
-
-#define MSG_SHUTDOWN			0x000D
-
-/* nmbd messages */
-#define MSG_FORCE_ELECTION		0x0101
-#define MSG_WINS_NEW_ENTRY		0x0102
-#define MSG_SEND_PACKET			0x0103
-
-/* printing messages */
-/* #define MSG_PRINTER_NOTIFY  2001*/ /* Obsolete */
-#define MSG_PRINTER_NOTIFY2		0x0202
-
-#define MSG_PRINTER_DRVUPGRADE		0x0203
-#define MSG_PRINTERDATA_INIT_RESET	0x0204
-#define MSG_PRINTER_UPDATE		0x0205
-#define MSG_PRINTER_MOD			0x0206
-
-/* smbd messages */
-#define MSG_SMB_CONF_UPDATED		0x0301
-#define MSG_SMB_FORCE_TDIS		0x0302
-#define MSG_SMB_SAM_SYNC		0x0303
-#define MSG_SMB_SAM_REPL		0x0304
-#define MSG_SMB_UNLOCK			0x0305
-#define MSG_SMB_BREAK_REQUEST		0x0306
-#define MSG_SMB_BREAK_RESPONSE		0x0307
-#define MSG_SMB_ASYNC_LEVEL2_BREAK	0x0308
-#define MSG_SMB_OPEN_RETRY		0x0309
-#define MSG_SMB_KERNEL_BREAK		0x030A
-#define MSG_SMB_FILE_RENAME		0x030B
-#define MSG_SMB_INJECT_FAULT		0x030C
-#define MSG_SMB_BLOCKING_LOCK_CANCEL	0x030D
-#define MSG_SMB_NOTIFY			0x030E
-#define MSG_SMB_STAT_CACHE_DELETE	0x030F
-/*
- * Samba4 compatibility
- */
-#define MSG_PVFS_NOTIFY			0x0310
-/*
- * cluster reconfigure events
- */
-#define MSG_SMB_BRL_VALIDATE		0x0311
-#define MSG_SMB_RELEASE_IP		0x0312
-/*
- * Close a specific file given a share entry.
- */
-#define MSG_SMB_CLOSE_FILE		0x0313
-
-/* winbind messages */
-#define MSG_WINBIND_FINISHED		0x0401
-#define MSG_WINBIND_FORGET_STATE	0x0402
-#define MSG_WINBIND_ONLINE		0x0403
-#define MSG_WINBIND_OFFLINE		0x0404
-#define MSG_WINBIND_ONLINESTATUS	0x0405
-#define MSG_WINBIND_TRY_TO_GO_ONLINE	0x0406
-#define MSG_WINBIND_FAILED_TO_GO_ONLINE 0x0407
-#define MSG_WINBIND_VALIDATE_CACHE	0x0408
-#define MSG_WINBIND_DUMP_DOMAIN_LIST	0x0409
-
-/* event messages */
-#define MSG_DUMP_EVENT_LIST		0x0500
-
-/* dbwrap messages 4001-4999 */
-#define MSG_DBWRAP_TDB2_CHANGES		4001
-
 /*
  * Special flags passed to message_send. Allocated from the top, lets see when
  * it collides with the message types in the lower 16 bits :-)
diff --git a/source/include/passdb.h b/source/include/passdb.h
index 360a0d0..744b723 100644
--- a/source/include/passdb.h
+++ b/source/include/passdb.h
@@ -23,16 +23,6 @@
 #ifndef _PASSDB_H
 #define _PASSDB_H
 
-
-/*
- * in samba4 idl
- * ACCT_NT_PWD_SET == SAMR_FIELD_PASSWORD and
- * ACCT_LM_PWD_SET == SAMR_FIELD_PASSWORD2
- */
-
-#define ACCT_NT_PWD_SET		0x01000000
-#define ACCT_LM_PWD_SET		0x02000000
-
 /*
  * bit flags representing initialized fields in struct samu
  */
diff --git a/source/include/proto.h b/source/include/proto.h
index 41624c9..7cc1adc 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -7396,6 +7396,25 @@ void init_samr_alias_info1(struct samr_AliasInfoAll *r,
 			   const char *description);
 void init_samr_alias_info3(struct lsa_String *r,
 			   const char *description);
+void init_samr_user_info5(struct samr_UserInfo5 *r,
+			  const char *account_name,
+			  const char *full_name,
+			  uint32_t rid,
+			  uint32_t primary_gid,
+			  const char *home_directory,
+			  const char *home_drive,
+			  const char *logon_script,
+			  const char *profile_path,
+			  const char *description,
+			  const char *workstations,
+			  NTTIME last_logon,
+			  NTTIME last_logoff,
+			  struct samr_LogonHours logon_hours,
+			  uint16_t bad_password_count,
+			  uint16_t logon_count,
+			  NTTIME last_password_change,
+			  NTTIME acct_expiry,
+			  uint32_t acct_flags);
 void init_samr_user_info7(struct samr_UserInfo7 *r,
 			  const char *account_name);
 void init_samr_user_info9(struct samr_UserInfo9 *r,
@@ -7404,7 +7423,8 @@ void init_samr_user_info16(struct samr_UserInfo16 *r,
 			   uint32_t acct_flags);
 void init_samr_user_info18(struct samr_UserInfo18 *r,
 			   const uint8 lm_pwd[16],
-			   const uint8 nt_pwd[16]);
+			   const uint8 nt_pwd[16],
+			   uint8_t password_expired);
 void init_samr_user_info20(struct samr_UserInfo20 *r,
 			   struct lsa_BinaryString *parameters);
 void init_samr_user_info21(struct samr_UserInfo21 *r,
diff --git a/source/include/rpc_client.h b/source/include/rpc_client.h
index d1af6f9..684044b 100644
--- a/source/include/rpc_client.h
+++ b/source/include/rpc_client.h
@@ -42,54 +42,6 @@
 
 /* macro to expand cookie-cutter code in cli_xxx() using rpc_api_pipe_req() */
 
-#define CLI_DO_RPC_INTERNAL( pcli, ctx, interface, opnum, q_in, r_out, \
-                             q_ps, r_ps, q_io_fn, r_io_fn, default_error, copy_sess_key ) \
-{\
-	SMB_ASSERT(ndr_syntax_id_equal(&pcli->abstract_syntax, interface)); \
-	if (!prs_init( &q_ps, RPC_MAX_PDU_FRAG_LEN, ctx, MARSHALL )) { \
-		return NT_STATUS_NO_MEMORY;\
-	}\
-	prs_init_empty( &r_ps, ctx, UNMARSHALL );\
-	if ( copy_sess_key) prs_set_session_key(&q_ps, (const char *)pcli->dc->sess_key);\
-	if ( q_io_fn("", &q_in, &q_ps, 0) ) {\
-		NTSTATUS _smb_pipe_stat_ = rpc_api_pipe_req(pcli, opnum, &q_ps, &r_ps); \
-		if (!NT_STATUS_IS_OK(_smb_pipe_stat_)) {\
-			prs_mem_free( &q_ps );\
-			prs_mem_free( &r_ps );\
-			return _smb_pipe_stat_;\
-		}\
-		if ( copy_sess_key ) prs_set_session_key(&r_ps, (const char *)pcli->dc->sess_key);\
-		if (!r_io_fn("", &r_out, &r_ps, 0)) {\
-			prs_mem_free( &q_ps );\
-			prs_mem_free( &r_ps );\
-			return default_error;\
-		}\
-	} else {\
-		prs_mem_free( &q_ps );\
-		prs_mem_free( &r_ps );\
-		return default_error;\
-	}\
-	prs_mem_free( &q_ps );\
-	prs_mem_free( &r_ps );\
-}
-
-#define CLI_DO_RPC_COPY_SESS_KEY( pcli, ctx, p_idx, opnum, q_in, r_out, \
-				  q_ps, r_ps, q_io_fn, r_io_fn, default_error ) \
-{\
-	CLI_DO_RPC_INTERNAL( pcli, ctx, p_idx, opnum, q_in, r_out, \
-			     q_ps, r_ps, q_io_fn, r_io_fn, default_error, True ); \
-}
-
-#define CLI_DO_RPC( pcli, ctx, p_idx, opnum, q_in, r_out, \
-                    q_ps, r_ps, q_io_fn, r_io_fn, default_error ) \
-{\
-	CLI_DO_RPC_INTERNAL( pcli, ctx, p_idx, opnum, q_in, r_out, \
-			     q_ps, r_ps, q_io_fn, r_io_fn, default_error, False ); \
-}
-
-
-/* Arrrgg. Same but with WERRORS. Needed for registry code. */
-
 #define CLI_DO_RPC_WERR( pcli, ctx, interface, opnum, q_in, r_out, \
                              q_ps, r_ps, q_io_fn, r_io_fn, default_error ) \
 {\
diff --git a/source/lib/netapi/user.c b/source/lib/netapi/user.c
index 2abc25d..1f4b03f 100644
--- a/source/lib/netapi/user.c
+++ b/source/lib/netapi/user.c
@@ -46,7 +46,7 @@ static void convert_USER_INFO_X_to_samr_user_info21(struct USER_INFO_X *infoX,
 		fields_present |= SAMR_FIELD_ACCOUNT_NAME;
 	}
 	if (infoX->usriX_password) {
-		fields_present |= SAMR_FIELD_PASSWORD;
+		fields_present |= SAMR_FIELD_NT_PASSWORD_PRESENT;
 	}
 	if (infoX->usriX_flags) {
 		fields_present |= SAMR_FIELD_ACCT_FLAGS;
@@ -553,7 +553,7 @@ WERROR NetUserDel_r(struct libnetapi_ctx *ctx,
 
 	status = rpccli_samr_OpenUser(pipe_cli, ctx,
 				      &domain_handle,
-				      STD_RIGHT_DELETE_ACCESS,
+				      SEC_STD_DELETE,
 				      user_rids.ids[0],
 				      &user_handle);
 	if (!NT_STATUS_IS_OK(status)) {
diff --git a/source/libnet/libnet_keytab.c b/source/libnet/libnet_keytab.c
index 990f6f6..8195694 100644
--- a/source/libnet/libnet_keytab.c
+++ b/source/libnet/libnet_keytab.c
@@ -324,7 +324,7 @@ struct libnet_keytab_entry *libnet_keytab_search(struct libnet_keytab_context *c
 
 	ret = krb5_kt_start_seq_get(ctx->context, ctx->keytab, &cursor);
 	if (ret) {
-		DEBUG(10, ("krb5_kt_start_seq_get failed: %s",
+		DEBUG(10, ("krb5_kt_start_seq_get failed: %s\n",
 			  error_message(ret)));
 		return NULL;
 	}
diff --git a/source/libnet/libnet_samsync.c b/source/libnet/libnet_samsync.c
index 7b264c5..87b3f9c 100644
--- a/source/libnet/libnet_samsync.c
+++ b/source/libnet/libnet_samsync.c
@@ -282,8 +282,8 @@ static const char *samsync_debug_str(TALLOC_CTX *mem_ctx,
  * libnet_samsync
  */
 
-void libnet_init_netr_ChangeLogEntry(struct samsync_object *o,
-				     struct netr_ChangeLogEntry *e)
+static void libnet_init_netr_ChangeLogEntry(struct samsync_object *o,
+					    struct netr_ChangeLogEntry *e)
 {
 	ZERO_STRUCTP(e);
 
diff --git a/source/libnet/libnet_samsync_display.c b/source/libnet/libnet_samsync_display.c
index 19ec88a..c8d9ec6 100644
--- a/source/libnet/libnet_samsync_display.c
+++ b/source/libnet/libnet_samsync_display.c
@@ -126,7 +126,7 @@ static void display_group_info(uint32_t rid, struct netr_DELTA_GROUP *r)
 
 static void display_delete_group(uint32_t rid)
 {
-	d_printf("Delete Group '%d' ", rid);
+	d_printf("Delete Group '%d'\n", rid);
 }
 
 static void display_rename_group(uint32_t rid, struct netr_DELTA_RENAME *r)
@@ -138,7 +138,7 @@ static void display_rename_group(uint32_t rid, struct netr_DELTA_RENAME *r)
 
 static void display_delete_user(uint32_t rid)
 {
-	d_printf("Delete User '%d' ", rid);
+	d_printf("Delete User '%d'\n", rid);
 }
 
 static void display_rename_user(uint32_t rid, struct netr_DELTA_RENAME *r)
@@ -150,7 +150,7 @@ static void display_rename_user(uint32_t rid, struct netr_DELTA_RENAME *r)
 
 static void display_delete_alias(uint32_t rid)
 {
-	d_printf("Delete Alias '%d' ", rid);
+	d_printf("Delete Alias '%d'\n", rid);
 }
 
 static void display_rename_alias(uint32_t rid, struct netr_DELTA_RENAME *r)
diff --git a/source/librpc/gen_ndr/cli_samr.c b/source/librpc/gen_ndr/cli_samr.c
index dc0a2df..179bd00 100644
--- a/source/librpc/gen_ndr/cli_samr.c
+++ b/source/librpc/gen_ndr/cli_samr.c
@@ -2022,7 +2022,7 @@ NTSTATUS rpccli_samr_QueryUserInfo2(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
 				    struct policy_handle *user_handle /* [in] [ref] */,
 				    uint16_t level /* [in]  */,
-				    union samr_UserInfo *info /* [out] [ref,switch_is(level)] */)
+				    union samr_UserInfo **info /* [out] [ref,switch_is(level)] */)
 {
 	struct samr_QueryUserInfo2 r;
 	NTSTATUS status;
@@ -2921,8 +2921,8 @@ NTSTATUS rpccli_samr_SetDsrmPassword(struct rpc_pipe_client *cli,
 NTSTATUS rpccli_samr_ValidatePassword(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
 				      enum samr_ValidatePasswordLevel level /* [in]  */,
-				      union samr_ValidatePasswordReq req /* [in] [switch_is(level)] */,
-				      union samr_ValidatePasswordRep *rep /* [out] [ref,switch_is(level)] */)
+				      union samr_ValidatePasswordReq *req /* [in] [ref,switch_is(level)] */,
+				      union samr_ValidatePasswordRep **rep /* [out] [ref,switch_is(level)] */)
 {
 	struct samr_ValidatePassword r;
 	NTSTATUS status;
diff --git a/source/librpc/gen_ndr/cli_samr.h b/source/librpc/gen_ndr/cli_samr.h
index 4c7a30e..7216d0c 100644
--- a/source/librpc/gen_ndr/cli_samr.h
+++ b/source/librpc/gen_ndr/cli_samr.h
@@ -255,7 +255,7 @@ NTSTATUS rpccli_samr_QueryUserInfo2(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
 				    struct policy_handle *user_handle /* [in] [ref] */,
 				    uint16_t level /* [in]  */,
-				    union samr_UserInfo *info /* [out] [ref,switch_is(level)] */);
+				    union samr_UserInfo **info /* [out] [ref,switch_is(level)] */);
 NTSTATUS rpccli_samr_QueryDisplayInfo2(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
 				       struct policy_handle *domain_handle /* [in] [ref] */,
@@ -384,6 +384,6 @@ NTSTATUS rpccli_samr_SetDsrmPassword(struct rpc_pipe_client *cli,
 NTSTATUS rpccli_samr_ValidatePassword(struct rpc_pipe_client *cli,
 				      TALLOC_CTX *mem_ctx,
 				      enum samr_ValidatePasswordLevel level /* [in]  */,
-				      union samr_ValidatePasswordReq req /* [in] [switch_is(level)] */,
-				      union samr_ValidatePasswordRep *rep /* [out] [ref,switch_is(level)] */);
+				      union samr_ValidatePasswordReq *req /* [in] [ref,switch_is(level)] */,
+				      union samr_ValidatePasswordRep **rep /* [out] [ref,switch_is(level)] */);
 #endif /* __CLI_SAMR__ */
diff --git a/source/librpc/gen_ndr/messaging.h b/source/librpc/gen_ndr/messaging.h
index ca13b7c..3324160 100644
--- a/source/librpc/gen_ndr/messaging.h
+++ b/source/librpc/gen_ndr/messaging.h
@@ -5,9 +5,123 @@
 #ifndef _HEADER_messaging
 #define _HEADER_messaging
 
+#define MSG_TYPE_MASK	( 0xFFFF )
+enum messaging_type
+#ifndef USE_UINT_ENUMS
+ {
+	MSG_DEBUG=0x0001,
+	MSG_PING=0x0002,
+	MSG_PONG=0x0003,
+	MSG_PROFILE=0x0004,
+	MSG_REQ_DEBUGLEVEL=0x0005,
+	MSG_DEBUGLEVEL=0x0006,
+	MSG_REQ_PROFILELEVEL=0x0007,
+	MSG_PROFILELEVEL=0x0008,
+	MSG_REQ_POOL_USAGE=0x0009,
+	MSG_POOL_USAGE=0x000A,
+	MSG_REQ_DMALLOC_MARK=0x000B,
+	MSG_REQ_DMALLOC_LOG_CHANGED=0x000C,
+	MSG_SHUTDOWN=0x000D,
+	MSG_FORCE_ELECTION=0x0101,
+	MSG_WINS_NEW_ENTRY=0x0102,
+	MSG_SEND_PACKET=0x0103,
+	MSG_PRINTER_NOTIFY=0x2001,
+	MSG_PRINTER_NOTIFY2=0x0202,
+	MSG_PRINTER_DRVUPGRADE=0x0203,
+	MSG_PRINTERDATA_INIT_RESET=0x0204,
+	MSG_PRINTER_UPDATE=0x0205,
+	MSG_PRINTER_MOD=0x0206,
+	MSG_SMB_CONF_UPDATED=0x0301,
+	MSG_SMB_FORCE_TDIS=0x0302,
+	MSG_SMB_SAM_SYNC=0x0303,
+	MSG_SMB_SAM_REPL=0x0304,
+	MSG_SMB_UNLOCK=0x0305,
+	MSG_SMB_BREAK_REQUEST=0x0306,
+	MSG_SMB_BREAK_RESPONSE=0x0307,
+	MSG_SMB_ASYNC_LEVEL2_BREAK=0x0308,
+	MSG_SMB_OPEN_RETRY=0x0309,
+	MSG_SMB_KERNEL_BREAK=0x030A,
+	MSG_SMB_FILE_RENAME=0x030B,
+	MSG_SMB_INJECT_FAULT=0x030C,
+	MSG_SMB_BLOCKING_LOCK_CANCEL=0x030D,
+	MSG_SMB_NOTIFY=0x030E,
+	MSG_SMB_STAT_CACHE_DELETE=0x030F,
+	MSG_PVFS_NOTIFY=0x0310,
+	MSG_SMB_BRL_VALIDATE=0x0311,
+	MSG_SMB_RELEASE_IP=0x0312,
+	MSG_SMB_CLOSE_FILE=0x0313,
+	MSG_WINBIND_FINISHED=0x0401,
+	MSG_WINBIND_FORGET_STATE=0x0402,
+	MSG_WINBIND_ONLINE=0x0403,
+	MSG_WINBIND_OFFLINE=0x0404,
+	MSG_WINBIND_ONLINESTATUS=0x0405,
+	MSG_WINBIND_TRY_TO_GO_ONLINE=0x0406,
+	MSG_WINBIND_FAILED_TO_GO_ONLINE=0x0407,
+	MSG_WINBIND_VALIDATE_CACHE=0x0408,
+	MSG_WINBIND_DUMP_DOMAIN_LIST=0x0409,
+	MSG_DUMP_EVENT_LIST=0x0500,
+	MSG_DBWRAP_TDB2_CHANGES=4001
+}
+#else
+ { __donnot_use_enum_messaging_type=0x7FFFFFFF}
+#define MSG_DEBUG ( 0x0001 )
+#define MSG_PING ( 0x0002 )
+#define MSG_PONG ( 0x0003 )
+#define MSG_PROFILE ( 0x0004 )
+#define MSG_REQ_DEBUGLEVEL ( 0x0005 )
+#define MSG_DEBUGLEVEL ( 0x0006 )
+#define MSG_REQ_PROFILELEVEL ( 0x0007 )
+#define MSG_PROFILELEVEL ( 0x0008 )
+#define MSG_REQ_POOL_USAGE ( 0x0009 )
+#define MSG_POOL_USAGE ( 0x000A )
+#define MSG_REQ_DMALLOC_MARK ( 0x000B )
+#define MSG_REQ_DMALLOC_LOG_CHANGED ( 0x000C )
+#define MSG_SHUTDOWN ( 0x000D )
+#define MSG_FORCE_ELECTION ( 0x0101 )
+#define MSG_WINS_NEW_ENTRY ( 0x0102 )
+#define MSG_SEND_PACKET ( 0x0103 )
+#define MSG_PRINTER_NOTIFY ( 0x2001 )
+#define MSG_PRINTER_NOTIFY2 ( 0x0202 )
+#define MSG_PRINTER_DRVUPGRADE ( 0x0203 )
+#define MSG_PRINTERDATA_INIT_RESET ( 0x0204 )
+#define MSG_PRINTER_UPDATE ( 0x0205 )
+#define MSG_PRINTER_MOD ( 0x0206 )
+#define MSG_SMB_CONF_UPDATED ( 0x0301 )
+#define MSG_SMB_FORCE_TDIS ( 0x0302 )
+#define MSG_SMB_SAM_SYNC ( 0x0303 )
+#define MSG_SMB_SAM_REPL ( 0x0304 )
+#define MSG_SMB_UNLOCK ( 0x0305 )
+#define MSG_SMB_BREAK_REQUEST ( 0x0306 )
+#define MSG_SMB_BREAK_RESPONSE ( 0x0307 )
+#define MSG_SMB_ASYNC_LEVEL2_BREAK ( 0x0308 )
+#define MSG_SMB_OPEN_RETRY ( 0x0309 )
+#define MSG_SMB_KERNEL_BREAK ( 0x030A )
+#define MSG_SMB_FILE_RENAME ( 0x030B )
+#define MSG_SMB_INJECT_FAULT ( 0x030C )
+#define MSG_SMB_BLOCKING_LOCK_CANCEL ( 0x030D )
+#define MSG_SMB_NOTIFY ( 0x030E )
+#define MSG_SMB_STAT_CACHE_DELETE ( 0x030F )
+#define MSG_PVFS_NOTIFY ( 0x0310 )
+#define MSG_SMB_BRL_VALIDATE ( 0x0311 )
+#define MSG_SMB_RELEASE_IP ( 0x0312 )
+#define MSG_SMB_CLOSE_FILE ( 0x0313 )
+#define MSG_WINBIND_FINISHED ( 0x0401 )
+#define MSG_WINBIND_FORGET_STATE ( 0x0402 )
+#define MSG_WINBIND_ONLINE ( 0x0403 )
+#define MSG_WINBIND_OFFLINE ( 0x0404 )
+#define MSG_WINBIND_ONLINESTATUS ( 0x0405 )
+#define MSG_WINBIND_TRY_TO_GO_ONLINE ( 0x0406 )
+#define MSG_WINBIND_FAILED_TO_GO_ONLINE ( 0x0407 )
+#define MSG_WINBIND_VALIDATE_CACHE ( 0x0408 )
+#define MSG_WINBIND_DUMP_DOMAIN_LIST ( 0x0409 )
+#define MSG_DUMP_EVENT_LIST ( 0x0500 )
+#define MSG_DBWRAP_TDB2_CHANGES ( 4001 )
+#endif
+;
+
 struct messaging_rec {
 	uint32_t msg_version;
-	uint32_t msg_type;
+	enum messaging_type msg_type;
 	struct server_id dest;
 	struct server_id src;
 	DATA_BLOB buf;
diff --git a/source/librpc/gen_ndr/ndr_messaging.c b/source/librpc/gen_ndr/ndr_messaging.c
index 6251c18..e1e95ee 100644
--- a/source/librpc/gen_ndr/ndr_messaging.c
+++ b/source/librpc/gen_ndr/ndr_messaging.c
@@ -3,12 +3,87 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_messaging.h"
 
+_PUBLIC_ enum ndr_err_code ndr_push_messaging_type(struct ndr_push *ndr, int ndr_flags, enum messaging_type r)
+{
+	NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+	return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_messaging_type(struct ndr_pull *ndr, int ndr_flags, enum messaging_type *r)
+{


-- 
Samba Shared Repository


More information about the samba-cvs mailing list