svn commit: samba r10899 - in branches/tmp/SAMBA_3_0_20B: . source
source/include source/nmbd source/nsswitch source/smbd source/wrepld
jerry at samba.org
jerry at samba.org
Tue Oct 11 14:19:08 GMT 2005
Author: jerry
Date: 2005-10-11 14:19:06 +0000 (Tue, 11 Oct 2005)
New Revision: 10899
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10899
Log:
merges for 3.0.20b
svn merge -r10819:10888 $SVNURL/branches/SAMBA_3_0
svn merge -r10730:10744 $SVNURL/branches/SAMBA_3_0
svn merge -r10676:10688 $SVNURL/branches/SAMBA_3_0
Start updating the WHATSNEW and setting the version
Modified:
branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt
branches/tmp/SAMBA_3_0_20B/source/VERSION
branches/tmp/SAMBA_3_0_20B/source/include/smb.h
branches/tmp/SAMBA_3_0_20B/source/nmbd/nmbd.c
branches/tmp/SAMBA_3_0_20B/source/nsswitch/winbindd_misc.c
branches/tmp/SAMBA_3_0_20B/source/smbd/open.c
branches/tmp/SAMBA_3_0_20B/source/smbd/posix_acls.c
branches/tmp/SAMBA_3_0_20B/source/smbd/server.c
branches/tmp/SAMBA_3_0_20B/source/wrepld/server.c
Changeset:
Modified: branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt
===================================================================
--- branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt 2005-10-11 14:02:40 UTC (rev 10898)
+++ branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt 2005-10-11 14:19:06 UTC (rev 10899)
@@ -1,6 +1,6 @@
===============================
- Release Notes for Samba 3.0.20a
- Sept 30, 2005
+ Release Notes for Samba 3.0.20b
+ Oct 11, 2005
===============================
This is the latest stable release of Samba. This is the version
@@ -8,6 +8,36 @@
bug-fixes. Please read the following important changes in this
release.
+Common bugs fixed in 3.0.20b include:
+
+ o
+
+
+
+######################################################################
+Changes
+#######
+
+
+Changes since 3.0.20a
+---------------------
+
+commits
+-------
+
+o Jeremy Allison <jra at samba.org>
+o Gerald (Jerry) Carter <jerry at samba.org>
+o Volker Lendecke <vl at samba.org>
+
+
+Release Notes for older release follow:
+
+ --------------------------------------------------
+ ===============================
+ Release Notes for Samba 3.0.20a
+ Sept 30, 2005
+ ===============================
+
Common bugs fixed in 3.0.20a include:
o Stability problems with winbindd.
@@ -154,8 +184,6 @@
* BUG 3052: Fix compile issues on OpenBSD.
-Release Notes for older release follow:
-
--------------------------------------------------
==============================
Release Notes for Samba 3.0.20
Modified: branches/tmp/SAMBA_3_0_20B/source/VERSION
===================================================================
--- branches/tmp/SAMBA_3_0_20B/source/VERSION 2005-10-11 14:02:40 UTC (rev 10898)
+++ branches/tmp/SAMBA_3_0_20B/source/VERSION 2005-10-11 14:19:06 UTC (rev 10899)
@@ -31,7 +31,7 @@
# e.g. SAMBA_VERSION_REVISION=a #
# -> "2.2.8a" #
########################################################
-SAMBA_VERSION_REVISION=a
+SAMBA_VERSION_REVISION=b
########################################################
# For 'pre' releases the version will be #
Modified: branches/tmp/SAMBA_3_0_20B/source/include/smb.h
===================================================================
--- branches/tmp/SAMBA_3_0_20B/source/include/smb.h 2005-10-11 14:02:40 UTC (rev 10898)
+++ branches/tmp/SAMBA_3_0_20B/source/include/smb.h 2005-10-11 14:19:06 UTC (rev 10899)
@@ -27,6 +27,10 @@
#ifndef _SMB_H
#define _SMB_H
+/* logged when starting the various Samba daemons */
+#define COPYRIGHT_STARTUP_MESSAGE "Copyright Andrew Tridgell and the Samba Team 1992-2005"
+
+
#if defined(LARGE_SMB_OFF_T)
#define BUFFER_SIZE (128*1024)
#else /* no large readwrite possible */
Modified: branches/tmp/SAMBA_3_0_20B/source/nmbd/nmbd.c
===================================================================
--- branches/tmp/SAMBA_3_0_20B/source/nmbd/nmbd.c 2005-10-11 14:02:40 UTC (rev 10898)
+++ branches/tmp/SAMBA_3_0_20B/source/nmbd/nmbd.c 2005-10-11 14:19:06 UTC (rev 10899)
@@ -715,7 +715,7 @@
reopen_logs();
DEBUG( 0, ( "Netbios nameserver version %s started.\n", SAMBA_VERSION_STRING) );
- DEBUGADD( 0, ( "Copyright Andrew Tridgell and the Samba Team 1994-2004\n" ) );
+ DEBUGADD( 0, ( "%s\n", COPYRIGHT_STARTUP_MESSAGE ) );
if ( !reload_nmbd_services(False) )
return(-1);
Modified: branches/tmp/SAMBA_3_0_20B/source/nsswitch/winbindd_misc.c
===================================================================
--- branches/tmp/SAMBA_3_0_20B/source/nsswitch/winbindd_misc.c 2005-10-11 14:02:40 UTC (rev 10898)
+++ branches/tmp/SAMBA_3_0_20B/source/nsswitch/winbindd_misc.c 2005-10-11 14:19:06 UTC (rev 10899)
@@ -131,7 +131,8 @@
if (num_domains > 0)
extra_data = talloc_asprintf(state->mem_ctx, "%s\\%s\\%s",
- names[0], alt_names[0],
+ names[0],
+ alt_names[0] ? alt_names[0] : names[0],
sid_string_static(&sids[0]));
for (i=1; i<num_domains; i++)
Modified: branches/tmp/SAMBA_3_0_20B/source/smbd/open.c
===================================================================
--- branches/tmp/SAMBA_3_0_20B/source/smbd/open.c 2005-10-11 14:02:40 UTC (rev 10898)
+++ branches/tmp/SAMBA_3_0_20B/source/smbd/open.c 2005-10-11 14:19:06 UTC (rev 10899)
@@ -1585,22 +1585,6 @@
fsp_open = open_file(fsp,conn,fname,psbuf,flags|flags2,unx_mode,access_mask);
- if (!fsp_open && (flags2 & O_EXCL) && (errno == EEXIST)) {
- /*
- * Two smbd's tried to open exclusively, but only one of them
- * succeeded.
- */
- file_free(fsp);
- return NULL;
- }
-
- if (!fsp_open && (flags == O_RDWR) && (errno != ENOENT)) {
- if((fsp_open = open_file(fsp,conn,fname,psbuf,
- O_RDONLY,unx_mode,access_mask)) == True) {
- flags = O_RDONLY;
- }
- }
-
if (!fsp_open) {
if(file_existed) {
unlock_share_entry(conn, dev, inode);
Modified: branches/tmp/SAMBA_3_0_20B/source/smbd/posix_acls.c
===================================================================
--- branches/tmp/SAMBA_3_0_20B/source/smbd/posix_acls.c 2005-10-11 14:02:40 UTC (rev 10898)
+++ branches/tmp/SAMBA_3_0_20B/source/smbd/posix_acls.c 2005-10-11 14:19:06 UTC (rev 10899)
@@ -4139,16 +4139,13 @@
/****************************************************************************
Actually emulate the in-kernel access checking for write access. We need
this to successfully check for ability to write for dos filetimes.
+ Note this doesn't take into account share write permissions.
****************************************************************************/
BOOL can_write_to_file(connection_struct *conn, const char *fname, SMB_STRUCT_STAT *psbuf)
{
int ret;
- if (!CAN_WRITE(conn)) {
- return False;
- }
-
if (current_user.uid == 0 || conn->admin_user) {
/* I'm sorry sir, I didn't know you were root... */
return True;
Modified: branches/tmp/SAMBA_3_0_20B/source/smbd/server.c
===================================================================
--- branches/tmp/SAMBA_3_0_20B/source/smbd/server.c 2005-10-11 14:02:40 UTC (rev 10898)
+++ branches/tmp/SAMBA_3_0_20B/source/smbd/server.c 2005-10-11 14:19:06 UTC (rev 10899)
@@ -804,7 +804,7 @@
reopen_logs();
DEBUG(0,( "smbd version %s started.\n", SAMBA_VERSION_STRING));
- DEBUGADD(0,( "Copyright Andrew Tridgell and the Samba Team 1992-2004\n"));
+ DEBUGADD( 0, ( "%s\n", COPYRIGHT_STARTUP_MESSAGE ) );
DEBUG(2,("uid=%d gid=%d euid=%d egid=%d\n",
(int)getuid(),(int)getgid(),(int)geteuid(),(int)getegid()));
Modified: branches/tmp/SAMBA_3_0_20B/source/wrepld/server.c
===================================================================
--- branches/tmp/SAMBA_3_0_20B/source/wrepld/server.c 2005-10-11 14:02:40 UTC (rev 10898)
+++ branches/tmp/SAMBA_3_0_20B/source/wrepld/server.c 2005-10-11 14:19:06 UTC (rev 10899)
@@ -590,8 +590,8 @@
reopen_logs();
- DEBUG(1,( "wrepld version %s started.\n", SAMBA_VERSION_STRING));
- DEBUGADD(1,( "Copyright Andrew Tridgell and the Samba Team 1992-2004\n"));
+ DEBUG(0,( "wrepld version %s started.\n", SAMBA_VERSION_STRING));
+ DEBUGADD( 0, ( "%s\n", COPYRIGHT_STARTUP_MESSAGE ) );
DEBUG(2,("uid=%d gid=%d euid=%d egid=%d\n",
(int)getuid(),(int)getgid(),(int)geteuid(),(int)getegid()));
More information about the samba-cvs
mailing list