[Pkg-samba-maint] r3362 - in branches/samba/experimental: . packaging/RHEL packaging/RHEL-CTDB source3 source3/include source3/libsmb source3/rpc_client source3/rpcclient source3/utils source3/winbindd

bubulle at alioth.debian.org bubulle at alioth.debian.org
Tue Mar 2 20:57:17 UTC 2010


Author: bubulle
Date: 2010-03-02 20:57:16 +0000 (Tue, 02 Mar 2010)
New Revision: 3362

Modified:
   branches/samba/experimental/WHATSNEW.txt
   branches/samba/experimental/packaging/RHEL-CTDB/samba.spec
   branches/samba/experimental/packaging/RHEL/makerpms.sh
   branches/samba/experimental/packaging/RHEL/samba.spec
   branches/samba/experimental/source3/VERSION
   branches/samba/experimental/source3/include/version.h
   branches/samba/experimental/source3/libsmb/async_smb.c
   branches/samba/experimental/source3/rpc_client/cli_netlogon.c
   branches/samba/experimental/source3/rpcclient/cmd_wkssvc.c
   branches/samba/experimental/source3/utils/net_ads.c
   branches/samba/experimental/source3/winbindd/wb_next_grent.c
   branches/samba/experimental/source3/winbindd/wb_next_pwent.c
Log:
Merge upstream 3.5.0~dfsg

Modified: branches/samba/experimental/WHATSNEW.txt
===================================================================
--- branches/samba/experimental/WHATSNEW.txt	2010-03-02 20:53:10 UTC (rev 3361)
+++ branches/samba/experimental/WHATSNEW.txt	2010-03-02 20:57:16 UTC (rev 3362)
@@ -1,14 +1,12 @@
+                   =============================
+                   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:
 
 General changes:
@@ -129,6 +127,24 @@
     * Implement the new SMB2 protocol (experimental).
 
 
+Changes since 3.5.0rc3
+----------------------
+
+
+o   Günther Deschner <gd at samba.org>
+    * BUG 7181: Fix 'net ads dns' usage calls.
+    * BUG 7182: Fix uninitialized variable in wkssvc_enumerateusers.
+
+
+o   Volker Lendecke <vl at 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 <metze at samba.org>
+    * BUG 7160: Keep the the correct negotiate_flags on the cli->dc structure.
+
+
 Changes since 3.5.0rc2
 ----------------------
 

Modified: branches/samba/experimental/packaging/RHEL/makerpms.sh
===================================================================
--- branches/samba/experimental/packaging/RHEL/makerpms.sh	2010-03-02 20:53:10 UTC (rev 3361)
+++ branches/samba/experimental/packaging/RHEL/makerpms.sh	2010-03-02 20:57:16 UTC (rev 3362)
@@ -20,7 +20,7 @@
 
 USERID=`id -u`
 GRPID=`id -g`
-VERSION='3.5.0rc3'
+VERSION='3.5.0'
 REVISION=''
 SPECFILE="samba.spec"
 RPMVER=`rpm --version | awk '{print $3}'`

Modified: branches/samba/experimental/packaging/RHEL/samba.spec
===================================================================
--- branches/samba/experimental/packaging/RHEL/samba.spec	2010-03-02 20:53:10 UTC (rev 3361)
+++ branches/samba/experimental/packaging/RHEL/samba.spec	2010-03-02 20:57:16 UTC (rev 3362)
@@ -5,7 +5,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.5.0rc3
+Version:      3.5.0
 Release:      1
 Epoch:        0
 License: GNU GPL version 3

Modified: branches/samba/experimental/packaging/RHEL-CTDB/samba.spec
===================================================================
--- branches/samba/experimental/packaging/RHEL-CTDB/samba.spec	2010-03-02 20:53:10 UTC (rev 3361)
+++ branches/samba/experimental/packaging/RHEL-CTDB/samba.spec	2010-03-02 20:57:16 UTC (rev 3362)
@@ -5,7 +5,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.5.0rc3
+Version:      3.5.0
 Release:      1GITHASH
 Epoch:        0
 License: GNU GPL version 3

Modified: branches/samba/experimental/source3/VERSION
===================================================================
--- branches/samba/experimental/source3/VERSION	2010-03-02 20:53:10 UTC (rev 3361)
+++ branches/samba/experimental/source3/VERSION	2010-03-02 20:57:16 UTC (rev 3362)
@@ -56,7 +56,7 @@
 # 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'    #

