The branch, v3-5-stable has been updated
via d82b72a... WHATSNEW: Update changes since 3.5.0rc3.
via 62bccb6... s3-net: fix net ads dns usage calls.
via f678dc0... s3-rpcclient: fix uninitialized variable in
wkssvc_enumerateusers.
via 6f38dc6... s3: Fix but 7145 -- duplicate sam and unix accounts
via 4aa41c7... s3:cli_netlogon: keep the the correct negotiate_flags on
the cli->dc structure
via ecda733... s3: Avoid calling cli_alloc_mid twice in
cli_smb_req_iov_send
via 71c4a4f... WHATSNEW: Prepare release notes for Samba 3.5.0.
via 0af8d27... VERSION: Raise version number up to 3.5.0.
from 69d87ed... WHATSNEW: Update changes since 3.5.0rc2.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable
- Log -----------------------------------------------------------------
commit d82b72a5a5d7c1585a39f3a9530ff8861bfda45a
Author: Karolin Seeger <ksee...@samba.org>
Date: Mon Mar 1 12:09:45 2010 +0100
WHATSNEW: Update changes since 3.5.0rc3.
Karolin
(cherry picked from commit 5fcab1948e6e3347cbe91fa2f27e547db499776b)
commit 62bccb6f70fb770b7b834769a284aee2c4c097db
Author: Günther Deschner <g...@samba.org>
Date: Mon Feb 8 11:53:59 2010 +0100
s3-net: fix net ads dns usage calls.
Bjoern, please check.
Guenther
Fix bug #7181 (buildwarnings in net_ads.c).
(cherry picked from commit 7d5575fefe29a00c757dab0013c9d45b84f0be47)
commit f678dc0df569f46f9b254d263243d60eaaf93ff3
Author: Günther Deschner <g...@samba.org>
Date: Wed Feb 17 15:15:47 2010 +0100
s3-rpcclient: fix uninitialized variable in wkssvc_enumerateusers.
Guenther
Fix bug #7182.
(cherry picked from commit bb4a76538bfae593c4a997b10bdb1f6c1666701c)
commit 6f38dc637faeea64ac6e693cfa649899004f01d8
Author: Volker Lendecke <v...@samba.org>
Date: Sun Feb 28 14:38:14 2010 +0100
s3: Fix but 7145 -- duplicate sam and unix accounts
For me this survives the
TESTS=posix_s3 POSIX_SUBTESTS="RPC-SAMR-LARGE-DC LOCAL-NSS-WRAPPER" make
test
reproducer. Günther, please check!
Volker
(cherry picked from commit 0e9882a65e91e4ab55dc103c7f6aec4ccd966db0)
(cherry picked from commit fd59fa500a30a69ed09265bc3871fa640e232422)
commit 4aa41c7d4a39f33fb4868b27e057d0a169fb97e6
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Feb 19 23:22:40 2010 +0100
s3:cli_netlogon: keep the the correct negotiate_flags on the cli->dc
structure
This should fix the rpccli_netlogon_set_trust_password() against DC's
without netr_ServerPasswordSet2 support.
This fixes bug #7160.
metze
(cherry picked from commit 1e9df26ef970df41de54142a78606a15374acbac)
(cherry picked from commit a3e3355b5ccf74a2ffe5da6cbb2747e74586b1e5)
commit ecda733ca608950c8d3c08d1caf82f45de622461
Author: Volker Lendecke <v...@samba.org>
Date: Sun Feb 21 20:39:36 2010 +0100
s3: Avoid calling cli_alloc_mid twice in cli_smb_req_iov_send
I hate macros....
(cherry picked from commit 65914ed8194b141a44516d626e71a1851bccff5f)
Fix bug #7166.
(cherry picked from commit b7d5b469ef134d60e1f795f66f7e5c3ef23d7971)
commit 71c4a4fb1d5fa167416a74ee90a3d4632af63cde
Author: Karolin Seeger <ksee...@samba.org>
Date: Mon Feb 22 15:44:34 2010 +0100
WHATSNEW: Prepare release notes for Samba 3.5.0.
Karolin
(cherry picked from commit 262854d8a2a39df2d151268442772ad92b0ddbcd)
commit 0af8d273e413cc6fc5fa47c09702e010536e1acc
Author: Karolin Seeger <ksee...@samba.org>
Date: Mon Feb 22 15:40:57 2010 +0100
VERSION: Raise version number up to 3.5.0.
Karolin
(cherry picked from commit e8979e7edd42ec229cc7d53f636c99a09b97fde4)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 30 +++++++++++++++++++++++-------
source3/VERSION | 2 +-
source3/libsmb/async_smb.c | 3 ++-
source3/rpc_client/cli_netlogon.c | 8 ++++++--
source3/rpcclient/cmd_wkssvc.c | 4 ++--
source3/utils/net_ads.c | 11 ++++++++---
source3/winbindd/wb_next_grent.c | 11 +++++++++++
source3/winbindd/wb_next_pwent.c | 11 +++++++++++
8 files changed, 64 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 1d99e4e..caad89d 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,13 +1,11 @@
+ =============================
+ Release Notes for Samba 3.5.0
+ March 1, 2010
===============================
- Release Notes for Samba 3.5.0rc3
- February 19, 2010
- ===============================
-This is the third release candidate of Samba 3.5. This is *not*
-intended for production environments and is designed for testing
-purposes only. Please report any defects via the Samba bug reporting
-system at https://bugzilla.samba.org/.
+This is the first stable release of Samba 3.5.
+
Major enhancements in Samba 3.5.0 include:
@@ -129,6 +127,24 @@ o Stefan Metzmacher <me...@samba.org>
* Implement the new SMB2 protocol (experimental).
+Changes since 3.5.0rc3
+----------------------
+
+
+o Günther Deschner <g...@samba.org>
+ * BUG 7181: Fix 'net ads dns' usage calls.
+ * BUG 7182: Fix uninitialized variable in wkssvc_enumerateusers.
+
+
+o Volker Lendecke <v...@samba.org>
+ * BUG 7145: Fix duplicate sam and unix accounts.
+ * BUG 7166: Avoid calling cli_alloc_mid twice in cli_smb_req_iov_send.
+
+
+o Stefan Metzmacher <me...@samba.org>
+ * BUG 7160: Keep the the correct negotiate_flags on the cli->dc structure.
+
+
Changes since 3.5.0rc2
----------------------
diff --git a/source3/VERSION b/source3/VERSION
index c8c88b4..13358fe 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -56,7 +56,7 @@ SAMBA_VERSION_PRE_RELEASE=
# e.g. SAMBA_VERSION_RC_RELEASE=1 #
# -> "3.0.0rc1" #
########################################################
-SAMBA_VERSION_RC_RELEASE=3
+SAMBA_VERSION_RC_RELEASE=
########################################################
# To mark SVN snapshots this should be set to 'yes' #
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 8b9cf09..e8a0b13 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -476,7 +476,8 @@ static NTSTATUS cli_smb_req_iov_send(struct tevent_req *req,
if (state->mid != 0) {
SSVAL(iov[0].iov_base, smb_mid, state->mid);
} else {
- SSVAL(iov[0].iov_base, smb_mid, cli_alloc_mid(state->cli));
+ uint16_t mid = cli_alloc_mid(state->cli);
+ SSVAL(iov[0].iov_base, smb_mid, mid);
}
smb_setlen((char *)iov[0].iov_base, iov_len(iov, iov_count) - 4);
diff --git a/source3/rpc_client/cli_netlogon.c
b/source3/rpc_client/cli_netlogon.c
index 0388447..9cb0bc6 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -45,6 +45,7 @@ NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client
*cli,
struct samr_Password password;
bool retried = false;
fstring mach_acct;
+ uint32_t neg_flags = *neg_flags_inout;
if (!ndr_syntax_id_equal(&cli->abstract_syntax,
&ndr_table_netlogon.syntax_id)) {
@@ -81,7 +82,7 @@ NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client
*cli,
&srv_chal_recv,
&password,
&clnt_chal_send,
- *neg_flags_inout);
+ neg_flags);
if (!cli->dc) {
return NT_STATUS_NO_MEMORY;
@@ -98,7 +99,7 @@ NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client
*cli,
cli->dc->computer_name,
&clnt_chal_send, /* input. */
&srv_chal_recv, /* output. */
- neg_flags_inout);
+ &neg_flags);
/* we might be talking to NT4, so let's downgrade in that case and retry
* with the returned neg_flags - gd */
@@ -132,6 +133,9 @@ NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client
*cli,
"chain established.\n",
cli->desthost ));
+ cli->dc->negotiate_flags = neg_flags;
+ *neg_flags_inout = neg_flags;
+
return NT_STATUS_OK;
}
diff --git a/source3/rpcclient/cmd_wkssvc.c b/source3/rpcclient/cmd_wkssvc.c
index 34ad576..1475010 100644
--- a/source3/rpcclient/cmd_wkssvc.c
+++ b/source3/rpcclient/cmd_wkssvc.c
@@ -190,7 +190,7 @@ static WERROR cmd_wkssvc_enumerateusers(struct
rpc_pipe_client *cli,
}
for (i=0; i<num_entries; i++) {
- const char *user;
+ const char *user = NULL;
switch (info.level) {
case 0:
user = info.ctr.user0->user0[i].user_name;
@@ -202,7 +202,7 @@ static WERROR cmd_wkssvc_enumerateusers(struct
rpc_pipe_client *cli,
info.ctr.user1->user1[i].user_name);
break;
}
- printf("%s\n", user);
+ printf("%s\n", user ? user : "(null)");
}
return werr;
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index eff664f..3cd4fd8 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1432,9 +1432,11 @@ static int net_ads_dns_register(struct net_context *c,
int argc, const char **ar
#endif
if (argc > 0 || c->display_usage) {
- d_printf(_("Usage:\n"),
+ d_printf( "%s\n"
"net ads dns register\n"
- " ", _("Register hostname with DNS\n"));
+ " %s\n",
+ _("Usage:"),
+ _("Register hostname with DNS\n"));
return -1;
}
@@ -1484,7 +1486,10 @@ static int net_ads_dns_gethostbyname(struct net_context
*c, int argc, const char
#endif
if (argc != 2 || c->display_usage) {
- d_printf(_("Usage:\n"),
+ d_printf( "%s\n"
+ " %s\n"
+ " %s\n",
+ _("Usage:"),
_("net ads dns gethostbyname <server> <name>\n"),
_(" Look up hostname from the AD\n"
" server\tName server to use\n"
diff --git a/source3/winbindd/wb_next_grent.c b/source3/winbindd/wb_next_grent.c
index 5f81bca..0e9dbd5 100644
--- a/source3/winbindd/wb_next_grent.c
+++ b/source3/winbindd/wb_next_grent.c
@@ -59,6 +59,11 @@ struct tevent_req *wb_next_grent_send(TALLOC_CTX *mem_ctx,
state->gstate->domain = state->gstate->domain->next;
}
+ if ((state->gstate->domain != NULL)
+ && sid_check_is_domain(&state->gstate->domain->sid)) {
+ state->gstate->domain = state->gstate->domain->next;
+ }
+
if (state->gstate->domain == NULL) {
tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
return tevent_req_post(req, ev);
@@ -109,6 +114,12 @@ static void wb_next_grent_fetch_done(struct tevent_req
*subreq)
if (state->gstate->num_groups == 0) {
state->gstate->domain = state->gstate->domain->next;
+
+ if ((state->gstate->domain != NULL)
+ && sid_check_is_domain(&state->gstate->domain->sid)) {
+ state->gstate->domain = state->gstate->domain->next;
+ }
+
if (state->gstate->domain == NULL) {
tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
return;
diff --git a/source3/winbindd/wb_next_pwent.c b/source3/winbindd/wb_next_pwent.c
index 25ab7b3..fbaaa48 100644
--- a/source3/winbindd/wb_next_pwent.c
+++ b/source3/winbindd/wb_next_pwent.c
@@ -55,6 +55,11 @@ struct tevent_req *wb_next_pwent_send(TALLOC_CTX *mem_ctx,
state->gstate->domain = state->gstate->domain->next;
}
+ if ((state->gstate->domain != NULL)
+ && sid_check_is_domain(&state->gstate->domain->sid)) {
+ state->gstate->domain = state->gstate->domain->next;
+ }
+
if (state->gstate->domain == NULL) {
tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
return tevent_req_post(req, ev);
@@ -101,6 +106,12 @@ static void wb_next_pwent_fetch_done(struct tevent_req
*subreq)
if (state->gstate->num_users == 0) {
state->gstate->domain = state->gstate->domain->next;
+
+ if ((state->gstate->domain != NULL)
+ && sid_check_is_domain(&state->gstate->domain->sid)) {
+ state->gstate->domain = state->gstate->domain->next;
+ }
+
if (state->gstate->domain == NULL) {
tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
return;
--
Samba Shared Repository
