svn commit: samba r14837 - in branches/SAMBA_4_0/source/auth/credentials: .
Author: tridge
Date: 2006-03-31 05:33:35 + (Fri, 31 Mar 2006)
New Revision: 14837
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14837
Log:
fixed build error
Modified:
branches/SAMBA_4_0/source/auth/credentials/credentials_ntlm.c
Changeset:
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_ntlm.c
===
--- branches/SAMBA_4_0/source/auth/credentials/credentials_ntlm.c
2006-03-31 03:05:39 UTC (rev 14836)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_ntlm.c
2006-03-31 05:33:35 UTC (rev 14837)
@@ -185,11 +185,12 @@
}
}
} else {
+ const char *password;
+
/* LM Key is incompatible... */
lm_response = nt_response;
*flags &= ~CLI_CRED_LANMAN_AUTH;
- const char *password;
password = cli_credentials_get_password(cred);
if (password) {
E_deshash(password, lm_hash);
svn commit: samba r14836 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: tpot
Date: 2006-03-31 03:05:39 + (Fri, 31 Mar 2006)
New Revision: 14836
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14836
Log:
Keep constants in the right order, and line things up nicely.
Modified:
branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl 2006-03-31 03:02:39 UTC
(rev 14835)
+++ branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl 2006-03-31 03:05:39 UTC
(rev 14836)
@@ -57,10 +57,10 @@
[flag(NDR_REMAINING)] DATA_BLOB stub_and_verifier;
} dcerpc_request;
- const int DCERPC_BIND_PROVIDER_REJECT = 2;
- const int DCERPC_BIND_REASON_ASYNTAX = 1;
+ const int DCERPC_BIND_REASON_ASYNTAX = 1;
+ const int DCERPC_BIND_PROVIDER_REJECT= 2;
const int DECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED = 4;
- const int DCERPC_BIND_REASON_INVALID_AUTH_TYPE = 8;
+ const int DCERPC_BIND_REASON_INVALID_AUTH_TYPE = 8;
typedef struct {
uint16 result;
svn commit: samba r14835 - in branches/SAMBA_4_0/source/ntvfs: . common
Author: tridge Date: 2006-03-31 03:02:39 + (Fri, 31 Mar 2006) New Revision: 14835 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14835 Log: split out the config rules for the ntvfs/common/ directory Added: branches/SAMBA_4_0/source/ntvfs/common/config.mk Modified: branches/SAMBA_4_0/source/ntvfs/config.mk Changeset: Added: branches/SAMBA_4_0/source/ntvfs/common/config.mk === --- branches/SAMBA_4_0/source/ntvfs/common/config.mk2006-03-31 00:50:17 UTC (rev 14834) +++ branches/SAMBA_4_0/source/ntvfs/common/config.mk2006-03-31 03:02:39 UTC (rev 14835) @@ -0,0 +1,13 @@ + +# Start MODULE ntvfs_common +[MODULE::ntvfs_common] +SUBSYSTEM = ntvfs +PRIVATE_PROTO_HEADER = vfs_common_proto.h +OBJ_FILES = \ + brlock.o \ + opendb.o \ + notify.o \ + sidmap.o +REQUIRED_SUBSYSTEMS = +# End MODULE ntvfs_common + Modified: branches/SAMBA_4_0/source/ntvfs/config.mk === --- branches/SAMBA_4_0/source/ntvfs/config.mk 2006-03-31 00:50:17 UTC (rev 14834) +++ branches/SAMBA_4_0/source/ntvfs/config.mk 2006-03-31 03:02:39 UTC (rev 14835) @@ -1,5 +1,6 @@ # NTVFS Server subsystem include posix/config.mk +include common/config.mk include unixuid/config.mk @@ -75,11 +76,7 @@ ntvfs_base.o \ ntvfs_generic.o \ ntvfs_interface.o \ - ntvfs_util.o \ - common/brlock.o \ - common/opendb.o \ - common/notify.o \ - common/sidmap.o + ntvfs_util.o REQUIRED_SUBSYSTEMS = NDR_OPENDB NDR_NOTIFY # # End SUBSYSTEM NTVFS
svn commit: samba-web r946 - in trunk: .
Author: jerry Date: 2006-03-31 02:52:25 + (Fri, 31 Mar 2006) New Revision: 946 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=946 Log: add mention of SuSE in the main release announcement Modified: trunk/index.html Changeset: Modified: trunk/index.html === --- trunk/index.html2006-03-30 17:21:42 UTC (rev 945) +++ trunk/index.html2006-03-31 02:52:25 UTC (rev 946) @@ -34,7 +34,7 @@ If you prefer to download just the diff from 3.0.21c to 3.0.22, the patch file (gpg signature) is also available. - Precompiled packages for Fedora Core 4, RedHat 9, and Solaris + Precompiled packages for Fedora Core 4, RedHat 9, all SuSE platforms, and Solaris are available in the Binary_Packages download area. Packages for other platforms will be available shortly.
svn commit: samba r14834 - in trunk/source/rpcclient: .
Author: jra Date: 2006-03-31 00:50:17 + (Fri, 31 Mar 2006) New Revision: 14834 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14834 Log: Fix resource leak on error code path. Coverity #280. Jeremy. Modified: trunk/source/rpcclient/cmd_spoolss.c Changeset: Modified: trunk/source/rpcclient/cmd_spoolss.c === --- trunk/source/rpcclient/cmd_spoolss.c2006-03-31 00:50:09 UTC (rev 14833) +++ trunk/source/rpcclient/cmd_spoolss.c2006-03-31 00:50:17 UTC (rev 14834) @@ -2396,9 +2396,10 @@ curkey += strlen(subkey) + 1; } - safe_free(keylist); +done: -done: + SAFE_FREE(keylist); + if (got_hnd) rpccli_spoolss_close_printer(cli, mem_ctx, &hnd);
svn commit: samba r14833 - in branches/SAMBA_3_0/source/rpcclient: .
Author: jra Date: 2006-03-31 00:50:09 + (Fri, 31 Mar 2006) New Revision: 14833 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14833 Log: Fix resource leak on error code path. Coverity #280. Jeremy. Modified: branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c Changeset: Modified: branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c === --- branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c 2006-03-31 00:47:19 UTC (rev 14832) +++ branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c 2006-03-31 00:50:09 UTC (rev 14833) @@ -2396,9 +2396,10 @@ curkey += strlen(subkey) + 1; } - safe_free(keylist); +done: -done: + SAFE_FREE(keylist); + if (got_hnd) rpccli_spoolss_close_printer(cli, mem_ctx, &hnd);
svn commit: samba r14832 - in trunk/source/utils: .
Author: jra
Date: 2006-03-31 00:47:19 + (Fri, 31 Mar 2006)
New Revision: 14832
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14832
Log:
Fix possible null deref. Coverity #279.
Jeremy.
Modified:
trunk/source/utils/net_ads.c
Changeset:
Modified: trunk/source/utils/net_ads.c
===
--- trunk/source/utils/net_ads.c2006-03-31 00:47:08 UTC (rev 14831)
+++ trunk/source/utils/net_ads.c2006-03-31 00:47:19 UTC (rev 14832)
@@ -1045,6 +1045,13 @@
asprintf(&prt_dn, "cn=%s-%s,%s", srv_cn[0], printername, srv_dn);
pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_SPOOLSS, &nt_status);
+ if (!pipe_hnd) {
+ d_fprintf(stderr, "Unable to open a connnection to the spoolss
pipe on %s\n",
+servername);
+ ads_destroy(&ads);
+ return -1;
+ }
+
get_remote_printer_publishing_data(pipe_hnd, mem_ctx, &mods,
printername);
svn commit: samba r14831 - in branches/SAMBA_3_0/source/utils: .
Author: jra
Date: 2006-03-31 00:47:08 + (Fri, 31 Mar 2006)
New Revision: 14831
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14831
Log:
Fix possible null deref. Coverity #279.
Jeremy.
Modified:
branches/SAMBA_3_0/source/utils/net_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_ads.c
===
--- branches/SAMBA_3_0/source/utils/net_ads.c 2006-03-31 00:44:32 UTC (rev
14830)
+++ branches/SAMBA_3_0/source/utils/net_ads.c 2006-03-31 00:47:08 UTC (rev
14831)
@@ -1045,6 +1045,13 @@
asprintf(&prt_dn, "cn=%s-%s,%s", srv_cn[0], printername, srv_dn);
pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_SPOOLSS, &nt_status);
+ if (!pipe_hnd) {
+ d_fprintf(stderr, "Unable to open a connnection to the spoolss
pipe on %s\n",
+servername);
+ ads_destroy(&ads);
+ return -1;
+ }
+
get_remote_printer_publishing_data(pipe_hnd, mem_ctx, &mods,
printername);
svn commit: samba r14830 - in trunk/source/rpc_parse: .
Author: jra
Date: 2006-03-31 00:44:32 + (Fri, 31 Mar 2006)
New Revision: 14830
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14830
Log:
Fix reversed test in coverity fixes.
Jeremy.
Modified:
trunk/source/rpc_parse/parse_reg.c
Changeset:
Modified: trunk/source/rpc_parse/parse_reg.c
===
--- trunk/source/rpc_parse/parse_reg.c 2006-03-31 00:44:24 UTC (rev 14829)
+++ trunk/source/rpc_parse/parse_reg.c 2006-03-31 00:44:32 UTC (rev 14830)
@@ -1117,7 +1117,7 @@
q_u->value->buf_max_len = max_buf_len;
q_u->buffer_len = TALLOC_P( get_talloc_ctx(), uint32 );
- if (q_u->buffer_len) {
+ if (!q_u->buffer_len) {
smb_panic("init_reg_q_enum_val: talloc fail\n");
return;
}
svn commit: samba r14829 - in branches/SAMBA_3_0/source/rpc_parse: .
Author: jra
Date: 2006-03-31 00:44:24 + (Fri, 31 Mar 2006)
New Revision: 14829
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14829
Log:
Fix reversed test in coverity fixes.
Jeremy.
Modified:
branches/SAMBA_3_0/source/rpc_parse/parse_reg.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_parse/parse_reg.c
===
--- branches/SAMBA_3_0/source/rpc_parse/parse_reg.c 2006-03-30 21:09:09 UTC
(rev 14828)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_reg.c 2006-03-31 00:44:24 UTC
(rev 14829)
@@ -1117,7 +1117,7 @@
q_u->value->buf_max_len = max_buf_len;
q_u->buffer_len = TALLOC_P( get_talloc_ctx(), uint32 );
- if (q_u->buffer_len) {
+ if (!q_u->buffer_len) {
smb_panic("init_reg_q_enum_val: talloc fail\n");
return;
}
Build status as of Fri Mar 31 00:00:02 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-03-30 00:00:29.0 + +++ /home/build/master/cache/broken_results.txt 2006-03-31 00:00:03.0 + @@ -1,17 +1,17 @@ -Build status as of Thu Mar 30 00:00:02 2006 +Build status as of Fri Mar 31 00:00:02 2006 Build counts: Tree Total Broken Panic -ccache 7 1 0 -distcc 9 2 0 +ccache 9 1 0 +distcc 11 2 0 lorikeet-heimdal 15 15 0 -ppp 15 0 0 +ppp 16 0 0 rsync32 2 0 samba2 0 0 samba-docs 0 0 0 samba4 34 27 0 samba_3_034 7 0 -smb-build21 0 0 -talloc 8 6 0 -tdb 5 1 0 +smb-build24 0 0 +talloc 8 7 0 +tdb 28 3 0
svn commit: samba r14828 - in trunk/source/smbd: .
Author: jra
Date: 2006-03-30 21:09:09 + (Thu, 30 Mar 2006)
New Revision: 14828
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14828
Log:
Hook in the trans2 returns for blocking POSIX locks.
If we don't map down onto posix locks in the filesystem
(ie. if "posix locking = False") this code should now
be working to allow POSIX style locks over SMB. Of course
I now need to test it :-). Finally I'll have to bite
the bullet and fix the mapping onto underlying POSIX
locks...
Jeremy.
Modified:
trunk/source/smbd/blocking.c
trunk/source/smbd/trans2.c
Changeset:
Modified: trunk/source/smbd/blocking.c
===
--- trunk/source/smbd/blocking.c2006-03-30 18:55:46 UTC (rev 14827)
+++ trunk/source/smbd/blocking.c2006-03-30 21:09:09 UTC (rev 14828)
@@ -296,8 +296,20 @@
break;
case SMBtrans2:
case SMBtranss2:
- generic_blocking_lock_error(blr, status);
- break;
+ {
+ char *outbuf = get_OutBuffer();
+ char *inbuf = blr->inbuf;
+ construct_reply_common(inbuf, outbuf);
+ /* construct_reply_common has done us the favor to
pre-fill the
+* command field with SMBtranss2 which is wrong :-)
+*/
+ SCVAL(outbuf,smb_com,SMBtrans2);
+ ERROR_NT(status);
+ if (!send_smb(smbd_server_fd(),outbuf)) {
+ exit_server("blocking_lock_reply_error:
send_smb failed.");
+ }
+ break;
+ }
default:
DEBUG(0,("blocking_lock_reply_error: PANIC - unknown type on
blocking lock queue - exiting.!\n"));
exit_server("PANIC - unknown type on blocking lock queue");
@@ -531,6 +543,51 @@
}
/
+ Attempt to get the posix lock request from a SMBtrans2 call.
+ Returns True if we want to be removed from the list.
+*/
+
+static BOOL process_trans2(blocking_lock_record *blr)
+{
+ extern int max_send;
+ char *inbuf = blr->inbuf;
+ char *outbuf;
+ BOOL my_lock_ctx = False;
+ char params[2];
+ NTSTATUS status;
+
+ status = do_lock(blr->fsp,
+ blr->lock_pid,
+ blr->count,
+ blr->offset,
+ blr->lock_type,
+ blr->lock_flav,
+ &my_lock_ctx);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ if (ERROR_WAS_LOCK_DENIED(status)) {
+ /* Still can't get the lock, just keep waiting. */
+ return False;
+ }
+ /*
+* We have other than a "can't get lock"
+* error. Send an error and return True so we get dequeued.
+*/
+ blocking_lock_reply_error(blr, status);
+ return True;
+ }
+
+ /* We finally got the lock, return success. */
+ outbuf = get_OutBuffer();
+ construct_reply_common(inbuf, outbuf);
+ SCVAL(outbuf,smb_com,SMBtrans2);
+ SSVAL(params,0,0);
+ send_trans2_replies(outbuf, max_send, params, 2, NULL, 0);
+ return True;
+}
+
+
+/
Process a blocking lock SMB.
Returns True if we want to be removed from the list.
*/
@@ -547,7 +604,9 @@
#endif
case SMBlockingX:
return process_lockingX(blr);
- /* TODO - need to add POSIX SMBtrans and SMBtranss switch here.
*/
+ case SMBtrans2:
+ case SMBtranss2:
+ return process_trans2(blr);
default:
DEBUG(0,("blocking_lock_record_process: PANIC - unknown
type on blocking lock queue - exiting.!\n"));
exit_server("PANIC - unknown type on blocking lock
queue");
Modified: trunk/source/smbd/trans2.c
===
--- trunk/source/smbd/trans2.c 2006-03-30 18:55:46 UTC (rev 14827)
+++ trunk/source/smbd/trans2.c 2006-03-30 21:09:09 UTC (rev 14828)
@@ -563,7 +563,7 @@
HACK ! Always assumes smb_setup field is zero.
/
-static int send_trans2_replies(char *outbuf,
+int send_trans2_replies(char *outbuf,
int bufsize,
char *params,
int paramsize,
svn commit: samba r14827 - in trunk/source: locking smbd
Author: jra
Date: 2006-03-30 18:55:46 + (Thu, 30 Mar 2006)
New Revision: 14827
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14827
Log:
Fix lock tests 4 and 5 when underlying POSIX locks are enabled.
Fix crash bug in error case on blocking lock processing.
Jeremy.
Modified:
trunk/source/locking/brlock.c
trunk/source/smbd/blocking.c
trunk/source/smbd/trans2.c
Changeset:
Modified: trunk/source/locking/brlock.c
===
--- trunk/source/locking/brlock.c 2006-03-30 15:47:41 UTC (rev 14826)
+++ trunk/source/locking/brlock.c 2006-03-30 18:55:46 UTC (rev 14827)
@@ -371,7 +371,7 @@
lock type so it can cope with the difference between
Windows "stacking" locks and POSIX "flat" ones. */
- if (lp_posix_locking(SNUM(fsp->conn))) {
+ if ((plock->lock_type != PENDING_LOCK) &&
lp_posix_locking(SNUM(fsp->conn))) {
if (!set_posix_lock(fsp, plock->start, plock->size,
plock->lock_type, WINDOWS_LOCK)) {
if (errno == EACCES || errno == EAGAIN) {
return NT_STATUS_FILE_LOCK_CONFLICT;
@@ -660,7 +660,7 @@
lock type so it can cope with the difference between
Windows "stacking" locks and POSIX "flat" ones. */
- if (lp_posix_locking(SNUM(fsp->conn))) {
+ if ((plock->lock_type != PENDING_LOCK) &&
lp_posix_locking(SNUM(fsp->conn))) {
if (!set_posix_lock(fsp, plock->start, plock->size,
plock->lock_type, POSIX_LOCK)) {
if (errno == EACCES || errno == EAGAIN) {
SAFE_FREE(tp);
@@ -800,6 +800,11 @@
return False;
}
+ /* Unlock any POSIX regions. */
+ if(lp_posix_locking(br_lck->fsp->conn->cnum)) {
+ release_posix_lock(br_lck->fsp, plock->start, plock->size);
+ }
+
/* Send unlock messages to any pending waiters that overlap. */
for (j=0; j < br_lck->num_locks; j++) {
struct lock_struct *pend_lock = &locks[j];
@@ -876,8 +881,8 @@
lock = &locks[i];
/* Only remove our own locks - ignore fnum. */
- if (!brl_same_context(&lock->context, &plock->context) ||
- lock->lock_type == PENDING_LOCK) {
+ if (lock->lock_type == PENDING_LOCK ||
+ !brl_same_context(&lock->context,
&plock->context)) {
memcpy(&tp[count], lock, sizeof(struct lock_struct));
count++;
continue;
@@ -945,6 +950,11 @@
return True;
}
+ /* Unlock any POSIX regions. */
+ if(lp_posix_locking(br_lck->fsp->conn->cnum)) {
+ release_posix_lock(br_lck->fsp, plock->start, plock->size);
+ }
+
/* Realloc so we don't leak entries per unlock call. */
if (count) {
tp = (struct lock_struct *)SMB_REALLOC(tp, count *
sizeof(*locks));
Modified: trunk/source/smbd/blocking.c
===
--- trunk/source/smbd/blocking.c2006-03-30 15:47:41 UTC (rev 14826)
+++ trunk/source/smbd/blocking.c2006-03-30 18:55:46 UTC (rev 14827)
@@ -100,6 +100,9 @@
return False;
}
+ blr->next = NULL;
+ blr->prev = NULL;
+
if((blr->inbuf = (char *)SMB_MALLOC(length)) == NULL) {
DEBUG(0,("push_blocking_lock_request: Malloc fail (2)!\n" ));
SAFE_FREE(blr);
@@ -281,19 +284,29 @@
static void blocking_lock_reply_error(blocking_lock_record *blr, NTSTATUS
status)
{
switch(blr->com_type) {
+#if 0
+ /* We no longer push blocking lock requests for anything but lockingX
and trans2. */
case SMBlock:
case SMBlockread:
generic_blocking_lock_error(blr, status);
break;
+#endif
case SMBlockingX:
reply_lockingX_error(blr, status);
break;
+ case SMBtrans2:
+ case SMBtranss2:
+ generic_blocking_lock_error(blr, status);
+ break;
default:
DEBUG(0,("blocking_lock_reply_error: PANIC - unknown type on
blocking lock queue - exiting.!\n"));
exit_server("PANIC - unknown type on blocking lock queue");
}
}
+#if 0
+/* We no longer push blocking lock requests for anything but lockingX and
trans2. */
+
/
Attempt to finish off getting all pending blocking locks for a lockread call.
Returns True if we want to be removed from the list.
@@ -431,6 +444,7 @@
send_blocking_reply(outbuf,outsize);
return True;
}
+#endif
/
Attempt to finish off ge
Re: svn commit: samba r14821 - in trunk/source/script/tests: .
On Thu, Mar 30, 2006 at 03:30:12PM +0200, Stefan (metze) Metzmacher wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > [EMAIL PROTECTED] schrieb: > > Log: > > sync test_posix_p3.sh with test_posix.sh from samba4 > > but only run the BASE-* tests and ignore some more than in samba4 > Hi *, > > trunk currently fails LOCK4 and LOCK5, and SAMBA_3_0 passes... That's probably due to my POSIX lock work in trunck (still incomplete). I'll fix this up asap. Jeremy.
svn commit: samba-web r945 - in trunk/news/releases: .
Author: lmuelle Date: 2006-03-30 17:21:42 + (Thu, 30 Mar 2006) New Revision: 945 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=945 Log: Mention packages for SuSE Linux. Modified: trunk/news/releases/3.0.22.html Changeset: Modified: trunk/news/releases/3.0.22.html === --- trunk/news/releases/3.0.22.html 2006-03-30 15:23:12 UTC (rev 944) +++ trunk/news/releases/3.0.22.html 2006-03-30 17:21:42 UTC (rev 945) @@ -17,8 +17,8 @@ If you prefer to download just the diff from 3.0.21c to 3.0.22, the patch file (gpg signature) is also available. - Precompiled packages for Fedora Core 4, RedHat 9, and Solaris - are available in the + Precompiled packages for Fedora Core 4, RedHat 9, all SuSE Linux + products, and Solaris are available in the Binary_Packages download area. Packages for other platforms will be available shortly.
svn commit: samba r14826 - in branches/SAMBA_4_0/source/torture/raw: .
Author: metze
Date: 2006-03-30 15:47:41 + (Thu, 30 Mar 2006)
New Revision: 14826
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14826
Log:
initialize pid1 and pid2:-)
metze
Modified:
branches/SAMBA_4_0/source/torture/raw/context.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/context.c
===
--- branches/SAMBA_4_0/source/torture/raw/context.c 2006-03-30 14:28:33 UTC
(rev 14825)
+++ branches/SAMBA_4_0/source/torture/raw/context.c 2006-03-30 15:47:41 UTC
(rev 14826)
@@ -535,6 +535,9 @@
return False;
}
+ pid1 = cli->session->pid;
+ pid2 = pid1 + 1;
+
printf("pid1=%d pid2=%d\n", pid1, pid2);
printf("create a file using pid1\n");
svn commit: samba-web r944 - in trunk/history: .
Author: jerry Date: 2006-03-30 15:23:12 + (Thu, 30 Mar 2006) New Revision: 944 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=944 Log: fixed release note historical links Modified: trunk/history/header_history.html Changeset: Modified: trunk/history/header_history.html === --- trunk/history/header_history.html 2006-03-30 14:31:50 UTC (rev 943) +++ trunk/history/header_history.html 2006-03-30 15:23:12 UTC (rev 944) @@ -77,115 +77,71 @@ Release Notes -samba-3.0.21a.html -samba-3.0.21.html -samba-3.0.20b.html -samba-3.0.20a.html -samba-3.0.20.html -samba-3.0.14a.html -samba-3.0.13.html -samba-3.0.12.html -samba-3.0.11.html -samba-3.0.10.html -samba-3.0.9.html -samba-3.0.8.html -samba-3.0.7.html -samba-3.0.6.html -samba-3.0.5.html -samba-3.0.4.html -samba-3.0.3.html -samba-3.0.2a.html -samba-3.0.2.html -samba-3.0.1.html -samba-3.0.0.html -samba-2.2.12.html -samba-2.2.11.html -samba-2.2.10.html -samba-2.2.9.html -samba-2.2.8a.html -samba-2.2.8.html -samba-2.2.7a.html -samba-2.2.7.html -samba-2.2.6.html -samba-2.2.5.html -samba-2.2.4.html -samba-2.2.3a.html -samba-2.2.3.html -samba-2.2.2.html -samba-2.2.1.html -samba-2.2.0.html -samba-2.0.7.html -samba-2.0.6.html -samba-2.0.5a.html -samba-2.0.5.html -samba-2.0.4.html -samba-2.0.3.html -samba-2.0.2.html -samba-2.0.1.html -samba-2.0.0.html -samba1.9.18p10.html -samba1.9.18p8.html -samba1.9.18p7.html -samba1.9.18p6.html -samba1.9.18p5.html -samba1.9.18p4.html -samba1.9.18p3.html -samba1.9.18p2.html -samba1.9.18p1.html -samba1.9.18.html -samba1.9.17p5.html -samba1.9.17p4.html -samba1.9.17p3.html -samba1.9.17p2.html -samba1.9.17p1.html -samba1.9.17.html - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +samba-3.0.22.html +samba-3.0.21c.html +samba-3.0.21b.html +samba-3.0.21a.html +samba-3.0.21.html +samba-3.0.20b.html +samba-3.0.20a.html +samba-3.0.20.html +samba-3.0.14a.html +samba-3.0.13.html +samba-3.0.12.html +samba-3.0.11.html +samba-3.0.10.html +samba-3.0.9.html +samba-3.0.8.html +samba-3.0.7.html +samba-3.0.6.html +samba-3.0.5.html +samba-3.0.4.html +samba-3.0.3.html +samba-3.0.2a.html +samba-3.0.2.html +samba-3.0.1.html +samba-3.0.0.html +samba-2.2.12.html +samba-2.2.11.html +samba-2.2.10.html +samba-2.2.9.html +samba-2.2.8a.html +samba-2.2.8.html +samba-2.2.7a.html +samba-2.2.7.html +samba-2.2.6.html +samba-2.2.5.html +samba-2.2.4.html +samba-2.2.3a.html +samba-2.2.3.html +samba-2.2.2.html +samba-2.2.1.html +samba-2.2.0.html +samba-2.0.7.html +samba-2.0.6.html +samba-2.0.5a.html +samba-2.0.5.html +samba-2.0.4.html +samba-2.0.3.html +samba-2.0.2.html +samba-2.0.1.html +samba-2.0.0.html +samba1.9.18p10.html +samba1.9.18p8.html +samba1.9.18p7.html +samba1.9.18p6.html +samba1.9.18p5.html +samba1.9.18p4.html +samba1.9.18p3.html +samba1.9.18p2.html +samba1.9.18p1.html +samba1.9.18.html +samba1.9.17p5.html +samba1.9.17p4.html +samba1.9.17p3.html +samba1.9.17p2.html +samba1.9.17p1.html +samba1.9.17.html
svn commit: samba-web r943 - in trunk: . devel history
Author: deryck Date: 2006-03-30 14:31:50 + (Thu, 30 Mar 2006) New Revision: 943 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=943 Log: Update latest stable links. Archive older release announcments in history. deryck Modified: trunk/devel/index.html trunk/header_columns.html trunk/history/index.html Changeset: Modified: trunk/devel/index.html === --- trunk/devel/index.html 2006-03-30 13:57:39 UTC (rev 942) +++ trunk/devel/index.html 2006-03-30 14:31:50 UTC (rev 943) @@ -14,8 +14,8 @@ As of 4 April 2004, the Samba Team converted from CVS to Subversion for maintaining the Samba source code. All current development is done in a Subversion repository. All older code is in the original CVS tree; this would include 2.2.x versions of Samba, which are no longer in active development. -The latest stable release is Samba 3.0.21c (release notes and The latest stable release is Samba 3.0.22 (release notes and download). The next major release will be Samba 4.0, an ambitious Modified: trunk/header_columns.html === --- trunk/header_columns.html 2006-03-30 13:57:39 UTC (rev 942) +++ trunk/header_columns.html 2006-03-30 14:31:50 UTC (rev 943) @@ -129,9 +129,9 @@ Current Stable Releases -Samba 3.0.21c (gzipped) -Release Notes -Signature +Samba 3.0.22 (gzipped) +Release Notes +Signature Historical Modified: trunk/history/index.html === --- trunk/history/index.html2006-03-30 13:57:39 UTC (rev 942) +++ trunk/history/index.html2006-03-30 14:31:50 UTC (rev 943) @@ -6,8 +6,8 @@ - Latest Release — Samba 3.0.21c - Current Stable Release — Samba 3.0.21c + Latest Release — Samba 3.0.22 + Current Stable Release — Samba 3.0.22 @@ -16,6 +16,56 @@ Previous Release Announcments +24 Feb 2005 +Samba 3.0.21c Available for Download + +This is the latest stable release of Samba. This is the version +that production Samba servers should be running for all current +bug-fixes. This release addresses password changes issues +with older clients, several SPNEGO and schannel non-default +configuration problems, and a few crash bugs. Please read the changes in this release. + +The Samba 3.0.21c +source code can be downloaded now. The GnuPG +signature for the uncompressed tarball is also available. +If you prefer to download just the diff from 3.0.21b to 3.0.21c, the +patch file +(gpg signature) is also available. +Precompiled packages for Fedora Core 4, RedHat 9, AIX, all SuSE Linux products, and Solaris +are available in the +Binary_Packages download area. +Packages for other platforms will be available shortly. + + +24 Jan 2006 +Samba 4.0.0TP1 Available for Download + +Samba 4 is the ambitious next version of the Samba suite that is being +developed in parallel to the stable 3.0 series. The main emphasis in +this branch is support for the Active Directory logon protocols used +by Windows 2000 and above. + +Samba 4 is currently not yet in a state where it is usable in +production environments. Note the WARNINGS, and the STATUS file, +which aims to document what should and should not work. + +With 3 years of development under our belt since Tridge first proposed +a new Virtual File System (VFS) layer for Samba3 (a project which +eventually lead to our Active Directory efforts), it was felt that we +should create something we could 'show off' to our users. This is a +Technology Preview (TP), aimed at allowing users, managers and +developers to see how we have progressed, and to invite feedback and +support. + +The uncompressed tarball and patch files have been signed +using GnuPG (ID 1EEF5276). The source code can be +downloaded now. See the +release notes +for more information. + + 30 Jan 2005 Samba 3.0.21b Available for Download @@ -234,83 +284,4 @@ GPG signature. -19 Aug 2005 -Samba 3.0.20 Available for Download - -We are proud to announce the production release of Samba 3.0.20. -This is the latest stable release of Samba. This is the version -that production Samba servers should be running for all current -bug-fixes. This is a substantial upgrade from previous Samba -3.0.x releases. Please read the following explanation, -"What happened to 3.0.15 - 3.0.19?" and the other -major change descriptions in the -Release Notes. - -So what happened to 3.0.15 through 3.0.19? After some -discussion it was deemed that the amount of changes -going into the next Samba 3.0 release needed something to catch -people's attention. Skipping several releases was chosen as -the best solution with the least overhead. There will be no -3.0.15 - 3.0.19 ever released. The next production release -following 3.0.20 should be 3.0.21. You can also read the -http://marc.theaimsgro
svn commit: samba r14825 - in branches/SAMBA_3_0/examples/scripts/shares/perl: .
Author: jerry
Date: 2006-03-30 14:28:33 + (Thu, 30 Mar 2006)
New Revision: 14825
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14825
Log:
add support for max connections parameter
Modified:
branches/SAMBA_3_0/examples/scripts/shares/perl/modify_samba_config.pl
Changeset:
Modified: branches/SAMBA_3_0/examples/scripts/shares/perl/modify_samba_config.pl
===
--- branches/SAMBA_3_0/examples/scripts/shares/perl/modify_samba_config.pl
2006-03-30 14:23:47 UTC (rev 14824)
+++ branches/SAMBA_3_0/examples/scripts/shares/perl/modify_samba_config.pl
2006-03-30 14:28:33 UTC (rev 14825)
@@ -36,7 +36,7 @@
if ($#ARGV == 1) {
$delete_mode = 1;
}
-elsif ($#ARGV == 3) {
+elsif ($#ARGV == 4) {
$add_mode = 1;
}
else {
@@ -101,6 +101,7 @@
if ($add_mode) {
$config{$ARGV[1]}{'path'} = $ARGV[2];
$config{$ARGV[1]}{'comment'} = $ARGV[3];
+ $config{$ARGV[1]}{'max connections'} = $ARGV[4];
}
elsif ($delete_mode) {
delete $config{$ARGV[1]};
svn commit: samba-docs r934 - in tags: .
Author: jerry Date: 2006-03-30 14:24:55 + (Thu, 30 Mar 2006) New Revision: 934 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=934 Log: tagging 3.0.22 Added: tags/release-3-0-22/ Changeset: Copied: tags/release-3-0-22 (from rev 933, tags/release-3-0-21c)
svn commit: samba r14824 - in tags: .
Author: jerry Date: 2006-03-30 14:23:47 + (Thu, 30 Mar 2006) New Revision: 14824 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14824 Log: tagging 3.0.22 Added: tags/release-3-0-22/ Changeset: Copied: tags/release-3-0-22 (from rev 14823, branches/SAMBA_3_0_RELEASE)
svn commit: samba r14823 - in branches/SAMBA_3_0_RELEASE: . source source/nsswitch
Author: jerry
Date: 2006-03-30 14:22:08 + (Thu, 30 Mar 2006)
New Revision: 14823
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14823
Log:
committing changes for 3.0.22
Modified:
branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
branches/SAMBA_3_0_RELEASE/source/VERSION
branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cm.c
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-03-30 13:56:25 UTC (rev
14822)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-03-30 14:22:08 UTC (rev
14823)
@@ -1,3 +1,42 @@
+ ==
+ Release Notes for Samba 3.0.22
+Mar 30, 2006
+ ==
+
+This is a security release of Samba. The Samba 3.0.21 release
+series (including the patch releases a through c) has been
+discovered to expose the clear text of the server's machine
+account credentials in the winbind log files when the log
+level is set to 5 or higher. This defect has been assigned
+the CVE number CAN-2006-1059.
+
+Summary
+===
+
+The machine trust account password is the secret shared
+between a domain controller and a specific member server.
+Access to the member server machine credentials allows
+an attacker to impersonate the server in the domain and
+gain access to additional information regarding domain
+users and groups.
+
+The winbindd daemon included in Samba 3.0.21 and subsequent
+patch releases (3.0.21a-c) writes the clear text of server's
+machine credentials to its log file at level 5. The winbindd
+log files are world readable by default and often log files
+are requested on open mailing lists as tools used to debug
+server misconfigurations.
+
+This affects servers configured to use domain or ads security
+and possibly Samba domain controllers as well (if configured
+to use winbindd).
+
+===
+
+Release Notes for older release follow:
+
+ --
+
===
Release Notes for Samba 3.0.21c
Feb 24, 2006
@@ -3,9 +42,4 @@
===
-This is the latest stable release of Samba. This is the version
-that production Samba servers should be running for all current
-bug-fixes. Please read the following important changes in this
-release.
-
Common bugs fixed in 3.0.21c include:
@@ -122,9 +156,6 @@
connection code in winbindd.
-
-Release Notes for older release follow:
-
--
===
Release Notes for Samba 3.0.21b
Modified: branches/SAMBA_3_0_RELEASE/source/VERSION
===
--- branches/SAMBA_3_0_RELEASE/source/VERSION 2006-03-30 13:56:25 UTC (rev
14822)
+++ branches/SAMBA_3_0_RELEASE/source/VERSION 2006-03-30 14:22:08 UTC (rev
14823)
@@ -25,7 +25,7 @@
SAMBA_VERSION_MAJOR=3
SAMBA_VERSION_MINOR=0
-SAMBA_VERSION_RELEASE=21
+SAMBA_VERSION_RELEASE=22
# If a official release has a serious bug #
@@ -37,7 +37,7 @@
# e.g. SAMBA_VERSION_REVISION=a#
# -> "2.2.8a"#
-SAMBA_VERSION_REVISION=c
+SAMBA_VERSION_REVISION=
# For 'pre' releases the version will be #
Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cm.c
===
--- branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cm.c2006-03-30
13:56:25 UTC (rev 14822)
+++ branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cm.c2006-03-30
14:22:08 UTC (rev 14823)
@@ -294,7 +294,7 @@
DEBUG(5, ("connecting to %s from %s with username "
"[%s]\\[%s]\n", controller, global_myname(),
- machine_account, machine_password));
+ lp_workgroup(), machine_account));
ads_status = cli_session_setup_spnego(*cli,
machine_account,
svn commit: samba-web r942 - in trunk: .
Author: deryck Date: 2006-03-30 13:57:39 + (Thu, 30 Mar 2006) New Revision: 942 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=942 Log: Fix typo and add 4.0.0TP2 announcement to main page. I missed this back when TP2 was released. deryck Modified: trunk/index.html Changeset: Modified: trunk/index.html === --- trunk/index.html2006-03-30 13:54:39 UTC (rev 941) +++ trunk/index.html2006-03-30 13:57:39 UTC (rev 942) @@ -23,7 +23,7 @@ discovered to expose the clear text of the server's machine account credentials in the winbind log files when the log level is set to 5 or higher. Details can be found in the - on-line release notes + online release notes or in the original security announcement for CAN-2006-1059. @@ -40,6 +40,33 @@ Packages for other platforms will be available shortly. +23 Mar 2006 +Samba 4.0.0TP2 Available for Download + +Samba 4 is the ambitious next version of the Samba suite that is being +developed in parallel to the stable 3.0 series. The main emphasis in +this branch is support for the Active Directory logon protocols used +by Windows 2000 and above. + +Samba 4 is currently not yet in a state where it is usable in +production environments. Note the STATUS file, +which aims to document what should and should not work. + +With 3 years of development under our belt since Tridge first proposed +a new Virtual File System (VFS) layer for Samba3 (a project which +eventually lead to our Active Directory efforts), it was felt that we +should create something we could 'show off' to our users. This is the second +Technology Preview (TP), aimed at allowing users, managers and +developers to see how we have progressed, and to invite feedback and +support. + +The uncompressed tarball and patch files have been signed +with the Samba Release Key (ID 157BC95E). The source code can be +downloaded now. See the +release notes +for more information. + +
svn commit: samba r14822 - in branches/SAMBA_4_0/source/ntvfs/common: .
Author: metze
Date: 2006-03-30 13:56:25 + (Thu, 30 Mar 2006)
New Revision: 14822
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14822
Log:
if we use the snum used by the lp_* functions instead of the wire TID,
then don't use tid as name...
metze
Modified:
branches/SAMBA_4_0/source/ntvfs/common/brlock.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/common/brlock.c
===
--- branches/SAMBA_4_0/source/ntvfs/common/brlock.c 2006-03-30 13:11:45 UTC
(rev 14821)
+++ branches/SAMBA_4_0/source/ntvfs/common/brlock.c 2006-03-30 13:56:25 UTC
(rev 14822)
@@ -48,7 +48,7 @@
struct lock_context {
uint32_t server;
uint16_t smbpid;
- uint16_t tid;
+ int snum;
};
/* The data in brlock records is an unsorted linear array of these
@@ -66,7 +66,7 @@
struct brl_context {
struct tdb_wrap *w;
uint32_t server;
- uint16_t tid;
+ int snum;
struct messaging_context *messaging_ctx;
struct lock_struct last_lock;
};
@@ -77,7 +77,7 @@
talloc_free(). We need the messaging_ctx to allow for
pending lock notifications.
*/
-struct brl_context *brl_init(TALLOC_CTX *mem_ctx, uint32_t server, uint16_t
tid,
+struct brl_context *brl_init(TALLOC_CTX *mem_ctx, uint32_t server, int snum,
struct messaging_context *messaging_ctx)
{
char *path;
@@ -98,7 +98,7 @@
}
brl->server = server;
- brl->tid = tid;
+ brl->snum = snum;
brl->messaging_ctx = messaging_ctx;
ZERO_STRUCT(brl->last_lock);
@@ -113,7 +113,7 @@
{
return (ctx1->server == ctx2->server &&
ctx1->smbpid == ctx2->smbpid &&
- ctx1->tid == ctx2->tid);
+ ctx1->snum == ctx2->snum);
}
/*
@@ -200,7 +200,7 @@
static NTSTATUS brl_lock_failed(struct brl_context *brl, struct lock_struct
*lock)
{
if (lock->context.server == brl->last_lock.context.server &&
- lock->context.tid == brl->last_lock.context.tid &&
+ lock->context.snum == brl->last_lock.context.snum &&
lock->fnum == brl->last_lock.fnum &&
lock->start == brl->last_lock.start &&
lock->size == brl->last_lock.size) {
@@ -263,7 +263,7 @@
lock.context.smbpid = smbpid;
lock.context.server = brl->server;
- lock.context.tid = brl->tid;
+ lock.context.snum = brl->snum;
lock.start = start;
lock.size = size;
lock.fnum = fnum;
@@ -398,7 +398,7 @@
context.smbpid = smbpid;
context.server = brl->server;
- context.tid = brl->tid;
+ context.snum = brl->snum;
/* there are existing locks - find a match */
locks = (struct lock_struct *)dbuf.dptr;
@@ -548,7 +548,7 @@
lock.context.smbpid = smbpid;
lock.context.server = brl->server;
- lock.context.tid = brl->tid;
+ lock.context.snum = brl->snum;
lock.start = start;
lock.size = size;
lock.fnum = fnum;
@@ -601,7 +601,7 @@
for (i=0; icontext.tid == brl->tid &&
+ if (lock->context.snum == brl->snum &&
lock->context.server == brl->server &&
lock->fnum == fnum) {
/* found it - delete it */
svn commit: samba-web r941 - in trunk/news/releases: .
Author: deryck Date: 2006-03-30 13:54:39 + (Thu, 30 Mar 2006) New Revision: 941 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=941 Log: Add release announcement to news. deryck Added: trunk/news/releases/3.0.22.html Changeset: Added: trunk/news/releases/3.0.22.html === --- trunk/news/releases/3.0.22.html 2006-03-30 13:27:13 UTC (rev 940) +++ trunk/news/releases/3.0.22.html 2006-03-30 13:54:39 UTC (rev 941) @@ -0,0 +1,26 @@ +Security Release: Samba 3.0.22 Available for Download + + +This is a security release of Samba. The Samba 3.0.21 release + series (including the patch releases a through c) has been + discovered to expose the clear text of the server's machine + account credentials in the winbind log files when the log + level is set to 5 or higher. Details can be found in the + online release notes + or in the original security + announcement for CAN-2006-1059. + +The Samba 3.0.22 + source code can be downloaded now. The GnuPG + signature for the uncompressed tarball is also available. + If you prefer to download just the diff from 3.0.21c to 3.0.22, the + patch file + (gpg signature) is also available. + Precompiled packages for Fedora Core 4, RedHat 9, and Solaris + are available in the + Binary_Packages download area. + Packages for other platforms will be available shortly. + + +
Re: svn commit: samba r14821 - in trunk/source/script/tests: .
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] schrieb: > Log: > sync test_posix_p3.sh with test_posix.sh from samba4 > but only run the BASE-* tests and ignore some more than in samba4 Hi *, trunk currently fails LOCK4 and LOCK5, and SAMBA_3_0 passes... metze -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFEK91km70gjA5TCD8RAm//AKDQOIyJfi67nDdf8GOpsQ+aNH4V9gCgkWvX sNw3YuCNxC7Y+3GbPcv8Z6U= =tKBL -END PGP SIGNATURE-
svn commit: samba-web r940 - in trunk: .
Author: jerry Date: 2006-03-30 13:27:13 + (Thu, 30 Mar 2006) New Revision: 940 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=940 Log: chnaging the headline to highlight the security announcment Modified: trunk/index.html Changeset: Modified: trunk/index.html === --- trunk/index.html2006-03-30 13:22:10 UTC (rev 939) +++ trunk/index.html2006-03-30 13:27:13 UTC (rev 940) @@ -16,7 +16,7 @@ Current Release 30 Mar 2006 -Samba 3.0.22 Available for Download +Security Release: Samba 3.0.22 Available for Download This is a security release of Samba. The Samba 3.0.21 release series (including the patch releases a through c) has been
svn commit: samba-web r939 - in trunk: .
Author: jerry Date: 2006-03-30 13:22:10 + (Thu, 30 Mar 2006) New Revision: 939 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=939 Log: fix a few bad links Modified: trunk/index.html Changeset: Modified: trunk/index.html === --- trunk/index.html2006-03-30 13:19:59 UTC (rev 938) +++ trunk/index.html2006-03-30 13:22:10 UTC (rev 939) @@ -23,8 +23,8 @@ discovered to expose the clear text of the server's machine account credentials in the winbind log files when the log level is set to 5 or higher. Details can be found in the - on-line release notes - or in the original security + on-line release notes + or in the original security announcement for CAN-2006-1059. The Samba 3.0.22 @@ -32,7 +32,7 @@ href="/samba/ftp/samba-3.0.22.tar.asc">GnuPG signature for the uncompressed tarball is also available. If you prefer to download just the diff from 3.0.21c to 3.0.22, the - patch file + patch file (gpg signature) is also available. Precompiled packages for Fedora Core 4, RedHat 9, and Solaris are available in the
svn commit: samba-web r938 - in trunk: . history security
Author: jerry Date: 2006-03-30 13:19:59 + (Thu, 30 Mar 2006) New Revision: 938 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=938 Log: announcing 3.0.22 security release Added: trunk/history/samba-3.0.22.html trunk/security/CAN-2006-1059.html Modified: trunk/history/security.html trunk/index.html Changeset: Sorry, the patch is too large (6247 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=938
svn commit: samba r14821 - in trunk/source/script/tests: .
Author: metze Date: 2006-03-30 13:11:45 + (Thu, 30 Mar 2006) New Revision: 14821 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14821 Log: sync test_posix_p3.sh with test_posix.sh from samba4 but only run the BASE-* tests and ignore some more than in samba4 metze Modified: trunk/source/script/tests/test_posix_s3.sh Changeset: Modified: trunk/source/script/tests/test_posix_s3.sh === --- trunk/source/script/tests/test_posix_s3.sh 2006-03-30 13:11:08 UTC (rev 14820) +++ trunk/source/script/tests/test_posix_s3.sh 2006-03-30 13:11:45 UTC (rev 14821) @@ -19,29 +19,40 @@ incdir=`dirname $0` . $incdir/test_functions.sh -tests="BASE-FDPASS BASE-LOCK1 BASE-LOCK2 BASE-LOCK3 BASE-LOCK4" -tests="$tests BASE-LOCK5 BASE-LOCK6 BASE-LOCK7 BASE-UNLINK BASE-ATTR" -tests="$tests BASE-DIR1 BASE-DIR2 BASE-VUID" -tests="$tests BASE-DENY1 BASE-DENY2 BASE-TCON BASE-TCONDEV BASE-RW1" -tests="$tests BASE-DENY3 BASE-XCOPY BASE-OPEN BASE-DENYDOS" -tests="$tests BASE-PROPERTIES BASE-MANGLE BASE-DELETE" -tests="$tests BASE-CHKPATH BASE-SECLEAK BASE-TRANS2 BASE-NEGNOWAIT" -tests="$tests BASE-NTDENY1 BASE-NTDENY2 BASE-RENAME BASE-OPENATTR BASE-DISCONNECT" -tests="$tests RAW-QFSINFO RAW-QFILEINFO RAW-SFILEINFO-BUG RAW-SFILEINFO" -tests="$tests RAW-LOCK RAW-MKDIR RAW-SEEK RAW-CONTEXT RAW-MUX RAW-OPEN RAW-WRITE" -tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-SEARCH RAW-CHKPATH RAW-RENAME" -tests="$tests RAW-EAS RAW-STREAMS RAW-ACLS" +base="BASE-ATTR BASE-CHARSET BASE-CHKPATH BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE" +base="$base BASE-DENY1 BASE-DENY2 BASE-DENY3 BASE-DENYDOS BASE-DIR1 BASE-DIR2" +base="$base BASE-DISCONNECT BASE-FDPASS BASE-LOCK1 BASE-LOCK2 BASE-LOCK3 BASE-LOCK4" +base="$base BASE-LOCK5 BASE-LOCK6 BASE-LOCK7 BASE-MANGLE BASE-NEGNOWAIT BASE-NTDENY1" +base="$base BASE-NTDENY2 BASE-OPEN BASE-OPENATTR BASE-PROPERTIES BASE-RENAME BASE-RW1" +base="$base BASE-SECLEAK BASE-TCON BASE-TCONDEV BASE-TRANS2 BASE-UNLINK BASE-VUID" +base="$base BASE-XCOPY" -soon="BASE-CHARSET RAW-OPLOCK RAW-NOTIFY BASE-DELAYWRITE" -#echo "WARNING: Skipping tests $soon" +raw="RAW-ACLS RAW-CHKPATH RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS" +raw="$raw RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK" +raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK" +raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE" -tests="BASE-FDPASS BASE-VUID BASE-UNLINK BASE-ATTR BASE-DIR2 BASE-TCON BASE-OPEN BASE-CHKPATH" +tests="$base" +skipped="BASE-CHARSET BASE-DELAYWRITE BASE-DELETE BASE-DENY1 BASE-OPENATTR BASE-TCONDEV" + +echo "WARNING: Skipping tests $skipped" + failed=0 for t in $tests; do if [ ! -z "$start" -a "$start" != $t ]; then continue; fi +skip=0 +for s in $skipped; do + if [ x"$s" = x"$t" ]; then + skip=1; + break; + fi +done +if [ $skip = 1 ]; then + continue; +fi start="" name="$t" testit "$name" $VALGRIND $SMBTORTURE4 $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
svn commit: samba r14820 - in branches/SAMBA_3_0/source/script/tests: .
Author: metze Date: 2006-03-30 13:11:08 + (Thu, 30 Mar 2006) New Revision: 14820 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14820 Log: sync test_posix_p3.sh with test_posix.sh from samba4 but only run the BASE-* tests and ignore some more than in samba4 metze Modified: branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh Changeset: Modified: branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh === --- branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh 2006-03-30 12:35:25 UTC (rev 14819) +++ branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh 2006-03-30 13:11:08 UTC (rev 14820) @@ -19,29 +19,40 @@ incdir=`dirname $0` . $incdir/test_functions.sh -tests="BASE-FDPASS BASE-LOCK1 BASE-LOCK2 BASE-LOCK3 BASE-LOCK4" -tests="$tests BASE-LOCK5 BASE-LOCK6 BASE-LOCK7 BASE-UNLINK BASE-ATTR" -tests="$tests BASE-DIR1 BASE-DIR2 BASE-VUID" -tests="$tests BASE-DENY1 BASE-DENY2 BASE-TCON BASE-TCONDEV BASE-RW1" -tests="$tests BASE-DENY3 BASE-XCOPY BASE-OPEN BASE-DENYDOS" -tests="$tests BASE-PROPERTIES BASE-MANGLE BASE-DELETE" -tests="$tests BASE-CHKPATH BASE-SECLEAK BASE-TRANS2 BASE-NEGNOWAIT" -tests="$tests BASE-NTDENY1 BASE-NTDENY2 BASE-RENAME BASE-OPENATTR BASE-DISCONNECT" -tests="$tests RAW-QFSINFO RAW-QFILEINFO RAW-SFILEINFO-BUG RAW-SFILEINFO" -tests="$tests RAW-LOCK RAW-MKDIR RAW-SEEK RAW-CONTEXT RAW-MUX RAW-OPEN RAW-WRITE" -tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-SEARCH RAW-CHKPATH RAW-RENAME" -tests="$tests RAW-EAS RAW-STREAMS RAW-ACLS" +base="BASE-ATTR BASE-CHARSET BASE-CHKPATH BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE" +base="$base BASE-DENY1 BASE-DENY2 BASE-DENY3 BASE-DENYDOS BASE-DIR1 BASE-DIR2" +base="$base BASE-DISCONNECT BASE-FDPASS BASE-LOCK1 BASE-LOCK2 BASE-LOCK3 BASE-LOCK4" +base="$base BASE-LOCK5 BASE-LOCK6 BASE-LOCK7 BASE-MANGLE BASE-NEGNOWAIT BASE-NTDENY1" +base="$base BASE-NTDENY2 BASE-OPEN BASE-OPENATTR BASE-PROPERTIES BASE-RENAME BASE-RW1" +base="$base BASE-SECLEAK BASE-TCON BASE-TCONDEV BASE-TRANS2 BASE-UNLINK BASE-VUID" +base="$base BASE-XCOPY" -soon="BASE-CHARSET RAW-OPLOCK RAW-NOTIFY BASE-DELAYWRITE" -#echo "WARNING: Skipping tests $soon" +raw="RAW-ACLS RAW-CHKPATH RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS" +raw="$raw RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK" +raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK" +raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE" -tests="BASE-FDPASS BASE-VUID BASE-UNLINK BASE-ATTR BASE-DIR2 BASE-TCON BASE-OPEN BASE-CHKPATH" +tests="$base" +skipped="BASE-CHARSET BASE-DELAYWRITE BASE-DELETE BASE-DENY1 BASE-OPENATTR BASE-TCONDEV" + +echo "WARNING: Skipping tests $skipped" + failed=0 for t in $tests; do if [ ! -z "$start" -a "$start" != $t ]; then continue; fi +skip=0 +for s in $skipped; do + if [ x"$s" = x"$t" ]; then + skip=1; + break; + fi +done +if [ $skip = 1 ]; then + continue; +fi start="" name="$t" testit "$name" $VALGRIND $SMBTORTURE4 $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
svn commit: samba r14819 - in branches/SAMBA_4_0/source/script/tests: .
Author: metze Date: 2006-03-30 12:35:25 + (Thu, 30 Mar 2006) New Revision: 14819 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14819 Log: list all tests smbtorture offers and explicit list tests for skipping metze Modified: branches/SAMBA_4_0/source/script/tests/test_posix.sh Changeset: Modified: branches/SAMBA_4_0/source/script/tests/test_posix.sh === --- branches/SAMBA_4_0/source/script/tests/test_posix.sh2006-03-30 12:16:25 UTC (rev 14818) +++ branches/SAMBA_4_0/source/script/tests/test_posix.sh2006-03-30 12:35:25 UTC (rev 14819) @@ -20,28 +20,40 @@ incdir=`dirname $0` . $incdir/test_functions.sh -tests="BASE-FDPASS BASE-LOCK1 BASE-LOCK2 BASE-LOCK3 BASE-LOCK4" -tests="$tests BASE-LOCK5 BASE-LOCK6 BASE-LOCK7 BASE-UNLINK BASE-ATTR" -tests="$tests BASE-DIR1 BASE-DIR2 BASE-VUID" -tests="$tests BASE-DENY1 BASE-DENY2 BASE-TCON BASE-TCONDEV BASE-RW1" -tests="$tests BASE-DENY3 BASE-XCOPY BASE-OPEN BASE-DENYDOS" -tests="$tests BASE-PROPERTIES BASE-MANGLE BASE-DELETE" -tests="$tests BASE-CHKPATH BASE-SECLEAK BASE-TRANS2 BASE-NEGNOWAIT" -tests="$tests BASE-NTDENY1 BASE-NTDENY2 BASE-RENAME BASE-OPENATTR BASE-DISCONNECT" -tests="$tests RAW-QFSINFO RAW-QFILEINFO RAW-SFILEINFO-BUG RAW-SFILEINFO" -tests="$tests RAW-LOCK RAW-MKDIR RAW-SEEK RAW-CONTEXT RAW-MUX RAW-OPEN RAW-WRITE" -tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-SEARCH RAW-CHKPATH RAW-RENAME" -tests="$tests RAW-EAS RAW-STREAMS RAW-ACLS" +base="BASE-ATTR BASE-CHARSET BASE-CHKPATH BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE" +base="$base BASE-DENY1 BASE-DENY2 BASE-DENY3 BASE-DENYDOS BASE-DIR1 BASE-DIR2" +base="$base BASE-DISCONNECT BASE-FDPASS BASE-LOCK1 BASE-LOCK2 BASE-LOCK3 BASE-LOCK4" +base="$base BASE-LOCK5 BASE-LOCK6 BASE-LOCK7 BASE-MANGLE BASE-NEGNOWAIT BASE-NTDENY1" +base="$base BASE-NTDENY2 BASE-OPEN BASE-OPENATTR BASE-PROPERTIES BASE-RENAME BASE-RW1" +base="$base BASE-SECLEAK BASE-TCON BASE-TCONDEV BASE-TRANS2 BASE-UNLINK BASE-VUID" +base="$base BASE-XCOPY" -soon="BASE-CHARSET RAW-OPLOCK RAW-NOTIFY BASE-DELAYWRITE" +raw="RAW-ACLS RAW-CHKPATH RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS" +raw="$raw RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK" +raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK" +raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE" -echo "WARNING: Skipping tests $soon" +tests="$base $raw" +skipped="BASE-CHARSET BASE-DELAYWRITE RAW-COMPOSITE RAW-OPLOCK" + +echo "WARNING: Skipping tests $skipped" + failed=0 for t in $tests; do if [ ! -z "$start" -a "$start" != $t ]; then continue; fi +skip=0 +for s in $skipped; do + if [ x"$s" = x"$t" ]; then + skip=1; + break; + fi +done +if [ $skip = 1 ]; then + continue; +fi start="" name="$t" testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
svn commit: samba r14818 - in branches/SAMBA_4_0/source/torture: .
Author: metze
Date: 2006-03-30 12:16:25 + (Thu, 30 Mar 2006)
New Revision: 14818
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14818
Log:
give an error on an unknown test
so we catch typos in the make test scripts
metze
Modified:
branches/SAMBA_4_0/source/torture/smbtorture.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/smbtorture.c
===
--- branches/SAMBA_4_0/source/torture/smbtorture.c 2006-03-30 11:58:46 UTC
(rev 14817)
+++ branches/SAMBA_4_0/source/torture/smbtorture.c 2006-03-30 12:16:25 UTC
(rev 14818)
@@ -83,6 +83,7 @@
if (!matched) {
printf("Unknown torture operation '%s'\n", name);
+ ret = False;
}
return ret;
svn commit: samba r14817 - in branches/SAMBA_4_0/source/torture: . rap
Author: metze
Date: 2006-03-30 11:58:46 + (Thu, 30 Mar 2006)
New Revision: 14817
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14817
Log:
rename some tests
tridge: is SCAN-EAMAX ok?
metze
Modified:
branches/SAMBA_4_0/source/torture/rap/rap.c
branches/SAMBA_4_0/source/torture/torture.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/rap/rap.c
===
--- branches/SAMBA_4_0/source/torture/rap/rap.c 2006-03-30 11:20:47 UTC (rev
14816)
+++ branches/SAMBA_4_0/source/torture/rap/rap.c 2006-03-30 11:58:46 UTC (rev
14817)
@@ -428,7 +428,7 @@
return res;
}
-BOOL torture_raw_rap(struct torture_context *torture)
+BOOL torture_rap_basic(struct torture_context *torture)
{
struct smbcli_state *cli;
BOOL ret = True;
@@ -438,7 +438,7 @@
return False;
}
- mem_ctx = talloc_init("torture_raw_rap");
+ mem_ctx = talloc_init("torture_rap_basic");
if (!test_rap(cli)) {
ret = False;
Modified: branches/SAMBA_4_0/source/torture/torture.c
===
--- branches/SAMBA_4_0/source/torture/torture.c 2006-03-30 11:20:47 UTC (rev
14816)
+++ branches/SAMBA_4_0/source/torture/torture.c 2006-03-30 11:58:46 UTC (rev
14817)
@@ -610,10 +610,8 @@
{"RAW-RENAME", torture_raw_rename, 0},
{"RAW-SEEK", torture_raw_seek, 0},
{"RAW-EAS", torture_raw_eas, 0},
- {"RAW-EAMAX", torture_max_eas, 0},
{"RAW-STREAMS", torture_raw_streams, 0},
{"RAW-ACLS", torture_raw_acls, 0},
- {"RAW-RAP", torture_raw_rap, 0},
{"RAW-COMPOSITE", torture_raw_composite, 0},
/* SMB2 tests */
@@ -626,11 +624,15 @@
{"SMB2-SETINFO", torture_smb2_setinfo, 0},
{"SMB2-FIND", torture_smb2_find, 0},
+ /* RAP tests */
+ {"RAP-BASIC", torture_rap_basic, 0},
+
/* protocol scanners */
{"SCAN-MAXFID", NULL, run_maxfidtest},
{"SCAN-PIPE_NUMBER", run_pipe_number, 0},
{"SCAN-IOCTL", torture_ioctl_test, 0},
{"SCAN-RAP", torture_rap_scan, 0},
+ {"SCAN-EAMAX", torture_max_eas, 0},
/* local (no server) testers */
{"LOCAL-NTLMSSP", torture_ntlmssp_self_check, 0},
svn commit: samba r14816 - in branches/SAMBA_4_0/source: auth/gensec build/m4 lib/replace
Author: jelmer
Date: 2006-03-30 11:20:47 + (Thu, 30 Mar 2006)
New Revision: 14816
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14816
Log:
Simplify test for comparison_fn_t
Modified:
branches/SAMBA_4_0/source/auth/gensec/gensec.h
branches/SAMBA_4_0/source/build/m4/rewrite.m4
branches/SAMBA_4_0/source/lib/replace/config.m4
Changeset:
Modified: branches/SAMBA_4_0/source/auth/gensec/gensec.h
===
--- branches/SAMBA_4_0/source/auth/gensec/gensec.h 2006-03-30 11:07:17 UTC
(rev 14815)
+++ branches/SAMBA_4_0/source/auth/gensec/gensec.h 2006-03-30 11:20:47 UTC
(rev 14816)
@@ -24,6 +24,8 @@
#ifndef __GENSEC_H__
#define __GENSEC_H__
+#include "core.h"
+
#define GENSEC_OID_NTLMSSP "1 3 6 1 4 1 311 2 2 10"
#define GENSEC_OID_SPNEGO "1 3 6 1 5 5 2"
#define GENSEC_OID_KERBEROS5 "1 2 840 113554 1 2 2"
Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4
===
--- branches/SAMBA_4_0/source/build/m4/rewrite.m4 2006-03-30 11:07:17 UTC
(rev 14815)
+++ branches/SAMBA_4_0/source/build/m4/rewrite.m4 2006-03-30 11:20:47 UTC
(rev 14816)
@@ -714,23 +714,3 @@
AC_DEFINE(STAT_STATFS2_FS_DATA,1,[Whether statfs requires 2 arguments and
struct fs_data is available])
fi
fi
-
-
-
-###
-# Check for comparison_fn_t
-AC_CACHE_CHECK([for comparison_fn_t],samba_cv_HAVE_COMPARISON_FN_T,[
-AC_TRY_COMPILE([
-#include
-int list_find(const void *needle,
- const void *base, size_t nmemb, size_t size, comparison_fn_t
comp_fn)
-{
- return 1;
-}
-],[],
-samba_cv_HAVE_COMPARISON_FN_T=yes,samba_cv_HAVE_COMPARISON_FN_T=no)
-])
-if test x"$samba_cv_HAVE_COMPARISON_FN_T" = x"yes"; then
- AC_DEFINE(HAVE_COMPARISON_FN_T,1,[Whether or not we have
comparison_fn_t])
-fi
-
Modified: branches/SAMBA_4_0/source/lib/replace/config.m4
===
--- branches/SAMBA_4_0/source/lib/replace/config.m4 2006-03-30 11:07:17 UTC
(rev 14815)
+++ branches/SAMBA_4_0/source/lib/replace/config.m4 2006-03-30 11:20:47 UTC
(rev 14816)
@@ -11,6 +11,8 @@
AC_CHECK_TYPE(u_int16_t, unsigned short)
AC_CHECK_TYPE(u_int8_t, unsigned char)
AC_CHECK_TYPE(ssize_t, int)
+AC_CHECK_TYPE(comparison_fn_t,
+[AC_DEFINE(HAVE_COMPARISON_FN_T, 1,[Whether or not we have comparison_fn_t])])
AC_CACHE_CHECK([for broken inet_ntoa],samba_cv_REPLACE_INET_NTOA,[
AC_TRY_RUN([
svn commit: samba r14815 - in branches/SAMBA_4_0/source/script/tests: .
Author: metze Date: 2006-03-30 11:07:17 + (Thu, 30 Mar 2006) New Revision: 14815 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14815 Log: BASE-DIR doesn't exists... metze Modified: branches/SAMBA_4_0/source/script/tests/test_posix.sh Changeset: Modified: branches/SAMBA_4_0/source/script/tests/test_posix.sh === --- branches/SAMBA_4_0/source/script/tests/test_posix.sh2006-03-30 10:53:40 UTC (rev 14814) +++ branches/SAMBA_4_0/source/script/tests/test_posix.sh2006-03-30 11:07:17 UTC (rev 14815) @@ -22,7 +22,7 @@ tests="BASE-FDPASS BASE-LOCK1 BASE-LOCK2 BASE-LOCK3 BASE-LOCK4" tests="$tests BASE-LOCK5 BASE-LOCK6 BASE-LOCK7 BASE-UNLINK BASE-ATTR" -tests="$tests BASE-DIR BASE-DIR1 BASE-DIR2 BASE-VUID" +tests="$tests BASE-DIR1 BASE-DIR2 BASE-VUID" tests="$tests BASE-DENY1 BASE-DENY2 BASE-TCON BASE-TCONDEV BASE-RW1" tests="$tests BASE-DENY3 BASE-XCOPY BASE-OPEN BASE-DENYDOS" tests="$tests BASE-PROPERTIES BASE-MANGLE BASE-DELETE"
svn commit: samba r14814 - in branches/SAMBA_4_0/source/script/tests: .
Author: metze Date: 2006-03-30 10:53:40 + (Thu, 30 Mar 2006) New Revision: 14814 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14814 Log: also run the BASE-DIR test with 'make test' metze Modified: branches/SAMBA_4_0/source/script/tests/test_posix.sh Changeset: Modified: branches/SAMBA_4_0/source/script/tests/test_posix.sh === --- branches/SAMBA_4_0/source/script/tests/test_posix.sh2006-03-30 10:46:36 UTC (rev 14813) +++ branches/SAMBA_4_0/source/script/tests/test_posix.sh2006-03-30 10:53:40 UTC (rev 14814) @@ -22,7 +22,7 @@ tests="BASE-FDPASS BASE-LOCK1 BASE-LOCK2 BASE-LOCK3 BASE-LOCK4" tests="$tests BASE-LOCK5 BASE-LOCK6 BASE-LOCK7 BASE-UNLINK BASE-ATTR" -tests="$tests BASE-DIR1 BASE-DIR2 BASE-VUID" +tests="$tests BASE-DIR BASE-DIR1 BASE-DIR2 BASE-VUID" tests="$tests BASE-DENY1 BASE-DENY2 BASE-TCON BASE-TCONDEV BASE-RW1" tests="$tests BASE-DENY3 BASE-XCOPY BASE-OPEN BASE-DENYDOS" tests="$tests BASE-PROPERTIES BASE-MANGLE BASE-DELETE"
svn commit: samba r14813 - in branches/SAMBA_4_0/source/build/m4: .
Author: jelmer Date: 2006-03-30 10:46:36 + (Thu, 30 Mar 2006) New Revision: 14813 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14813 Log: Remove headers already checked for earlier or not used. Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4 Changeset: Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4 === --- branches/SAMBA_4_0/source/build/m4/rewrite.m4 2006-03-30 10:29:41 UTC (rev 14812) +++ branches/SAMBA_4_0/source/build/m4/rewrite.m4 2006-03-30 10:46:36 UTC (rev 14813) @@ -59,9 +59,8 @@ AC_CHECK_HEADERS(sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h) AC_CHECK_HEADERS(fnmatch.h pwd.h sys/termio.h sys/time.h sys/statfs.h sys/statvfs.h stdarg.h) AC_CHECK_HEADERS(stdint.h inttypes.h locale.h shadow.h) -AC_CHECK_HEADERS(nss.h nss_common.h ns_api.h sys/security.h security/pam_appl.h) +AC_CHECK_HEADERS(nss.h nss_common.h ns_api.h sys/security.h) AC_CHECK_HEADERS(sys/capability.h sys/acl.h) -AC_CHECK_HEADERS(alloca.h) AC_CHECK_HEADERS(sys/mount.h, , , [AC_INCLUDES_DEFAULT #ifdef HAVE_SYS_PARAM_H
svn commit: samba r14812 - in branches/SAMBA_4_0/source/build/m4: .
Author: jelmer Date: 2006-03-30 10:29:41 + (Thu, 30 Mar 2006) New Revision: 14812 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14812 Log: Fix typos Modified: branches/SAMBA_4_0/source/build/m4/check_perl.m4 Changeset: Modified: branches/SAMBA_4_0/source/build/m4/check_perl.m4 === --- branches/SAMBA_4_0/source/build/m4/check_perl.m42006-03-30 10:16:39 UTC (rev 14811) +++ branches/SAMBA_4_0/source/build/m4/check_perl.m42006-03-30 10:29:41 UTC (rev 14812) @@ -8,7 +8,7 @@ case "$host_os" in *irix*) # On IRIX, we prefer Freeware or Nekoware Perl, because the - # system perl so ancient. + # system perl is so ancient. AC_PATH_PROG(PERL, perl, "", "/usr/freeware/bin:/usr/nekoware/bin:$PATH") ;; *) @@ -17,7 +17,7 @@ esac if test x"$PERL" = x""; then - AC_MSG_WARN([No version of perl was not found!]) + AC_MSG_WARN([No version of perl was found!]) AC_MSG_ERROR([Please install perl from http://www.perl.com/]) fi if test x"$debug" = x"yes";then
svn commit: samba r14811 - in trunk/source/script/tests: .
Author: metze Date: 2006-03-30 10:16:39 + (Thu, 30 Mar 2006) New Revision: 14811 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14811 Log: make scripts executable metze Modified: trunk/source/script/tests/test_smbclient_s3.sh trunk/source/script/tests/test_smbtorture_s3.sh Changeset: Property changes on: trunk/source/script/tests/test_smbclient_s3.sh ___ Name: svn:executable + * Property changes on: trunk/source/script/tests/test_smbtorture_s3.sh ___ Name: svn:executable + *
svn commit: samba r14810 - in trunk/source/script/tests: .
Author: metze
Date: 2006-03-30 09:34:36 + (Thu, 30 Mar 2006)
New Revision: 14810
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14810
Log:
- add my email address
- fix usage()
- remove unused var
metze
Modified:
trunk/source/script/tests/timelimit.c
Changeset:
Modified: trunk/source/script/tests/timelimit.c
===
--- trunk/source/script/tests/timelimit.c 2006-03-30 09:34:02 UTC (rev
14809)
+++ trunk/source/script/tests/timelimit.c 2006-03-30 09:34:36 UTC (rev
14810)
@@ -1,5 +1,6 @@
/* run a command with a limited timeout
[EMAIL PROTECTED], June 2005
+ [EMAIL PROTECTED], March 2006
attempt to be as portable as possible (fighting posix all the way)
*/
@@ -17,9 +18,11 @@
static void usage(void)
{
printf("usage: timelimit \n");
- printf(" SIGALRM - passes SIGKILL to command's process group and
exit(1)\n");
printf(" SIGUSR1 - passes SIGTERM to command's process group\n");
- printf(" SIGTERM - passes SIGTERM to command's process group and
exit(0)\n");
+ printf(" SIGALRM - passes SIGTERM to command's process group\n");
+ printf(" after 5s SIGKILL will be passed and exit(1)\n");
+ printf(" SIGTERM - passes SIGTERM to command's process group\n");
+ printf(" after 1s SIGKILL will be passed and exit(1)\n");
}
static void sig_alrm_kill(int sig)
@@ -67,7 +70,6 @@
int main(int argc, char *argv[])
{
int maxtime, ret=1;
- pid_t pgid;
if (argc < 3) {
usage();
svn commit: samba r14809 - in branches/SAMBA_3_0/source/script/tests: .
Author: metze
Date: 2006-03-30 09:34:02 + (Thu, 30 Mar 2006)
New Revision: 14809
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14809
Log:
- add my email address
- fix usage()
- remove unused var
metze
Modified:
branches/SAMBA_3_0/source/script/tests/timelimit.c
Changeset:
Modified: branches/SAMBA_3_0/source/script/tests/timelimit.c
===
--- branches/SAMBA_3_0/source/script/tests/timelimit.c 2006-03-30 09:24:31 UTC
(rev 14808)
+++ branches/SAMBA_3_0/source/script/tests/timelimit.c 2006-03-30 09:34:02 UTC
(rev 14809)
@@ -1,5 +1,6 @@
/* run a command with a limited timeout
[EMAIL PROTECTED], June 2005
+ [EMAIL PROTECTED], March 2006
attempt to be as portable as possible (fighting posix all the way)
*/
@@ -17,9 +18,11 @@
static void usage(void)
{
printf("usage: timelimit \n");
- printf(" SIGALRM - passes SIGKILL to command's process group and
exit(1)\n");
printf(" SIGUSR1 - passes SIGTERM to command's process group\n");
- printf(" SIGTERM - passes SIGTERM to command's process group and
exit(0)\n");
+ printf(" SIGALRM - passes SIGTERM to command's process group\n");
+ printf(" after 5s SIGKILL will be passed and exit(1)\n");
+ printf(" SIGTERM - passes SIGTERM to command's process group\n");
+ printf(" after 1s SIGKILL will be passed and exit(1)\n");
}
static void sig_alrm_kill(int sig)
@@ -67,7 +70,6 @@
int main(int argc, char *argv[])
{
int maxtime, ret=1;
- pid_t pgid;
if (argc < 3) {
usage();
svn commit: samba r14808 - in branches/SAMBA_4_0/source/ntvfs/posix: .
Author: tridge
Date: 2006-03-30 09:24:31 + (Thu, 30 Mar 2006)
New Revision: 14808
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14808
Log:
added notify_trigger() calls for rename and setfileinfo calls
Modified:
branches/SAMBA_4_0/source/ntvfs/posix/pvfs_rename.c
branches/SAMBA_4_0/source/ntvfs/posix/pvfs_setfileinfo.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_rename.c
===
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_rename.c 2006-03-30 08:44:28 UTC
(rev 14807)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_rename.c 2006-03-30 09:24:31 UTC
(rev 14808)
@@ -180,6 +180,13 @@
status = odb_rename(lck, fname2);
+ if (NT_STATUS_IS_OK(status)) {
+ notify_trigger(pvfs->notify_context,
+ NOTIFY_ACTION_MODIFIED,
+ FILE_NOTIFY_CHANGE_FILE_NAME,
+ name1->full_name);
+ }
+
failed:
talloc_free(mem_ctx);
return status;
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_setfileinfo.c
===
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_setfileinfo.c2006-03-30
08:44:28 UTC (rev 14807)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_setfileinfo.c2006-03-30
09:24:31 UTC (rev 14808)
@@ -151,6 +151,11 @@
return pvfs_map_errno(pvfs, errno);
}
+ notify_trigger(pvfs->notify_context,
+ NOTIFY_ACTION_MODIFIED,
+ FILE_NOTIFY_CHANGE_FILE_NAME,
+ name->full_name);
+
name->full_name = talloc_steal(name, name2->full_name);
name->original_name = talloc_steal(name, name2->original_name);
@@ -225,6 +230,11 @@
return status;
}
+ notify_trigger(pvfs->notify_context,
+ NOTIFY_ACTION_MODIFIED,
+ FILE_NOTIFY_CHANGE_EA,
+ name->full_name);
+
name->dos.ea_size = 4;
for (i=0;inum_eas;i++) {
name->dos.ea_size += 4 + strlen(ealist->eas[i].name)+1 +
@@ -249,6 +259,7 @@
struct pvfs_filename newstats;
NTSTATUS status;
uint32_t access_needed;
+ uint32_t change_mask = 0;
f = pvfs_find_fd(pvfs, req, info->generic.in.file.fnum);
if (!f) {
@@ -287,6 +298,7 @@
case RAW_SFILEINFO_STANDARD:
if (!null_time(info->setattre.in.create_time)) {
unix_to_nt_time(&newstats.dos.create_time,
info->setattre.in.create_time);
+ change_mask |= FILE_NOTIFY_CHANGE_CREATION;
}
if (!null_time(info->setattre.in.access_time)) {
unix_to_nt_time(&newstats.dos.access_time,
info->setattre.in.access_time);
@@ -305,6 +317,7 @@
case RAW_SFILEINFO_BASIC_INFORMATION:
if (!null_nttime(info->basic_info.in.create_time)) {
newstats.dos.create_time =
info->basic_info.in.create_time;
+ change_mask |= FILE_NOTIFY_CHANGE_CREATION;
}
if (!null_nttime(info->basic_info.in.access_time)) {
newstats.dos.access_time =
info->basic_info.in.access_time;
@@ -362,6 +375,10 @@
info);
case RAW_SFILEINFO_SEC_DESC:
+ notify_trigger(pvfs->notify_context,
+ NOTIFY_ACTION_MODIFIED,
+ FILE_NOTIFY_CHANGE_SECURITY,
+ h->name->full_name);
return pvfs_acl_set(pvfs, req, h->name, h->fd, f->access_mask,
info);
default:
@@ -378,6 +395,8 @@
if (!NT_STATUS_IS_OK(status)) {
return status;
}
+
+ change_mask |= FILE_NOTIFY_CHANGE_STREAM_SIZE;
} else {
int ret;
if (f->access_mask &
@@ -389,6 +408,7 @@
if (ret == -1) {
return pvfs_map_errno(pvfs, errno);
}
+ change_mask |= FILE_NOTIFY_CHANGE_SIZE;
}
}
@@ -396,9 +416,11 @@
ZERO_STRUCT(unix_times);
if (newstats.dos.access_time != h->name->dos.access_time) {
unix_times.actime = nt_time_to_unix(newstats.dos.access_time);
+ change_mask |= FILE_NOTIFY_CHANGE_LAST_ACCESS;
}
if (newstats.dos.write_time != h->name->dos.write_time) {
unix_times.modtime = nt_time_to_unix(newstats.dos.write_time);
+ change_mask |= FILE_NOTIFY_CHANGE_LAST_WRITE;
}
if (unix_times.actime != 0 || unix_times.modtime != 0) {
svn commit: samba r14807 - in branches/SAMBA_4_0/source/smb_server/smb: .
Author: tridge
Date: 2006-03-30 08:44:28 + (Thu, 30 Mar 2006)
New Revision: 14807
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14807
Log:
fixed the format of notify responses (forgot to commit this earlier)
Modified:
branches/SAMBA_4_0/source/smb_server/smb/nttrans.c
Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/smb/nttrans.c
===
--- branches/SAMBA_4_0/source/smb_server/smb/nttrans.c 2006-03-30 08:31:39 UTC
(rev 14806)
+++ branches/SAMBA_4_0/source/smb_server/smb/nttrans.c 2006-03-30 08:44:28 UTC
(rev 14807)
@@ -346,7 +346,6 @@
size_t size = 0;
int i;
NTSTATUS status;
- uint32_t ofs=0;
uint8_t *p;
#define MAX_BYTES_PER_CHAR 3
@@ -362,14 +361,16 @@
/* construct the changes buffer */
for (i=0;iout.num_changes;i++) {
+ uint32_t ofs;
ssize_t len;
SIVAL(p, 4, info->out.changes[i].action);
len = push_string(p + 12, info->out.changes[i].name.s,
- op->trans->out.params.length - (ofs+12),
STR_UNICODE);
+ op->trans->out.params.length -
+ (p+12 - op->trans->out.params.data),
STR_UNICODE);
SIVAL(p, 8, len);
- ofs += len + 12;
+ ofs = len + 12;
if (ofs & 3) {
int pad = 4 - (ofs & 3);
@@ -377,12 +378,16 @@
ofs += pad;
}
- SIVAL(p, 0, ofs);
+ if (i == info->out.num_changes-1) {
+ SIVAL(p, 0, 0);
+ } else {
+ SIVAL(p, 0, ofs);
+ }
- p = op->trans->out.params.data + ofs;
+ p += ofs;
}
- op->trans->out.params.length = ofs;
+ op->trans->out.params.length = p - op->trans->out.params.data;
return NT_STATUS_OK;
}
svn commit: samba r14806 - in branches/SAMBA_4_0/source/lib/tls: .
Author: jelmer Date: 2006-03-30 08:31:39 + (Thu, 30 Mar 2006) New Revision: 14806 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14806 Log: Fix compiler warnings Modified: branches/SAMBA_4_0/source/lib/tls/tlscert.c Changeset: Modified: branches/SAMBA_4_0/source/lib/tls/tlscert.c === --- branches/SAMBA_4_0/source/lib/tls/tlscert.c 2006-03-30 06:07:38 UTC (rev 14805) +++ branches/SAMBA_4_0/source/lib/tls/tlscert.c 2006-03-30 08:31:39 UTC (rev 14806) @@ -41,7 +41,7 @@ gnutls_x509_crt cacrt, crt; gnutls_x509_privkey key, cakey; uint32_t serial = (uint32_t)time(NULL); - char keyid[100]; + unsigned char keyid[100]; char buf[4096]; size_t bufsize; size_t keyidsize = sizeof(keyid);
