svn commit: samba-docs r937 - in trunk/smbdotconf/misc: .
Author: jpeach Date: 2006-04-20 03:15:20 + (Thu, 20 Apr 2006) New Revision: 937 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=937 Log: Document the "fam change notify" and "dmapi support" parameters. Added: trunk/smbdotconf/misc/dmapisupport.xml trunk/smbdotconf/misc/famchangenotify.xml Changeset: Added: trunk/smbdotconf/misc/dmapisupport.xml === --- trunk/smbdotconf/misc/dmapisupport.xml 2006-04-17 22:35:57 UTC (rev 936) +++ trunk/smbdotconf/misc/dmapisupport.xml 2006-04-20 03:15:20 UTC (rev 937) @@ -0,0 +1,29 @@ +http://www.samba.org/samba/DTD/samba-doc";> + + This parameter specifies whether Samba should use DMAPI to + determine whether a file is offline or not. This would typically + be used in conjunction with a hierarchical storage system that + automatically migrates files to tape. + + + Note that Samba infers the status of a file by examining the + events that a DMAPI application has registered interest in. This + heuristic is satisfactory for a number of hierarchical storage + systems, but there may be system for which it will fail. In this + case, Samba may erroneously report files to be offline. + + + This parameter is only available if a supported DMAPI + implementation was found at compilation time. It will only be used + if DMAPI is found to enabled on the system at run time. + + + + + +no + Added: trunk/smbdotconf/misc/famchangenotify.xml === --- trunk/smbdotconf/misc/famchangenotify.xml 2006-04-17 22:35:57 UTC (rev 936) +++ trunk/smbdotconf/misc/famchangenotify.xml 2006-04-20 03:15:20 UTC (rev 937) @@ -0,0 +1,20 @@ +http://www.samba.org/samba/DTD/samba-doc";> + + This parameter specifies whether Samba should ask the + FAM daemon change notifications in directories so that + SMB clients can refresh whenever the data on the server changes. + + + This parameter is only used when your system supports + change notification to user programs, using the FAM daemon. If the FAM + daemon is not running, this parameter is automatically disabled. The + kernel change notify + parameter will take precedence if it is also enabled. + + +yes +
svn commit: samba r15145 - in branches/SAMBA_3_0_RELEASE: .
Author: jerry Date: 2006-04-20 02:14:15 + (Thu, 20 Apr 2006) New Revision: 15145 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15145 Log: add some more to the release notes (please review) Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt Changeset: Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt === --- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-04-20 01:59:17 UTC (rev 15144) +++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-04-20 02:14:15 UTC (rev 15145) @@ -36,7 +36,17 @@ to prevent overlaps of assigned Relative Identifiers (RIDs). Unmapped users are assigned a SID in the S-1-22-1 domain now and unmapped groups are assigned a SID in the S-1-22-2 domain. +This means that it is possible on upgraded Samba domain controllers +that this could cause problems with the ACLs assigned to files or +directories copied from a file share to a local NTFS formatted disk +partition. Upgrading procedures are still under development. +There has also been a minor update the Samba LDAP schema file. +A substring matching rule has been added to the sambaSID +attribute definition. This will require, for example, the addition +of 'index sambaSID sub' to an OpenLDAP server's slapd.conf +configuration file. It will be necessary to run slapindex after +making this change. ## @@ -53,16 +63,27 @@ -- -- acl group control Deprecated add port command New +dmapi support New dos filemode Modified behavior enable asu support New default (no) enable privileges New default (yes) +enable rid algorithm Removed +fam change notify New host msdfs New default (yes) msdfs root New default (yes) open files database hash size New strict locking New default (auto) +usershare max shares New +usershare owner only New +usershare path New +usershare prefix allow listNew +usershare prefix deny list New +usershare template share New winbind enum users New default (no) winbind enum groupsNew default (no) winbind nested groups New default (yes) +winbind offline logon New +winbind refesh tickets New winbind max idle children Removed
svn commit: samba r15144 - in branches/SAMBA_3_0_RELEASE: . source/client source/param source/smbd source/utils
Author: jerry
Date: 2006-04-20 01:59:17 + (Thu, 20 Apr 2006)
New Revision: 15144
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15144
Log:
final code changes for 3.0.23pre1 (SAMBA_3_0 r15141)
Modified:
branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
branches/SAMBA_3_0_RELEASE/source/client/clitar.c
branches/SAMBA_3_0_RELEASE/source/param/loadparm.c
branches/SAMBA_3_0_RELEASE/source/smbd/open.c
branches/SAMBA_3_0_RELEASE/source/smbd/server.c
branches/SAMBA_3_0_RELEASE/source/utils/net_ads.c
branches/SAMBA_3_0_RELEASE/source/utils/net_rpc.c
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-04-20 01:16:04 UTC (rev
15143)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-04-20 01:59:17 UTC (rev
15144)
@@ -20,13 +20,25 @@
http://news.samba.org/#coverity_zero_bugs
http://news.samba.org/#zdnet_quick_response
+New features introduced in 3.0.23pre1 include:
+ o New offline mode in winbindd.
+ o New kerberos support for pam_winbind.so.
+ o New handling of unmapped users and groups.
+ o New non-root share management tools.
+ o Improved support for local and BUILTIN groups.
-Common bugs fixed in 3.0.23pre1 include:
-New features introduced in 3.0.23pre1 include:
+User and Group changes
+==
+The user and group internal management routines have been rewritten
+to prevent overlaps of assigned Relative Identifiers (RIDs).
+Unmapped users are assigned a SID in the S-1-22-1 domain now and
+unmapped groups are assigned a SID in the S-1-22-2 domain.
+
+
##
Changes
###
@@ -100,9 +112,12 @@
* Fix error return on session setup. Ensure no data blob is
added if the logon call failed so that Windows clients
interpret the NT_STATUS code correctly.
+* Teach Samba the difference between exclusive and batch
+ oplocks.
+* BUG 3592: Ignore a file in a smbtar output if the first
+ read fails (inspired by Justin Best).
-
o Alexander Bokovoy <[EMAIL PROTECTED]>
* Fix 'smbcontrol shutdown' messages for nmbd and winbindd.
@@ -215,7 +230,6 @@
in /etc/security/pam_winbind.conf.
-
o Mathias Dietz <[EMAIL PROTECTED]>
* EPERM can be a valid return from getting an xattr.
Don't disable if we get it.
@@ -261,6 +275,8 @@
the SAMBA_4_0 tree.
* Unsure that the global SAM SID is initialized before any
dependent routines are called.
+* Enhance consistency checks on local configuration when joining
+ a domain.
o Derrell Lipman <[EMAIL PROTECTED]>
Modified: branches/SAMBA_3_0_RELEASE/source/client/clitar.c
===
--- branches/SAMBA_3_0_RELEASE/source/client/clitar.c 2006-04-20 01:16:04 UTC
(rev 15143)
+++ branches/SAMBA_3_0_RELEASE/source/client/clitar.c 2006-04-20 01:59:17 UTC
(rev 15144)
@@ -561,15 +561,15 @@
return True;
}
-static int padit(char *buf, int bufsize, int padsize)
+static int padit(char *buf, SMB_BIG_UINT bufsize, SMB_BIG_UINT padsize)
{
int berr= 0;
int bytestowrite;
- DEBUG(5, ("Padding with %d zeros\n", padsize));
- memset(buf, 0, bufsize);
+ DEBUG(5, ("Padding with %0.f zeros\n", (double)padsize));
+ memset(buf, 0, (size_t)bufsize);
while( !berr && padsize > 0 ) {
- bytestowrite= MIN(bufsize, padsize);
+ bytestowrite= (int)MIN(bufsize, padsize);
berr = dotarbuf(tarhandle, buf, bytestowrite) != bytestowrite;
padsize -= bytestowrite;
}
@@ -682,12 +682,11 @@
DEBUG(4, ("skipping %s - hidden bit is set\n", finfo.name));
shallitime=0;
} else {
+ BOOL wrote_tar_header = False;
+
DEBUG(3,("getting file %s of size %.0f bytes as a tar file %s",
finfo.name, (double)finfo.size, lname));
- /* write a tar header, don't bother with mode - just set to
100644 */
- writetarheader(tarhandle, rname, finfo.size, finfo.mtime,
"100644 \0", ftype);
-
while (nread < finfo.size && !close_done) {
DEBUG(3,("nread=%.0f\n",(double)nread));
@@ -701,6 +700,13 @@
nread += datalen;
+ /* Only if the first read succeeds, write out the tar
header. */
+ if (!wrote_tar_header) {
+ /* write a tar header, don't bother with mode -
just set to 100644 */
+ writetarheader(tarhandle, rname, finfo.size,
finfo.mtime, "100644 \0", ftype);
+ wrote_tar_header = True;
+ }
+
svn commit: samba r15143 - in branches/SAMBA_4_0/source: build/m4 lib/tdb
Author: jpeach
Date: 2006-04-20 01:16:04 + (Thu, 20 Apr 2006)
New Revision: 15143
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15143
Log:
Pull in GNU extensions right at the start of the configure process. This
prevents a warning on comparison_fn_t redefinition every time replace.h
is included.
Modified:
branches/SAMBA_4_0/source/build/m4/env.m4
branches/SAMBA_4_0/source/lib/tdb/config.m4
Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/env.m4
===
--- branches/SAMBA_4_0/source/build/m4/env.m4 2006-04-20 00:47:48 UTC (rev
15142)
+++ branches/SAMBA_4_0/source/build/m4/env.m4 2006-04-20 01:16:04 UTC (rev
15143)
@@ -29,6 +29,8 @@
echo "BUILD REVISION: ${SAMBA_VERSION_SVN_REVISION}"
fi
+AC_DEFINE([_GNU_SOURCE],[],[Pull in GNU extensions])
+
sinclude(build/m4/check_path.m4)
sinclude(build/m4/check_perl.m4)
sinclude(build/m4/check_cc.m4)
Modified: branches/SAMBA_4_0/source/lib/tdb/config.m4
===
--- branches/SAMBA_4_0/source/lib/tdb/config.m4 2006-04-20 00:47:48 UTC (rev
15142)
+++ branches/SAMBA_4_0/source/lib/tdb/config.m4 2006-04-20 01:16:04 UTC (rev
15143)
@@ -1,8 +1,6 @@
AC_CHECK_FUNCS(mmap pread pwrite getpagesize utime)
AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h)
-AC_DEFINE([_GNU_SOURCE],[],[Pull in GNU extensions])
-
AC_HAVE_DECL(pread, [#include ])
AC_HAVE_DECL(pwrite, [#include ])
svn commit: samba r15142 - in trunk/source/client: .
Author: jra
Date: 2006-04-20 00:47:48 + (Thu, 20 Apr 2006)
New Revision: 15142
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15142
Log:
Fix for #3592 inspired by Justin Best <[EMAIL PROTECTED]>.
Ignore a file in a tar output if the first read fails. Also
cope with <2GB read fail.
Jeremy.
Modified:
trunk/source/client/clitar.c
Changeset:
Modified: trunk/source/client/clitar.c
===
--- trunk/source/client/clitar.c2006-04-20 00:47:46 UTC (rev 15141)
+++ trunk/source/client/clitar.c2006-04-20 00:47:48 UTC (rev 15142)
@@ -561,15 +561,15 @@
return True;
}
-static int padit(char *buf, int bufsize, int padsize)
+static int padit(char *buf, SMB_BIG_UINT bufsize, SMB_BIG_UINT padsize)
{
int berr= 0;
int bytestowrite;
- DEBUG(5, ("Padding with %d zeros\n", padsize));
- memset(buf, 0, bufsize);
+ DEBUG(5, ("Padding with %0.f zeros\n", (double)padsize));
+ memset(buf, 0, (size_t)bufsize);
while( !berr && padsize > 0 ) {
- bytestowrite= MIN(bufsize, padsize);
+ bytestowrite= (int)MIN(bufsize, padsize);
berr = dotarbuf(tarhandle, buf, bytestowrite) != bytestowrite;
padsize -= bytestowrite;
}
@@ -682,12 +682,11 @@
DEBUG(4, ("skipping %s - hidden bit is set\n", finfo.name));
shallitime=0;
} else {
+ BOOL wrote_tar_header = False;
+
DEBUG(3,("getting file %s of size %.0f bytes as a tar file %s",
finfo.name, (double)finfo.size, lname));
- /* write a tar header, don't bother with mode - just set to
100644 */
- writetarheader(tarhandle, rname, finfo.size, finfo.mtime,
"100644 \0", ftype);
-
while (nread < finfo.size && !close_done) {
DEBUG(3,("nread=%.0f\n",(double)nread));
@@ -701,6 +700,13 @@
nread += datalen;
+ /* Only if the first read succeeds, write out the tar
header. */
+ if (!wrote_tar_header) {
+ /* write a tar header, don't bother with mode -
just set to 100644 */
+ writetarheader(tarhandle, rname, finfo.size,
finfo.mtime, "100644 \0", ftype);
+ wrote_tar_header = True;
+ }
+
/* if file size has increased since we made file size
query, truncate
read so tar header for this file will be
correct.
*/
@@ -727,20 +733,25 @@
datalen=0;
}
- /* pad tar file with zero's if we couldn't get entire file */
- if (nread < finfo.size) {
- DEBUG(0, ("Didn't get entire file. size=%.0f,
nread=%d\n",
- (double)finfo.size,
(int)nread));
- if (padit(data, sizeof(data), finfo.size - nread))
- DEBUG(0,("Error writing tar file - %s\n",
strerror(errno)));
- }
+ if (wrote_tar_header) {
+ /* pad tar file with zero's if we couldn't get entire
file */
+ if (nread < finfo.size) {
+ DEBUG(0, ("Didn't get entire file. size=%.0f,
nread=%d\n",
+ (double)finfo.size,
(int)nread));
+ if (padit(data, (SMB_BIG_UINT)sizeof(data),
finfo.size - nread))
+ DEBUG(0,("Error writing tar file -
%s\n", strerror(errno)));
+ }
- /* round tar file to nearest block */
- if (finfo.size % TBLOCK)
- dozerobuf(tarhandle, TBLOCK - (finfo.size % TBLOCK));
+ /* round tar file to nearest block */
+ if (finfo.size % TBLOCK)
+ dozerobuf(tarhandle, TBLOCK - (finfo.size %
TBLOCK));
- ttarf+=finfo.size + TBLOCK - (finfo.size % TBLOCK);
- ntarf++;
+ ttarf+=finfo.size + TBLOCK - (finfo.size % TBLOCK);
+ ntarf++;
+ } else {
+ DEBUG(4, ("skipping %s - initial read failed (file was
locked ?)\n", finfo.name));
+ shallitime=0;
+ }
}
cli_close(cli, fnum);
svn commit: samba r15141 - in branches/SAMBA_3_0/source/client: .
Author: jra
Date: 2006-04-20 00:47:46 + (Thu, 20 Apr 2006)
New Revision: 15141
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15141
Log:
Fix for #3592 inspired by Justin Best <[EMAIL PROTECTED]>.
Ignore a file in a tar output if the first read fails. Also
cope with <2GB read fail.
Jeremy.
Modified:
branches/SAMBA_3_0/source/client/clitar.c
Changeset:
Modified: branches/SAMBA_3_0/source/client/clitar.c
===
--- branches/SAMBA_3_0/source/client/clitar.c 2006-04-19 22:58:05 UTC (rev
15140)
+++ branches/SAMBA_3_0/source/client/clitar.c 2006-04-20 00:47:46 UTC (rev
15141)
@@ -561,15 +561,15 @@
return True;
}
-static int padit(char *buf, int bufsize, int padsize)
+static int padit(char *buf, SMB_BIG_UINT bufsize, SMB_BIG_UINT padsize)
{
int berr= 0;
int bytestowrite;
- DEBUG(5, ("Padding with %d zeros\n", padsize));
- memset(buf, 0, bufsize);
+ DEBUG(5, ("Padding with %0.f zeros\n", (double)padsize));
+ memset(buf, 0, (size_t)bufsize);
while( !berr && padsize > 0 ) {
- bytestowrite= MIN(bufsize, padsize);
+ bytestowrite= (int)MIN(bufsize, padsize);
berr = dotarbuf(tarhandle, buf, bytestowrite) != bytestowrite;
padsize -= bytestowrite;
}
@@ -682,12 +682,11 @@
DEBUG(4, ("skipping %s - hidden bit is set\n", finfo.name));
shallitime=0;
} else {
+ BOOL wrote_tar_header = False;
+
DEBUG(3,("getting file %s of size %.0f bytes as a tar file %s",
finfo.name, (double)finfo.size, lname));
- /* write a tar header, don't bother with mode - just set to
100644 */
- writetarheader(tarhandle, rname, finfo.size, finfo.mtime,
"100644 \0", ftype);
-
while (nread < finfo.size && !close_done) {
DEBUG(3,("nread=%.0f\n",(double)nread));
@@ -701,6 +700,13 @@
nread += datalen;
+ /* Only if the first read succeeds, write out the tar
header. */
+ if (!wrote_tar_header) {
+ /* write a tar header, don't bother with mode -
just set to 100644 */
+ writetarheader(tarhandle, rname, finfo.size,
finfo.mtime, "100644 \0", ftype);
+ wrote_tar_header = True;
+ }
+
/* if file size has increased since we made file size
query, truncate
read so tar header for this file will be
correct.
*/
@@ -727,20 +733,25 @@
datalen=0;
}
- /* pad tar file with zero's if we couldn't get entire file */
- if (nread < finfo.size) {
- DEBUG(0, ("Didn't get entire file. size=%.0f,
nread=%d\n",
- (double)finfo.size,
(int)nread));
- if (padit(data, sizeof(data), finfo.size - nread))
- DEBUG(0,("Error writing tar file - %s\n",
strerror(errno)));
- }
+ if (wrote_tar_header) {
+ /* pad tar file with zero's if we couldn't get entire
file */
+ if (nread < finfo.size) {
+ DEBUG(0, ("Didn't get entire file. size=%.0f,
nread=%d\n",
+ (double)finfo.size,
(int)nread));
+ if (padit(data, (SMB_BIG_UINT)sizeof(data),
finfo.size - nread))
+ DEBUG(0,("Error writing tar file -
%s\n", strerror(errno)));
+ }
- /* round tar file to nearest block */
- if (finfo.size % TBLOCK)
- dozerobuf(tarhandle, TBLOCK - (finfo.size % TBLOCK));
+ /* round tar file to nearest block */
+ if (finfo.size % TBLOCK)
+ dozerobuf(tarhandle, TBLOCK - (finfo.size %
TBLOCK));
- ttarf+=finfo.size + TBLOCK - (finfo.size % TBLOCK);
- ntarf++;
+ ttarf+=finfo.size + TBLOCK - (finfo.size % TBLOCK);
+ ntarf++;
+ } else {
+ DEBUG(4, ("skipping %s - initial read failed (file was
locked ?)\n", finfo.name));
+ shallitime=0;
+ }
}
cli_close(cli, fnum);
Build status as of Thu Apr 20 00:00:02 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-04-19 00:00:03.0 + +++ /home/build/master/cache/broken_results.txt 2006-04-20 00:00:40.0 + @@ -1,17 +1,17 @@ -Build status as of Wed Apr 19 00:00:01 2006 +Build status as of Thu Apr 20 00:00:02 2006 Build counts: Tree Total Broken Panic -ccache 5 0 0 -distcc 7 1 0 -lorikeet-heimdal 13 13 0 -ppp 17 0 0 -rsync33 1 0 +ccache 6 0 0 +distcc 8 1 0 +lorikeet-heimdal 14 14 0 +ppp 18 0 0 +rsync34 1 0 samba2 0 0 samba-docs 0 0 0 -samba4 38 23 2 -samba_3_034 8 0 -smb-build25 0 0 -talloc 4 3 0 -tdb 31 3 0 +samba4 39 22 2 +samba_3_035 8 0 +smb-build27 0 0 +talloc 5 3 0 +tdb 32 3 0
svn commit: samba r15140 - in branches/SAMBA_3_0_RELEASE: .
Author: jerry Date: 2006-04-19 22:58:05 + (Wed, 19 Apr 2006) New Revision: 15140 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15140 Log: first draft of 3.0.23pre1 release notes Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt Changeset: Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt === --- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-04-19 18:48:17 UTC (rev 15139) +++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-04-19 22:58:05 UTC (rev 15140) @@ -1,3 +1,336 @@ + == + Release Notes for Samba 3.0.23pre1 + Apr 20, 2006 + == + +This is a preview release of the Samba 3.0.23 code base and +is provided for testing only. This release is *not* intended +for production servers. There has been a substantial amount +of development since the 3.0.21 series of stable releases. +We would like to ask the Samba community for help in testing +these changes as we work towards the next significant production +upgrade Samba 3.0 release. + +There has been a substantial amount of cleanup work done +during this development cycle. Two weeks of development time +was dedicated to fixing bugs reported by the Coverity source +code scans. Details can be found at in the following two +articles: + + http://news.samba.org/#coverity_zero_bugs + http://news.samba.org/#zdnet_quick_response + + + +Common bugs fixed in 3.0.23pre1 include: + +New features introduced in 3.0.23pre1 include: + + +## +Changes +### + +Changes since 3.0.21/22 +--- + +smb.conf changes + + +Parameter Name Action +-- -- +acl group control Deprecated +add port command New +dos filemode Modified behavior +enable asu support New default (no) +enable privileges New default (yes) +host msdfs New default (yes) +msdfs root New default (yes) +open files database hash size New +strict locking New default (auto) +winbind enum users New default (no) +winbind enum groupsNew default (no) +winbind nested groups New default (yes) +winbind max idle children Removed + + +commits +--- +o Jeremy Allison <[EMAIL PROTECTED]> +* BUG 3467: Fix delete on close semantics needed by WinXP Media + Center Ed. for simultaneous recording and playback (thanks to + Jason Qian for the debugging assistance). +* BUG 3347: Save the Unix user token used to set the + delete-on-close flag. +* Fix parsing of SAMR_Q_CONNECT_ANON. +* Add in support for userinfo26 structure and re-enable + userinfo25 +* Schannel server fixes. Fix the credentials chaining across + \netlogon pipe disconnects. +* Replace ubqix code in nmbd with an internal tdb. +* Fix struct timespec checks in configure.in. +* Add in server support for the NetSamLogonEx(). +* Add support for LsaLookupSids2() and LsaLookupSids3(). +* Add LsaLookupNames[2-4](). +* Add support for 'net usershare'. +* BUG 3522: Fix error code return on SMBmkdir(foo) when foo + already exists (thanks to Sandeep Tamhankar). +* BUG 3510: Fix 'net rpc join' against a server when + schannel is disabled. +* Get rid of poor errno mapping table. Bounce through NTSTATUS + instead. +* Check for SeMachineAccountPrivilege when deleting machine + accounts. +* Fix a logic bug with multiple oplock contention. +* Add the replacements for opendir/readdir etc from SAMBA_4_0. + Attempt to fix the broken directory handling in the *BSD. +* Allow run time tuning of the locking tdb hash size for + very busy servers. +* BUG 3642: Ensure we don't call FD_SET on read with + fd == -1. +* BUG 3569: Work around linear posix locking issue on AIX + which was causing high loads due to the tdb CLEAR_IF_FIRST + flag (based on work from William JoJo). +* Fix OS/2 directory delete bug found by kukks. +* Match the Windows 2003 NTLMSSP signature. +* Performance tuning work in core read & write file serving + paths. +* Change default to 'strict locking' to better reflect + real world clients. +* Fix error return on session setup. Ensure no data blob is + added if the logon call failed so that Windows clients + interpret the NT_STATUS code correctly. + + + +o Alexander Bokovoy <[EMAIL PROTECTED]> +* Fix 'smbcontrol shutdown' messages for nmbd and winbindd. + + +o Max
svn commit: samba r15139 - in trunk/source/smbd: .
Author: jra
Date: 2006-04-19 18:48:17 + (Wed, 19 Apr 2006)
New Revision: 15139
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15139
Log:
Teach Samba the difference between exclusive and batch oplocks.
Pass Samba4 oplock test (with kernel oplocks off).
Jeremy.
Modified:
trunk/source/smbd/open.c
Changeset:
Modified: trunk/source/smbd/open.c
===
--- trunk/source/smbd/open.c2006-04-19 18:48:14 UTC (rev 15138)
+++ trunk/source/smbd/open.c2006-04-19 18:48:17 UTC (rev 15139)
@@ -608,7 +608,7 @@
* 3) Only level2 around: Grant level2 and do nothing else.
*/
-static BOOL delay_for_oplocks(struct share_mode_lock *lck, files_struct *fsp)
+static BOOL delay_for_oplocks(struct share_mode_lock *lck, files_struct *fsp,
int pass_number)
{
int i;
struct share_mode_entry *exclusive = NULL;
@@ -630,9 +630,16 @@
/* At least one entry is not an invalid or deferred entry. */
valid_entry = True;
- if (EXCLUSIVE_OPLOCK_TYPE(lck->share_modes[i].op_type)) {
- SMB_ASSERT(exclusive == NULL);
- exclusive = &lck->share_modes[i];
+ if (pass_number == 1) {
+ if (BATCH_OPLOCK_TYPE(lck->share_modes[i].op_type)) {
+ SMB_ASSERT(exclusive == NULL);
+ exclusive = &lck->share_modes[i];
+ }
+ } else {
+ if (EXCLUSIVE_OPLOCK_TYPE(lck->share_modes[i].op_type))
{
+ SMB_ASSERT(exclusive == NULL);
+ exclusive = &lck->share_modes[i];
+ }
}
if (lck->share_modes[i].op_type == LEVEL_II_OPLOCK) {
@@ -1024,6 +1031,42 @@
}
+static void schedule_defer_open(struct share_mode_lock *lck, struct timeval
request_time)
+{
+ struct deferred_open_record state;
+
+ /* This is a relative time, added to the absolute
+ request_time value to get the absolute timeout time.
+ Note that if this is the second or greater time we enter
+ this codepath for this particular request mid then
+ request_time is left as the absolute time of the *first*
+ time this request mid was processed. This is what allows
+ the request to eventually time out. */
+
+ struct timeval timeout;
+
+ /* Normally the smbd we asked should respond within
+* OPLOCK_BREAK_TIMEOUT seconds regardless of whether
+* the client did, give twice the timeout as a safety
+* measure here in case the other smbd is stuck
+* somewhere else. */
+
+ timeout = timeval_set(OPLOCK_BREAK_TIMEOUT*2, 0);
+
+ /* Nothing actually uses state.delayed_for_oplocks
+ but it's handy to differentiate in debug messages
+ between a 30 second delay due to oplock break, and
+ a 1 second delay for share mode conflicts. */
+
+ state.delayed_for_oplocks = True;
+ state.dev = lck->dev;
+ state.inode = lck->ino;
+
+ if (!request_timed_out(request_time, timeout)) {
+ defer_open(lck, request_time, timeout, &state);
+ }
+}
+
/
Open a file with a share mode.
/
@@ -1310,7 +1353,6 @@
}
if (file_existed) {
-
dev = psbuf->st_dev;
inode = psbuf->st_ino;
@@ -1324,41 +1366,9 @@
return NULL;
}
- if (delay_for_oplocks(lck, fsp)) {
- struct deferred_open_record state;
-
- /* This is a relative time, added to the absolute
- request_time value to get the absolute timeout time.
- Note that if this is the second or greater time we
enter
- this codepath for this particular request mid then
- request_time is left as the absolute time of the
*first*
- time this request mid was processed. This is what
allows
- the request to eventually time out. */
-
- struct timeval timeout;
-
- /* Normally the smbd we asked should respond within
-* OPLOCK_BREAK_TIMEOUT seconds regardless of whether
-* the client did, give twice the timeout as a safety
-* measure here in case the other smbd is stuck
-* somewhere else. */
-
- timeout = timeval_set(OPLOCK_BREAK_TIMEOUT*2, 0);
-
- /* Nothing actually uses state.del
svn commit: samba r15138 - in branches/SAMBA_3_0/source/smbd: .
Author: jra
Date: 2006-04-19 18:48:14 + (Wed, 19 Apr 2006)
New Revision: 15138
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15138
Log:
Teach Samba the difference between exclusive and batch oplocks.
Pass Samba4 oplock test (with kernel oplocks off).
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/open.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/open.c
===
--- branches/SAMBA_3_0/source/smbd/open.c 2006-04-19 15:43:48 UTC (rev
15137)
+++ branches/SAMBA_3_0/source/smbd/open.c 2006-04-19 18:48:14 UTC (rev
15138)
@@ -608,7 +608,7 @@
* 3) Only level2 around: Grant level2 and do nothing else.
*/
-static BOOL delay_for_oplocks(struct share_mode_lock *lck, files_struct *fsp)
+static BOOL delay_for_oplocks(struct share_mode_lock *lck, files_struct *fsp,
int pass_number)
{
int i;
struct share_mode_entry *exclusive = NULL;
@@ -630,9 +630,16 @@
/* At least one entry is not an invalid or deferred entry. */
valid_entry = True;
- if (EXCLUSIVE_OPLOCK_TYPE(lck->share_modes[i].op_type)) {
- SMB_ASSERT(exclusive == NULL);
- exclusive = &lck->share_modes[i];
+ if (pass_number == 1) {
+ if (BATCH_OPLOCK_TYPE(lck->share_modes[i].op_type)) {
+ SMB_ASSERT(exclusive == NULL);
+ exclusive = &lck->share_modes[i];
+ }
+ } else {
+ if (EXCLUSIVE_OPLOCK_TYPE(lck->share_modes[i].op_type))
{
+ SMB_ASSERT(exclusive == NULL);
+ exclusive = &lck->share_modes[i];
+ }
}
if (lck->share_modes[i].op_type == LEVEL_II_OPLOCK) {
@@ -1024,6 +1031,42 @@
}
+static void schedule_defer_open(struct share_mode_lock *lck, struct timeval
request_time)
+{
+ struct deferred_open_record state;
+
+ /* This is a relative time, added to the absolute
+ request_time value to get the absolute timeout time.
+ Note that if this is the second or greater time we enter
+ this codepath for this particular request mid then
+ request_time is left as the absolute time of the *first*
+ time this request mid was processed. This is what allows
+ the request to eventually time out. */
+
+ struct timeval timeout;
+
+ /* Normally the smbd we asked should respond within
+* OPLOCK_BREAK_TIMEOUT seconds regardless of whether
+* the client did, give twice the timeout as a safety
+* measure here in case the other smbd is stuck
+* somewhere else. */
+
+ timeout = timeval_set(OPLOCK_BREAK_TIMEOUT*2, 0);
+
+ /* Nothing actually uses state.delayed_for_oplocks
+ but it's handy to differentiate in debug messages
+ between a 30 second delay due to oplock break, and
+ a 1 second delay for share mode conflicts. */
+
+ state.delayed_for_oplocks = True;
+ state.dev = lck->dev;
+ state.inode = lck->ino;
+
+ if (!request_timed_out(request_time, timeout)) {
+ defer_open(lck, request_time, timeout, &state);
+ }
+}
+
/
Open a file with a share mode.
/
@@ -1310,7 +1353,6 @@
}
if (file_existed) {
-
dev = psbuf->st_dev;
inode = psbuf->st_ino;
@@ -1324,41 +1366,9 @@
return NULL;
}
- if (delay_for_oplocks(lck, fsp)) {
- struct deferred_open_record state;
-
- /* This is a relative time, added to the absolute
- request_time value to get the absolute timeout time.
- Note that if this is the second or greater time we
enter
- this codepath for this particular request mid then
- request_time is left as the absolute time of the
*first*
- time this request mid was processed. This is what
allows
- the request to eventually time out. */
-
- struct timeval timeout;
-
- /* Normally the smbd we asked should respond within
-* OPLOCK_BREAK_TIMEOUT seconds regardless of whether
-* the client did, give twice the timeout as a safety
-* measure here in case the other smbd is stuck
-* somewhere else. */
-
- timeout = timeval_set(OPLOCK_BREAK_TIMEOUT*2, 0);
svn commit: samba r15137 - branches/SAMBA_3_0/source/utils trunk/source/utils
Author: vlendec
Date: 2006-04-19 15:43:48 + (Wed, 19 Apr 2006)
New Revision: 15137
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15137
Log:
Refuse to join if our netbios name is longer than 15 chars. I think this is
sufficient to fix bug #3659.
Volker
Modified:
branches/SAMBA_3_0/source/utils/net_ads.c
branches/SAMBA_3_0/source/utils/net_rpc.c
trunk/source/utils/net_ads.c
trunk/source/utils/net_rpc.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_ads.c
===
--- branches/SAMBA_3_0/source/utils/net_ads.c 2006-04-19 15:38:43 UTC (rev
15136)
+++ branches/SAMBA_3_0/source/utils/net_ads.c 2006-04-19 15:43:48 UTC (rev
15137)
@@ -727,6 +727,12 @@
return -1;
}
+ if (strlen(global_myname()) > 15) {
+ d_printf("Our netbios name can only be 15 chars long, \"%s\""
+" is %d chars long\n",
+global_myname(), strlen(global_myname()));
+ return -1;
+ }
if (argc > 0) {
org_unit = argv[0];
Modified: branches/SAMBA_3_0/source/utils/net_rpc.c
===
--- branches/SAMBA_3_0/source/utils/net_rpc.c 2006-04-19 15:38:43 UTC (rev
15136)
+++ branches/SAMBA_3_0/source/utils/net_rpc.c 2006-04-19 15:43:48 UTC (rev
15137)
@@ -395,6 +395,13 @@
return -1;
}
+ if (strlen(global_myname()) > 15) {
+ d_printf("Our netbios name can only be 15 chars long, \"%s\""
+" is %d chars long\n",
+global_myname(), strlen(global_myname()));
+ return -1;
+ }
+
if ((net_rpc_perform_oldjoin(argc, argv) == 0))
return 0;
Modified: trunk/source/utils/net_ads.c
===
--- trunk/source/utils/net_ads.c2006-04-19 15:38:43 UTC (rev 15136)
+++ trunk/source/utils/net_ads.c2006-04-19 15:43:48 UTC (rev 15137)
@@ -727,6 +727,12 @@
return -1;
}
+ if (strlen(global_myname()) > 15) {
+ d_printf("Our netbios name can only be 15 chars long, \"%s\""
+" is %d chars long\n",
+global_myname(), strlen(global_myname()));
+ return -1;
+ }
if (argc > 0) {
org_unit = argv[0];
Modified: trunk/source/utils/net_rpc.c
===
--- trunk/source/utils/net_rpc.c2006-04-19 15:38:43 UTC (rev 15136)
+++ trunk/source/utils/net_rpc.c2006-04-19 15:43:48 UTC (rev 15137)
@@ -395,6 +395,13 @@
return -1;
}
+ if (strlen(global_myname()) > 15) {
+ d_printf("Our netbios name can only be 15 chars long, \"%s\""
+" is %d chars long\n",
+global_myname(), strlen(global_myname()));
+ return -1;
+ }
+
if ((net_rpc_perform_oldjoin(argc, argv) == 0))
return 0;
svn commit: samba r15136 - branches/SAMBA_3_0/source/utils trunk/source/utils
Author: vlendec
Date: 2006-04-19 15:38:43 + (Wed, 19 Apr 2006)
New Revision: 15136
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15136
Log:
Fix join consistency check
Modified:
branches/SAMBA_3_0/source/utils/net_ads.c
branches/SAMBA_3_0/source/utils/net_rpc.c
trunk/source/utils/net_ads.c
trunk/source/utils/net_rpc.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_ads.c
===
--- branches/SAMBA_3_0/source/utils/net_ads.c 2006-04-19 14:16:38 UTC (rev
15135)
+++ branches/SAMBA_3_0/source/utils/net_ads.c 2006-04-19 15:38:43 UTC (rev
15136)
@@ -721,7 +721,7 @@
const char *short_domain_name = NULL;
TALLOC_CTX *ctx = NULL;
- if ((lp_server_role() != ROLE_DOMAIN_MEMBER) ||
+ if ((lp_server_role() != ROLE_DOMAIN_MEMBER) &&
(lp_server_role() != ROLE_DOMAIN_BDC)) {
d_printf("can only join as domain member or as BDC\n");
return -1;
Modified: branches/SAMBA_3_0/source/utils/net_rpc.c
===
--- branches/SAMBA_3_0/source/utils/net_rpc.c 2006-04-19 14:16:38 UTC (rev
15135)
+++ branches/SAMBA_3_0/source/utils/net_rpc.c 2006-04-19 15:38:43 UTC (rev
15136)
@@ -389,7 +389,7 @@
int net_rpc_join(int argc, const char **argv)
{
- if ((lp_server_role() != ROLE_DOMAIN_MEMBER) ||
+ if ((lp_server_role() != ROLE_DOMAIN_MEMBER) &&
(lp_server_role() != ROLE_DOMAIN_BDC)) {
d_printf("can only join as domain member or as BDC\n");
return -1;
Modified: trunk/source/utils/net_ads.c
===
--- trunk/source/utils/net_ads.c2006-04-19 14:16:38 UTC (rev 15135)
+++ trunk/source/utils/net_ads.c2006-04-19 15:38:43 UTC (rev 15136)
@@ -721,7 +721,7 @@
const char *short_domain_name = NULL;
TALLOC_CTX *ctx = NULL;
- if ((lp_server_role() != ROLE_DOMAIN_MEMBER) ||
+ if ((lp_server_role() != ROLE_DOMAIN_MEMBER) &&
(lp_server_role() != ROLE_DOMAIN_BDC)) {
d_printf("can only join as domain member or as BDC\n");
return -1;
Modified: trunk/source/utils/net_rpc.c
===
--- trunk/source/utils/net_rpc.c2006-04-19 14:16:38 UTC (rev 15135)
+++ trunk/source/utils/net_rpc.c2006-04-19 15:38:43 UTC (rev 15136)
@@ -389,7 +389,7 @@
int net_rpc_join(int argc, const char **argv)
{
- if ((lp_server_role() != ROLE_DOMAIN_MEMBER) ||
+ if ((lp_server_role() != ROLE_DOMAIN_MEMBER) &&
(lp_server_role() != ROLE_DOMAIN_BDC)) {
d_printf("can only join as domain member or as BDC\n");
return -1;
svn commit: samba-web r958 - in trunk/projects: .
Author: deryck Date: 2006-04-19 14:34:10 + (Wed, 19 Apr 2006) New Revision: 958 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=958 Log: Add summer of code 06 page. Just a place holder for now... developers will need to add project ideas. deryck Added: trunk/projects/summercode06.html Changeset: Added: trunk/projects/summercode06.html === --- trunk/projects/summercode06.html2006-04-14 16:06:19 UTC (rev 957) +++ trunk/projects/summercode06.html2006-04-19 14:34:10 UTC (rev 958) @@ -0,0 +1,33 @@ + + Samba -- Summer of Code Projects + + +Summer of Code Projects + + +The following is an outline of potential projects for those interested in +working on Samba through http://code.google.com/soc/";>Google's +"Summer of Code" program. + +This is just a holding area for project ideas. The projects listed here +may be updated as developers refine a project's outline. Questions about +Samba's participation in the program can be mailed to +mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]. + + + + Samba 3 + + + Samba 4 + + + Linux CIFS FS + + + Project Infrastructure + + + + +
svn commit: samba r15135 - in branches/SAMBA_3_0_RELEASE: examples examples/LDAP examples/VFS examples/libmsrpc/test/sam examples/libsmbclient examples/misc examples/pdb examples/perfcounter examples/
Author: jerry Date: 2006-04-19 14:16:38 + (Wed, 19 Apr 2006) New Revision: 15135 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15135 Log: working on 3.0.23pre1; sync to SAMBA_3_0 r15132 Added: branches/SAMBA_3_0_RELEASE/examples/pam_winbind/ branches/SAMBA_3_0_RELEASE/source/include/debugparse.h branches/SAMBA_3_0_RELEASE/source/include/event.h branches/SAMBA_3_0_RELEASE/source/include/gpo.h branches/SAMBA_3_0_RELEASE/source/iniparser/ branches/SAMBA_3_0_RELEASE/source/lib/audit.c branches/SAMBA_3_0_RELEASE/source/lib/display_sec.c branches/SAMBA_3_0_RELEASE/source/lib/events.c branches/SAMBA_3_0_RELEASE/source/lib/repdir.c branches/SAMBA_3_0_RELEASE/source/lib/sharesec.c branches/SAMBA_3_0_RELEASE/source/libads/gpo.c branches/SAMBA_3_0_RELEASE/source/libads/gpo_util.c branches/SAMBA_3_0_RELEASE/source/libads/krb5_errs.c branches/SAMBA_3_0_RELEASE/source/libsmb/dcerpc_err.c branches/SAMBA_3_0_RELEASE/source/libsmb/gpo.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cred_cache.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_creds.c branches/SAMBA_3_0_RELEASE/source/passdb/util_unixsids.c branches/SAMBA_3_0_RELEASE/source/passdb/util_wellknown.c branches/SAMBA_3_0_RELEASE/source/script/installbin.sh.in branches/SAMBA_3_0_RELEASE/source/script/tests/dlopen.sh branches/SAMBA_3_0_RELEASE/source/script/tests/selftest.sh branches/SAMBA_3_0_RELEASE/source/script/tests/test_functions.sh branches/SAMBA_3_0_RELEASE/source/script/tests/test_posix_s3.sh branches/SAMBA_3_0_RELEASE/source/script/tests/test_smbclient_s3.sh branches/SAMBA_3_0_RELEASE/source/script/tests/test_smbtorture_s3.sh branches/SAMBA_3_0_RELEASE/source/script/tests/tests_all.sh branches/SAMBA_3_0_RELEASE/source/script/tests/timelimit.c branches/SAMBA_3_0_RELEASE/source/script/uninstallbin.sh.in branches/SAMBA_3_0_RELEASE/source/smbd/dmapi.c branches/SAMBA_3_0_RELEASE/source/smbd/map_username.c branches/SAMBA_3_0_RELEASE/source/smbd/notify_fam.c branches/SAMBA_3_0_RELEASE/source/smbd/share_access.c branches/SAMBA_3_0_RELEASE/source/tests/os2_delete.c branches/SAMBA_3_0_RELEASE/source/utils/debugparse.c branches/SAMBA_3_0_RELEASE/source/utils/net_ads_gpo.c branches/SAMBA_3_0_RELEASE/source/utils/net_rpc_audit.c branches/SAMBA_3_0_RELEASE/source/utils/net_rpc_sh_acct.c branches/SAMBA_3_0_RELEASE/source/utils/net_rpc_shell.c branches/SAMBA_3_0_RELEASE/source/utils/net_sam.c branches/SAMBA_3_0_RELEASE/source/utils/net_usershare.c branches/SAMBA_3_0_RELEASE/source/utils/net_util.c branches/SAMBA_3_0_RELEASE/source/utils/netlookup.c Removed: branches/SAMBA_3_0_RELEASE/examples/pdb/mysql/ branches/SAMBA_3_0_RELEASE/examples/pdb/sambapdb.dtd branches/SAMBA_3_0_RELEASE/source/lib/util_getent.c branches/SAMBA_3_0_RELEASE/source/lib/util_smbd.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_ldap.c branches/SAMBA_3_0_RELEASE/source/passdb/pdb_guest.c branches/SAMBA_3_0_RELEASE/source/passdb/pdb_mysql.c branches/SAMBA_3_0_RELEASE/source/passdb/pdb_pgsql.c branches/SAMBA_3_0_RELEASE/source/passdb/pdb_sql.c branches/SAMBA_3_0_RELEASE/source/passdb/pdb_xml.c branches/SAMBA_3_0_RELEASE/source/passdb/util_sam_sid.c branches/SAMBA_3_0_RELEASE/source/rpcclient/display_sec.c branches/SAMBA_3_0_RELEASE/source/script/installbin.sh branches/SAMBA_3_0_RELEASE/source/script/tests/functions branches/SAMBA_3_0_RELEASE/source/script/tests/runtests.sh branches/SAMBA_3_0_RELEASE/source/script/tests/t_001.sh branches/SAMBA_3_0_RELEASE/source/script/tests/t_002.sh branches/SAMBA_3_0_RELEASE/source/script/uninstallbin.sh branches/SAMBA_3_0_RELEASE/source/smbd/tdbutil.c branches/SAMBA_3_0_RELEASE/source/ubiqx/ branches/SAMBA_3_0_RELEASE/source/wrepld/ Modified: branches/SAMBA_3_0_RELEASE/examples/LDAP/samba.schema branches/SAMBA_3_0_RELEASE/examples/VFS/Makefile.in branches/SAMBA_3_0_RELEASE/examples/VFS/skel_opaque.c branches/SAMBA_3_0_RELEASE/examples/VFS/skel_transparent.c branches/SAMBA_3_0_RELEASE/examples/libmsrpc/test/sam/samenum.c branches/SAMBA_3_0_RELEASE/examples/libsmbclient/get_auth_data_fn.h branches/SAMBA_3_0_RELEASE/examples/libsmbclient/testbrowse.c branches/SAMBA_3_0_RELEASE/examples/misc/adssearch.pl branches/SAMBA_3_0_RELEASE/examples/pdb/test.c branches/SAMBA_3_0_RELEASE/examples/perfcounter/perf_writer.c branches/SAMBA_3_0_RELEASE/examples/scripts/shares/perl/modify_samba_config.pl branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-sarge/rules branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-unstable/rules branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-woody/rules branches/SAMBA_3_0_RELEASE/packaging/RHEL/makerpms.sh.tmpl branches/SAMBA_3_0_RELEASE/packaging/RHEL/samba.spec.tmpl branches/SAMBA_3_0_RELEASE/packaging/RedHat-9/samba.spec.tmpl branches/SAMBA_3_0_RELE
svn commit: samba r15134 - in trunk/source/tdb: .
Author: vlendec
Date: 2006-04-19 14:13:11 + (Wed, 19 Apr 2006)
New Revision: 15134
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15134
Log:
Revert an accidential commit
Modified:
trunk/source/tdb/tdb.c
Changeset:
Modified: trunk/source/tdb/tdb.c
===
--- trunk/source/tdb/tdb.c 2006-04-19 14:11:51 UTC (rev 15133)
+++ trunk/source/tdb/tdb.c 2006-04-19 14:13:11 UTC (rev 15134)
@@ -74,7 +74,7 @@
return 0;
if (!TDB_DEAD(r) && hash==r->full_hash &&
key.dsize==r->key_len) {
- void *k;
+ char *k;
/* a very likely hit - read the key */
k = tdb_alloc_read(tdb, rec_ptr + sizeof(*r),
r->key_len);
svn commit: samba r15133 - branches/SAMBA_3_0/source/param branches/SAMBA_3_0/source/smbd trunk/source/param trunk/source/smbd trunk/source/tdb
Author: vlendec
Date: 2006-04-19 14:11:51 + (Wed, 19 Apr 2006)
New Revision: 15133
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15133
Log:
in_server is not used anywhere
Modified:
branches/SAMBA_3_0/source/param/loadparm.c
branches/SAMBA_3_0/source/smbd/server.c
trunk/source/param/loadparm.c
trunk/source/smbd/server.c
trunk/source/tdb/tdb.c
Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===
--- branches/SAMBA_3_0/source/param/loadparm.c 2006-04-19 13:14:14 UTC (rev
15132)
+++ branches/SAMBA_3_0/source/param/loadparm.c 2006-04-19 14:11:51 UTC (rev
15133)
@@ -54,7 +54,6 @@
#include "includes.h"
BOOL in_client = False;/* Not in the client by default */
-BOOL in_server = False;/* Not in the server by default */
BOOL bLoaded = False;
extern userdom_struct current_user_info;
Modified: branches/SAMBA_3_0/source/smbd/server.c
===
--- branches/SAMBA_3_0/source/smbd/server.c 2006-04-19 13:14:14 UTC (rev
15132)
+++ branches/SAMBA_3_0/source/smbd/server.c 2006-04-19 14:11:51 UTC (rev
15133)
@@ -731,7 +731,6 @@
int main(int argc,const char *argv[])
{
- extern BOOL in_server;
/* shall I run as a daemon */
static BOOL is_daemon = False;
static BOOL interactive = False;
@@ -755,8 +754,6 @@
{ NULL }
};
- in_server = True;
-
load_case_tables();
#ifdef HAVE_SET_AUTH_PARAMETERS
Modified: trunk/source/param/loadparm.c
===
--- trunk/source/param/loadparm.c 2006-04-19 13:14:14 UTC (rev 15132)
+++ trunk/source/param/loadparm.c 2006-04-19 14:11:51 UTC (rev 15133)
@@ -54,7 +54,6 @@
#include "includes.h"
BOOL in_client = False;/* Not in the client by default */
-BOOL in_server = False;/* Not in the server by default */
BOOL bLoaded = False;
extern userdom_struct current_user_info;
Modified: trunk/source/smbd/server.c
===
--- trunk/source/smbd/server.c 2006-04-19 13:14:14 UTC (rev 15132)
+++ trunk/source/smbd/server.c 2006-04-19 14:11:51 UTC (rev 15133)
@@ -731,7 +731,6 @@
int main(int argc,const char *argv[])
{
- extern BOOL in_server;
/* shall I run as a daemon */
static BOOL is_daemon = False;
static BOOL interactive = False;
@@ -755,8 +754,6 @@
{ NULL }
};
- in_server = True;
-
load_case_tables();
#ifdef HAVE_SET_AUTH_PARAMETERS
Modified: trunk/source/tdb/tdb.c
===
--- trunk/source/tdb/tdb.c 2006-04-19 13:14:14 UTC (rev 15132)
+++ trunk/source/tdb/tdb.c 2006-04-19 14:11:51 UTC (rev 15133)
@@ -74,7 +74,7 @@
return 0;
if (!TDB_DEAD(r) && hash==r->full_hash &&
key.dsize==r->key_len) {
- char *k;
+ void *k;
/* a very likely hit - read the key */
k = tdb_alloc_read(tdb, rec_ptr + sizeof(*r),
r->key_len);
svn commit: samba r15132 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch
Author: vlendec
Date: 2006-04-19 13:14:14 + (Wed, 19 Apr 2006)
New Revision: 15132
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15132
Log:
Fix some shadowed variable warnings
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
branches/SAMBA_3_0/source/nsswitch/winbindd_reconnect.c
trunk/source/nsswitch/winbindd_cache.c
trunk/source/nsswitch/winbindd_reconnect.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2006-04-19 03:06:50 UTC
(rev 15131)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2006-04-19 13:14:14 UTC
(rev 15132)
@@ -774,7 +774,7 @@
centry_free(centry);
}
-static void wcache_save_password_policy(struct winbindd_domain *domain,
NTSTATUS status, SAM_UNK_INFO_1 *password_policy)
+static void wcache_save_password_policy(struct winbindd_domain *domain,
NTSTATUS status, SAM_UNK_INFO_1 *policy)
{
struct cache_entry *centry;
@@ -782,11 +782,11 @@
if (!centry)
return;
- centry_put_uint16(centry, password_policy->min_length_password);
- centry_put_uint16(centry, password_policy->password_history);
- centry_put_uint32(centry, password_policy->password_properties);
- centry_put_nttime(centry, password_policy->expire);
- centry_put_nttime(centry, password_policy->min_passwordage);
+ centry_put_uint16(centry, policy->min_length_password);
+ centry_put_uint16(centry, policy->password_history);
+ centry_put_uint32(centry, policy->password_properties);
+ centry_put_nttime(centry, policy->expire);
+ centry_put_nttime(centry, policy->min_passwordage);
centry_end(centry, "PWD_POL/%s", domain->name);
@@ -1735,7 +1735,7 @@
/* get lockout policy */
static NTSTATUS lockout_policy(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
- SAM_UNK_INFO_12 *lockout_policy){
+ SAM_UNK_INFO_12 *policy){
struct winbind_cache *cache = get_cache(domain);
struct cache_entry *centry = NULL;
NTSTATUS status;
@@ -1748,9 +1748,9 @@
if (!centry)
goto do_query;
- lockout_policy->duration = centry_nttime(centry);
- lockout_policy->reset_count = centry_nttime(centry);
- lockout_policy->bad_attempt_lockout = centry_uint16(centry);
+ policy->duration = centry_nttime(centry);
+ policy->reset_count = centry_nttime(centry);
+ policy->bad_attempt_lockout = centry_uint16(centry);
status = centry->status;
@@ -1761,7 +1761,7 @@
return status;
do_query:
- ZERO_STRUCTP(lockout_policy);
+ ZERO_STRUCTP(policy);
/* Return status value returned by seq number check */
@@ -1771,11 +1771,11 @@
DEBUG(10,("lockout_policy: [Cached] - doing backend query for info for
domain %s\n",
domain->name ));
- status = domain->backend->lockout_policy(domain, mem_ctx,
lockout_policy);
+ status = domain->backend->lockout_policy(domain, mem_ctx, policy);
/* and save it */
refresh_sequence_number(domain, False);
- wcache_save_lockout_policy(domain, status, lockout_policy);
+ wcache_save_lockout_policy(domain, status, policy);
return status;
}
@@ -1783,7 +1783,7 @@
/* get password policy */
static NTSTATUS password_policy(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
- SAM_UNK_INFO_1 *password_policy)
+ SAM_UNK_INFO_1 *policy)
{
struct winbind_cache *cache = get_cache(domain);
struct cache_entry *centry = NULL;
@@ -1797,11 +1797,11 @@
if (!centry)
goto do_query;
- password_policy->min_length_password = centry_uint16(centry);
- password_policy->password_history = centry_uint16(centry);
- password_policy->password_properties = centry_uint32(centry);
- password_policy->expire = centry_nttime(centry);
- password_policy->min_passwordage = centry_nttime(centry);
+ policy->min_length_password = centry_uint16(centry);
+ policy->password_history = centry_uint16(centry);
+ policy->password_properties = centry_uint32(centry);
+ policy->expire = centry_nttime(centry);
+ policy->min_passwordage = centry_nttime(centry);
status = centry->status;
@@ -1812,7 +1812,7 @@
return status;
do_query:
- ZERO_STRUCTP(password_policy);
+ ZERO_STRUCTP(policy);
/* Return status value returned by seq number check */
@@ -1822,11 +1822,11 @@
DEBUG(10,("password_policy: [Cached] - doing backend query for info for
domain %s\n",
domain->name ));
- status = domain->backend->pass
Re: svn commit: samba r15131 - in branches/SAMBA_4_0/source/torture: .
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] schrieb: > Author: jpeach > Date: 2006-04-19 03:06:50 + (Wed, 19 Apr 2006) > New Revision: 15131 > > WebSVN: > http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15131 > > Log: > Tidy help output. When printing the list of tests, group them by prefix > to make it easier to see what tests are available. Hi James! thanks! that looks really nice! metze -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFERfeFm70gjA5TCD8RAjQeAKDP1TamcoQGr/sFECuwVh0gMzgSrwCeINKa TVTGGAwASoSaZKlHlgcGXr0= =ziXw -END PGP SIGNATURE-