Modified: branches/samba/experimental/source3/include/version.h
===================================================================
--- branches/samba/experimental/source3/include/version.h	2010-03-02 20:53:10 UTC (rev 3361)
+++ branches/samba/experimental/source3/include/version.h	2010-03-02 20:57:16 UTC (rev 3362)
@@ -2,8 +2,7 @@
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 5
 #define SAMBA_VERSION_RELEASE 0
-#define SAMBA_VERSION_RC_RELEASE 3
-#define SAMBA_VERSION_OFFICIAL_STRING "3.5.0rc3"
+#define SAMBA_VERSION_OFFICIAL_STRING "3.5.0"
 #ifdef SAMBA_VERSION_VENDOR_FUNCTION
 #  define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
 #else /* SAMBA_VERSION_VENDOR_FUNCTION */

Modified: branches/samba/experimental/source3/libsmb/async_smb.c
===================================================================
--- branches/samba/experimental/source3/libsmb/async_smb.c	2010-03-02 20:53:10 UTC (rev 3361)
+++ branches/samba/experimental/source3/libsmb/async_smb.c	2010-03-02 20:57:16 UTC (rev 3362)
@@ -476,7 +476,8 @@
 	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);

Modified: branches/samba/experimental/source3/rpc_client/cli_netlogon.c
===================================================================
--- branches/samba/experimental/source3/rpc_client/cli_netlogon.c	2010-03-02 20:53:10 UTC (rev 3361)
+++ branches/samba/experimental/source3/rpc_client/cli_netlogon.c	2010-03-02 20:57:16 UTC (rev 3362)
@@ -45,6 +45,7 @@
 	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 @@
 				    &srv_chal_recv,
 				    &password,
 				    &clnt_chal_send,
-				    *neg_flags_inout);
+				    neg_flags);
 
 	if (!cli->dc) {
 		return NT_STATUS_NO_MEMORY;
@@ -98,7 +99,7 @@
 						 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 @@
 		"chain established.\n",
 		cli->desthost ));
 
+	cli->dc->negotiate_flags = neg_flags;
+	*neg_flags_inout = neg_flags;
+
 	return NT_STATUS_OK;
 }
 

Modified: branches/samba/experimental/source3/rpcclient/cmd_wkssvc.c
===================================================================
--- branches/samba/experimental/source3/rpcclient/cmd_wkssvc.c	2010-03-02 20:53:10 UTC (rev 3361)
+++ branches/samba/experimental/source3/rpcclient/cmd_wkssvc.c	2010-03-02 20:57:16 UTC (rev 3362)
@@ -190,7 +190,7 @@
 	}
 
 	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 @@
 				info.ctr.user1->user1[i].user_name);
 			break;
 		}
-		printf("%s\n", user);
+		printf("%s\n", user ? user : "(null)");
 	}
 
 	return werr;

Modified: branches/samba/experimental/source3/utils/net_ads.c
===================================================================
--- branches/samba/experimental/source3/utils/net_ads.c	2010-03-02 20:53:10 UTC (rev 3361)
+++ branches/samba/experimental/source3/utils/net_ads.c	2010-03-02 20:57:16 UTC (rev 3362)
@@ -1432,9 +1432,11 @@
 #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 @@
 #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"

Modified: branches/samba/experimental/source3/winbindd/wb_next_grent.c
===================================================================
--- branches/samba/experimental/source3/winbindd/wb_next_grent.c	2010-03-02 20:53:10 UTC (rev 3361)
+++ branches/samba/experimental/source3/winbindd/wb_next_grent.c	2010-03-02 20:57:16 UTC (rev 3362)
@@ -59,6 +59,11 @@
 			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 @@
 
 	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;

Modified: branches/samba/experimental/source3/winbindd/wb_next_pwent.c
===================================================================
--- branches/samba/experimental/source3/winbindd/wb_next_pwent.c	2010-03-02 20:53:10 UTC (rev 3361)
+++ branches/samba/experimental/source3/winbindd/wb_next_pwent.c	2010-03-02 20:57:16 UTC (rev 3362)
@@ -55,6 +55,11 @@
 			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 @@
 
 	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;




More information about the Pkg-samba-maint mailing list