svn commit: samba r13201 - in trunk/source/nsswitch: .
Author: jra
Date: 2006-01-28 01:09:08 + (Sat, 28 Jan 2006)
New Revision: 13201
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13201
Log:
Don't make returing from the cache dependent on offline global state.
Jeremy.
Modified:
trunk/source/nsswitch/winbindd_cache.c
Changeset:
Modified: trunk/source/nsswitch/winbindd_cache.c
===
--- trunk/source/nsswitch/winbindd_cache.c 2006-01-28 00:15:49 UTC (rev
13200)
+++ trunk/source/nsswitch/winbindd_cache.c 2006-01-28 01:09:08 UTC (rev
13201)
@@ -447,7 +447,7 @@
* seconds if it has become online again, return the cached entry.
* This deals with transient offline states... */
- if (lp_winbind_offline_logon() && !domain->online &&
+ if (!domain->online &&
!NT_STATUS_IS_OK(check_negative_conn_cache(domain->name,
domain->dcname))) {
DEBUG(10,("centry_expired: Key %s for domain %s valid as domain
is offline.\n",
keystr, domain->name ));
svn commit: samba r13200 - in branches/SAMBA_3_0_RELEASE: . source/include source/locking source/smbd
Author: jerry Date: 2006-01-28 00:15:49 + (Sat, 28 Jan 2006) New Revision: 13200 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13200 Log: oplock fixes from Jeremy (hopefully last issue before release on Monday) Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt branches/SAMBA_3_0_RELEASE/source/include/smb.h branches/SAMBA_3_0_RELEASE/source/locking/locking.c branches/SAMBA_3_0_RELEASE/source/smbd/oplock.c Changeset: Sorry, the patch is too large (365 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13200
Build status as of Sat Jan 28 00:00:02 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-01-27 00:00:04.0 + +++ /home/build/master/cache/broken_results.txt 2006-01-28 00:00:29.0 + @@ -1,15 +1,15 @@ -Build status as of Fri Jan 27 00:00:01 2006 +Build status as of Sat Jan 28 00:00:02 2006 Build counts: Tree Total Broken Panic -ccache 9 2 0 -distcc 11 3 0 +ccache 8 2 0 +distcc 10 2 0 lorikeet-heimdal 12 12 0 ppp 17 0 0 rsync33 3 0 samba3 0 0 samba-docs 0 0 0 -samba4 35 24 2 +samba4 35 23 2 samba_3_034 5 0 smb-build26 4 0 talloc 8 3 0
svn commit: samba r13199 - in trunk/source: include locking smbd
Author: jra Date: 2006-01-27 23:30:44 + (Fri, 27 Jan 2006) New Revision: 13199 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13199 Log: Fix issues exposed by Jerry's testing on 64-bit Solaris (I hope). Separate 3.0.21b patch sent to Jerry. Jeremy. Modified: trunk/source/include/smb.h trunk/source/locking/locking.c trunk/source/smbd/oplock.c Changeset: Sorry, the patch is too large (344 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13199
svn commit: samba r13198 - in branches/SAMBA_3_0/source: include locking smbd
Author: jra Date: 2006-01-27 23:30:30 + (Fri, 27 Jan 2006) New Revision: 13198 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13198 Log: Fix issues exposed by Jerry's testing on 64-bit Solaris (I hope). Separate 3.0.21b patch sent to Jerry. Jeremy. Modified: branches/SAMBA_3_0/source/include/smb.h branches/SAMBA_3_0/source/locking/locking.c branches/SAMBA_3_0/source/smbd/oplock.c Changeset: Sorry, the patch is too large (344 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13198
svn commit: samba r13197 - branches/SAMBA_3_0/source/tdb trunk/source/tdb
Author: lmuelle
Date: 2006-01-27 21:49:01 + (Fri, 27 Jan 2006)
New Revision: 13197
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13197
Log:
Add -k switch to dump the data of a single key.
Modified:
branches/SAMBA_3_0/source/tdb/tdbdump.c
trunk/source/tdb/tdbdump.c
Changeset:
Modified: branches/SAMBA_3_0/source/tdb/tdbdump.c
===
--- branches/SAMBA_3_0/source/tdb/tdbdump.c 2006-01-27 21:35:50 UTC (rev
13196)
+++ branches/SAMBA_3_0/source/tdb/tdbdump.c 2006-01-27 21:49:01 UTC (rev
13197)
@@ -59,9 +59,10 @@
return 0;
}
-static int dump_tdb(const char *fname)
+static int dump_tdb(const char *fname, const char *keyname)
{
TDB_CONTEXT *tdb;
+ TDB_DATA key, value;
tdb = tdb_open(fname, 0, 0, O_RDONLY, 0);
if (!tdb) {
@@ -69,20 +70,55 @@
return 1;
}
- tdb_traverse(tdb, traverse_fn, NULL);
+ if (!keyname) {
+ tdb_traverse(tdb, traverse_fn, NULL);
+ } else {
+ key.dptr = (char *)keyname;
+ key.dsize = strlen( keyname);
+ value = tdb_fetch(tdb, key);
+ if (!value.dptr) {
+ return 1;
+ } else {
+ print_data(value);
+ free(value.dptr);
+ }
+ }
+
return 0;
}
+static void usage( void)
+{
+ printf( "Usage: tdbdump [options] \n\n");
+ printf( " -h this help message\n");
+ printf( " -k keyname dumps value of keyname\n");
+}
+
int main(int argc, char *argv[])
{
- char *fname;
+ char *fname, *keyname=NULL;
+ int c;
if (argc < 2) {
printf("Usage: tdbdump \n");
exit(1);
}
- fname = argv[1];
+ while ((c = getopt( argc, argv, "hk:")) != -1) {
+ switch (c) {
+ case 'h':
+ usage();
+ exit( 0);
+ case 'k':
+ keyname = optarg;
+ break;
+ default:
+ usage();
+ exit( 1);
+ }
+ }
- return dump_tdb(fname);
+ fname = argv[optind];
+
+ return dump_tdb(fname, keyname);
}
Modified: trunk/source/tdb/tdbdump.c
===
--- trunk/source/tdb/tdbdump.c 2006-01-27 21:35:50 UTC (rev 13196)
+++ trunk/source/tdb/tdbdump.c 2006-01-27 21:49:01 UTC (rev 13197)
@@ -59,9 +59,10 @@
return 0;
}
-static int dump_tdb(const char *fname)
+static int dump_tdb(const char *fname, const char *keyname)
{
TDB_CONTEXT *tdb;
+ TDB_DATA key, value;
tdb = tdb_open(fname, 0, 0, O_RDONLY, 0);
if (!tdb) {
@@ -69,20 +70,55 @@
return 1;
}
- tdb_traverse(tdb, traverse_fn, NULL);
+ if (!keyname) {
+ tdb_traverse(tdb, traverse_fn, NULL);
+ } else {
+ key.dptr = (char *)keyname;
+ key.dsize = strlen( keyname);
+ value = tdb_fetch(tdb, key);
+ if (!value.dptr) {
+ return 1;
+ } else {
+ print_data(value);
+ free(value.dptr);
+ }
+ }
+
return 0;
}
+static void usage( void)
+{
+ printf( "Usage: tdbdump [options] \n\n");
+ printf( " -h this help message\n");
+ printf( " -k keyname dumps value of keyname\n");
+}
+
int main(int argc, char *argv[])
{
- char *fname;
+ char *fname, *keyname=NULL;
+ int c;
if (argc < 2) {
printf("Usage: tdbdump \n");
exit(1);
}
- fname = argv[1];
+ while ((c = getopt( argc, argv, "hk:")) != -1) {
+ switch (c) {
+ case 'h':
+ usage();
+ exit( 0);
+ case 'k':
+ keyname = optarg;
+ break;
+ default:
+ usage();
+ exit( 1);
+ }
+ }
- return dump_tdb(fname);
+ fname = argv[optind];
+
+ return dump_tdb(fname, keyname);
}
svn commit: samba r13196 - in branches/SAMBA_3_0_RELEASE: . examples/LDAP source/locking source/passdb source/smbd
Author: jerry
Date: 2006-01-27 21:35:50 + (Fri, 27 Jan 2006)
New Revision: 13196
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13196
Log:
a few more last minute fixes; still one bug to go
Modified:
branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
branches/SAMBA_3_0_RELEASE/examples/LDAP/samba.schema.at.IBM-DS
branches/SAMBA_3_0_RELEASE/examples/LDAP/samba.schema.oc.IBM-DS
branches/SAMBA_3_0_RELEASE/source/locking/locking.c
branches/SAMBA_3_0_RELEASE/source/passdb/secrets.c
branches/SAMBA_3_0_RELEASE/source/smbd/oplock.c
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-01-27 20:00:15 UTC (rev
13195)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-01-27 21:35:50 UTC (rev
13196)
@@ -117,12 +117,21 @@
* Fix double free in on failure path in POSIX acl code.
+o Andriy Gapon <[EMAIL PROTECTED]>
+* BUG 3458: Fix crash bug in smbd and winbindd caused by
+ accessing freed memory.
+
+
o Björn Jacke <[EMAIL PROTECTED]>
* Configure check for Tru64 EA functions (not yet implemented).
* Find Tru64 AIO lib in configure.
* Cut-n-paste fixes in configure.in.
+o John Janosik <[EMAIL PROTECTED]>
+* IBM Tivoli Directory Server schema updates.
+
+
o Michael James <[EMAIL PROTECTED]>
* sid2string fix in adssearch.pl.
Modified: branches/SAMBA_3_0_RELEASE/examples/LDAP/samba.schema.at.IBM-DS
===
--- branches/SAMBA_3_0_RELEASE/examples/LDAP/samba.schema.at.IBM-DS
2006-01-27 20:00:15 UTC (rev 13195)
+++ branches/SAMBA_3_0_RELEASE/examples/LDAP/samba.schema.at.IBM-DS
2006-01-27 21:35:50 UTC (rev 13196)
@@ -76,3 +76,24 @@
attributetypes=( 1.3.6.1.4.1.7165.2.1.56 NAME 'sambaAccountPolicyName' DESC
'Account Policy Name' EQUALITY caseIgnoreMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.15{255} SINGLE-VALUE )
attributetypes=( 1.3.6.1.4.1.7165.2.1.57 NAME 'sambaAccountPolicyValue' DESC
'Account Policy Value' EQUALITY integerMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.58 NAME 'sambaMinPwdLength' DESC
'Minimal password length (default: 5)' EQUALITY integerMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.59 NAME 'sambaPwdHistoryLength' DESC
'Length of Password History Entries (default: 0 => off)' EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.60 NAME 'sambaLogonToChgPwd' DESC 'Force
Users to logon for password change (default: 0 => off, 2 => on)' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.61 NAME 'sambaMaxPwdAge' DESC 'Maximum
password age, in seconds (default: -1 => never expire passwords)' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.62 NAME 'sambaMinPwdAge' DESC 'Minimum
password age, in seconds (default: 0 => allow immediate password change)'
EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.63 NAME 'sambaLockoutDuration' DESC
'Lockout duration in minutes (default: 30, -1 => forever)' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.64 NAME 'sambaLockoutObservationWindow'
DESC 'Reset time after lockout in minutes (default: 30)' EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.65 NAME 'sambaLockoutThreshold' DESC
'Lockout users after bad logon attempts (default: 0 => off)' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.66 NAME 'sambaForceLogoff' DESC
'Disconnect Users outside logon hours (default: -1 => off, 0 => on)' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.67 NAME 'sambaRefuseMachinePwdChange'
DESC 'Allow Machine Password changes (default: 0 => off)' EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
Modified: branches/SAMBA_3_0_RELEASE/examples/LDAP/samba.schema.oc.IBM-DS
===
--- branches/SAMBA_3_0_RELEASE/examples/LDAP/samba.schema.oc.IBM-DS
2006-01-27 20:00:15 UTC (rev 13195)
+++ branches/SAMBA_3_0_RELEASE/examples/LDAP/samba.schema.oc.IBM-DS
2006-01-27 21:35:50 UTC (rev 13196)
@@ -4,7 +4,7 @@
objectclasses=( 1.3.6.1.4.1.7165.2.2.4 NAME 'sambaGroupMapping' SUP top
AUXILIARY DESC 'Samba Group Mapping' MUST ( gidNumber $ sambaSID $
sambaGroupType ) MAY ( displayName $ description $ sambaSIDList ))
-objectclasses=( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomai
svn commit: samba-web r901 - in trunk/style: .
Author: deryck
Date: 2006-01-27 21:25:20 + (Fri, 27 Jan 2006)
New Revision: 901
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=901
Log:
Comment to help find the hover color.
deryck
Modified:
trunk/style/common.css
Changeset:
Modified: trunk/style/common.css
===
--- trunk/style/common.css 2006-01-27 17:21:42 UTC (rev 900)
+++ trunk/style/common.css 2006-01-27 21:25:20 UTC (rev 901)
@@ -37,7 +37,6 @@
}
-
/* Headings
***/
h1 {
@@ -95,6 +94,10 @@
border: 2px solid #3878CD;
background-color: #F5F8FF;
}
+
+
+/* Links
+***/
a:link:hover {
color:#CC0033;
background-color:#64;
svn commit: samba r13193 - in trunk/source: locking smbd
Author: jra
Date: 2006-01-27 19:54:42 + (Fri, 27 Jan 2006)
New Revision: 13193
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13193
Log:
Fix up alignment issues when printing share mode
entries. Add paranioa to debug so we know when an
entry is unused.
Jeremy.
Modified:
trunk/source/locking/locking.c
trunk/source/smbd/oplock.c
Changeset:
Modified: trunk/source/locking/locking.c
===
--- trunk/source/locking/locking.c 2006-01-27 19:54:39 UTC (rev 13192)
+++ trunk/source/locking/locking.c 2006-01-27 19:54:42 UTC (rev 13193)
@@ -384,11 +384,13 @@
{
static pstring share_str;
- slprintf(share_str, sizeof(share_str)-1, "share_mode_entry[%d]: "
+ slprintf(share_str, sizeof(share_str)-1, "share_mode_entry[%d]: %s "
"pid = %s, share_access = 0x%x, private_options = 0x%x, "
"access_mask = 0x%x, mid = 0x%x, type= 0x%x, file_id = %lu, "
"dev = 0x%x, inode = %.0f",
-num, procid_str_static(&e->pid),
+num,
+e->op_type == UNUSED_SHARE_MODE_ENTRY ? "UNUSED" : "",
+procid_str_static(&e->pid),
e->share_access, e->private_options,
e->access_mask, e->op_mid, e->op_type, e->share_file_id,
(unsigned int)e->dev, (double)e->inode );
@@ -408,9 +410,11 @@
int i;
for (i = 0; i < num_share_modes; i++) {
- struct share_mode_entry *entry_p = &shares[i];
+ struct share_mode_entry entry;
+
+ memcpy(&entry, &shares[i], sizeof(struct share_mode_entry));
DEBUG(10,("print_share_mode_table: %s\n",
- share_mode_str(i, entry_p)));
+ share_mode_str(i, &entry)));
}
}
Modified: trunk/source/smbd/oplock.c
===
--- trunk/source/smbd/oplock.c 2006-01-27 19:54:39 UTC (rev 13192)
+++ trunk/source/smbd/oplock.c 2006-01-27 19:54:42 UTC (rev 13193)
@@ -684,6 +684,11 @@
don't have to do anything */
for (i=0; inum_share_modes; i++) {
struct share_mode_entry *e = &lck->share_modes[i];
+
+ if (!is_valid_share_mode_entry(e)) {
+ continue;
+ }
+
if ((e->op_type == NO_OPLOCK) &&
(e->share_file_id == fsp->file_id) &&
(e->dev == fsp->dev) &&
@@ -701,6 +706,10 @@
struct share_mode_entry *share_entry = &lck->share_modes[i];
char msg[MSG_SMB_SHARE_MODE_ENTRY_SIZE];
+ if (!is_valid_share_mode_entry(share_entry)) {
+ continue;
+ }
+
/*
* As there could have been multiple writes waiting at the
* lock_share_entry gate we may not be the first to
svn commit: samba r13195 - in trunk/source/locking: .
Author: jra
Date: 2006-01-27 20:00:15 + (Fri, 27 Jan 2006)
New Revision: 13195
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13195
Log:
Don't do extra memcpy's unless we're asked to.
Jeremy.
Modified:
trunk/source/locking/locking.c
Changeset:
Modified: trunk/source/locking/locking.c
===
--- trunk/source/locking/locking.c 2006-01-27 19:59:48 UTC (rev 13194)
+++ trunk/source/locking/locking.c 2006-01-27 20:00:15 UTC (rev 13195)
@@ -547,7 +547,11 @@
offset += sp_len + 1;
safe_strcpy(result.dptr + offset, lck->filename,
result.dsize - offset - 1);
- print_share_mode_table(data);
+
+ if (DEBUGLEVEL >= 10) {
+ print_share_mode_table(data);
+ }
+
return result;
}
svn commit: samba r13194 - in branches/SAMBA_3_0/source/locking: .
Author: jra
Date: 2006-01-27 19:59:48 + (Fri, 27 Jan 2006)
New Revision: 13194
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13194
Log:
Don't do extra memcpy's unless we're asked to.
Jeremy.
Modified:
branches/SAMBA_3_0/source/locking/locking.c
Changeset:
Modified: branches/SAMBA_3_0/source/locking/locking.c
===
--- branches/SAMBA_3_0/source/locking/locking.c 2006-01-27 19:54:42 UTC (rev
13193)
+++ branches/SAMBA_3_0/source/locking/locking.c 2006-01-27 19:59:48 UTC (rev
13194)
@@ -547,7 +547,11 @@
offset += sp_len + 1;
safe_strcpy(result.dptr + offset, lck->filename,
result.dsize - offset - 1);
- print_share_mode_table(data);
+
+ if (DEBUGLEVEL >= 10) {
+ print_share_mode_table(data);
+ }
+
return result;
}
svn commit: samba r13192 - in branches/SAMBA_3_0/source: locking smbd
Author: jra
Date: 2006-01-27 19:54:39 + (Fri, 27 Jan 2006)
New Revision: 13192
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13192
Log:
Fix up alignment issues when printing share mode
entries. Add paranioa to debug so we know when an
entry is unused.
Jeremy.
Modified:
branches/SAMBA_3_0/source/locking/locking.c
branches/SAMBA_3_0/source/smbd/oplock.c
Changeset:
Modified: branches/SAMBA_3_0/source/locking/locking.c
===
--- branches/SAMBA_3_0/source/locking/locking.c 2006-01-27 19:25:06 UTC (rev
13191)
+++ branches/SAMBA_3_0/source/locking/locking.c 2006-01-27 19:54:39 UTC (rev
13192)
@@ -384,11 +384,13 @@
{
static pstring share_str;
- slprintf(share_str, sizeof(share_str)-1, "share_mode_entry[%d]: "
+ slprintf(share_str, sizeof(share_str)-1, "share_mode_entry[%d]: %s "
"pid = %s, share_access = 0x%x, private_options = 0x%x, "
"access_mask = 0x%x, mid = 0x%x, type= 0x%x, file_id = %lu, "
"dev = 0x%x, inode = %.0f",
-num, procid_str_static(&e->pid),
+num,
+e->op_type == UNUSED_SHARE_MODE_ENTRY ? "UNUSED" : "",
+procid_str_static(&e->pid),
e->share_access, e->private_options,
e->access_mask, e->op_mid, e->op_type, e->share_file_id,
(unsigned int)e->dev, (double)e->inode );
@@ -408,9 +410,11 @@
int i;
for (i = 0; i < num_share_modes; i++) {
- struct share_mode_entry *entry_p = &shares[i];
+ struct share_mode_entry entry;
+
+ memcpy(&entry, &shares[i], sizeof(struct share_mode_entry));
DEBUG(10,("print_share_mode_table: %s\n",
- share_mode_str(i, entry_p)));
+ share_mode_str(i, &entry)));
}
}
Modified: branches/SAMBA_3_0/source/smbd/oplock.c
===
--- branches/SAMBA_3_0/source/smbd/oplock.c 2006-01-27 19:25:06 UTC (rev
13191)
+++ branches/SAMBA_3_0/source/smbd/oplock.c 2006-01-27 19:54:39 UTC (rev
13192)
@@ -684,6 +684,11 @@
don't have to do anything */
for (i=0; inum_share_modes; i++) {
struct share_mode_entry *e = &lck->share_modes[i];
+
+ if (!is_valid_share_mode_entry(e)) {
+ continue;
+ }
+
if ((e->op_type == NO_OPLOCK) &&
(e->share_file_id == fsp->file_id) &&
(e->dev == fsp->dev) &&
@@ -701,6 +706,10 @@
struct share_mode_entry *share_entry = &lck->share_modes[i];
char msg[MSG_SMB_SHARE_MODE_ENTRY_SIZE];
+ if (!is_valid_share_mode_entry(share_entry)) {
+ continue;
+ }
+
/*
* As there could have been multiple writes waiting at the
* lock_share_entry gate we may not be the first to
svn commit: samba r13191 - in trunk/source/passdb: .
Author: jra
Date: 2006-01-27 19:25:06 + (Fri, 27 Jan 2006)
New Revision: 13191
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13191
Log:
Fix #3458 from Andriy Gapon <[EMAIL PROTECTED]>. Don't
access free'd memory.
Jerry please pick up for 3.0.21b !
Jeremy.
Modified:
trunk/source/passdb/secrets.c
Changeset:
Modified: trunk/source/passdb/secrets.c
===
--- trunk/source/passdb/secrets.c 2006-01-27 19:24:37 UTC (rev 13190)
+++ trunk/source/passdb/secrets.c 2006-01-27 19:25:06 UTC (rev 13191)
@@ -299,7 +299,6 @@
*pass_last_set_time = pass->mod_time;
}
memcpy(ret_pwd, pass->hash, 16);
- SAFE_FREE(pass);
if (channel) {
*channel = get_default_sec_channel();
@@ -313,6 +312,7 @@
}
}
+ SAFE_FREE(pass);
return True;
}
svn commit: samba r13190 - in branches/SAMBA_3_0/source/passdb: .
Author: jra
Date: 2006-01-27 19:24:37 + (Fri, 27 Jan 2006)
New Revision: 13190
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13190
Log:
Fix #3458 from Andriy Gapon <[EMAIL PROTECTED]>. Don't
access free'd memory.
Jerry please pick up for 3.0.21b !
Jeremy.
Modified:
branches/SAMBA_3_0/source/passdb/secrets.c
Changeset:
Modified: branches/SAMBA_3_0/source/passdb/secrets.c
===
--- branches/SAMBA_3_0/source/passdb/secrets.c 2006-01-27 18:16:53 UTC (rev
13189)
+++ branches/SAMBA_3_0/source/passdb/secrets.c 2006-01-27 19:24:37 UTC (rev
13190)
@@ -299,7 +299,6 @@
*pass_last_set_time = pass->mod_time;
}
memcpy(ret_pwd, pass->hash, 16);
- SAFE_FREE(pass);
if (channel) {
*channel = get_default_sec_channel();
@@ -313,6 +312,7 @@
}
}
+ SAFE_FREE(pass);
return True;
}
svn commit: samba r13189 - in branches/SAMBA_4_0: .
Author: idra Date: 2006-01-27 18:16:53 + (Fri, 27 Jan 2006) New Revision: 13189 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13189 Log: suggest a couple of dev libs before compiling. Modified: branches/SAMBA_4_0/howto.txt Changeset: Modified: branches/SAMBA_4_0/howto.txt === --- branches/SAMBA_4_0/howto.txt2006-01-27 15:31:02 UTC (rev 13188) +++ branches/SAMBA_4_0/howto.txt2006-01-27 18:16:53 UTC (rev 13189) @@ -38,6 +38,11 @@ Step 2: compile Samba4 -- +Recommended optional development libraries: +- acl and xattr development libraries +- gnutls +- readline + Run this: $ cd samba4/source
svn commit: samba-web r900 - in trunk/news/calendar: .
Author: deryck Date: 2006-01-27 17:21:42 + (Fri, 27 Jan 2006) New Revision: 900 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=900 Log: Add dates to Team calendar. Keep 'em coming (if you have any)... deryck Added: trunk/news/calendar/ukuug_06.txt trunk/news/calendar/usenix_tech_06.txt Modified: trunk/news/calendar/index.html trunk/news/calendar/showDate.js Changeset: Modified: trunk/news/calendar/index.html === --- trunk/news/calendar/index.html 2006-01-26 20:46:49 UTC (rev 899) +++ trunk/news/calendar/index.html 2006-01-27 17:21:42 UTC (rev 900) @@ -182,10 +182,7 @@ - - - March 2006 @@ -220,9 +217,9 @@ 19 20 - 21 - 22 - 23 + 21 + 22 + 23 24 25 @@ -237,6 +234,10 @@ + + + + April 2006 @@ -297,6 +298,107 @@ + + + May 2006 + + + + 1 + 2 + 3 + 4 + 5 + 6 + + + 7 + 8 + 9 + 10 + 11 + 12 + 13 + + + 14 + 15 + 16 + 17 + 18 + 19 + 20 + + + 21 + 22 + 23 + 24 + 25 + 26 + 27 + + + 28 + 29 + 30 + 31 + + + + + + + + + June 2006 + + + + + + + 1 + 2 + 3 + + + 4 + 5 + 6 + 7 + 8 + 9 + 10 + + + 11 + 12 + 13 + 14 + 15 + 16 + 17 + + + 18 + 19 + 20 + 21 + 22 + 23 + 24 + + + 25 + 26 + 27 + 28 + 29 + 30 + + + Click on the links to the left to display calendar Modified: trunk/news/calendar/showDate.js === --- trunk/news/calendar/showDate.js 2006-01-26 20:46:49 UTC (rev 899) +++ trunk/news/calendar/showDate.js 2006-01-27 17:21:42 UTC (rev 900) @@ -3,6 +3,8 @@ allEvents[1] = '23-28 January, Dunedin, New ZealandSamba Team members, Andrew "Tridge" Tridgell and Tim Potter will both be speaking at Australia\'s national Linux conference. Tridge will present on Samba4, and Tim is presenting on WBEM.For more info, see http://linux.conf.au/";>http://linux.conf.au/.'; allEvents[2] = 'April 3-6, LinuxWorld Boston, MASamba Team members Jerry Carter, Jeremy Allison, and Deryck Hodge will be on hand at this LinuxWorld event, offering a selection of talks and tutorials. Jerry will be speaking/teaching on Samba administration, LDAP, and the state of Samba. Jeremy will be leading a session on Linux integration with Active Directory, as well as hosting the Golden Penguin Bowl. Deryck will be teaching on Google\'s use of AJAX and web services.For more info, see http://www.linuxworldexpo.com/";>http://www.linuxworldexpo.com/.'; allEvents[3] = 'April 24-26, Goettingen, GermanySamba eXPerience 2006 is an international conference focused exclusively on Samba. The conference features presentations and a Samba tutorial. The Samb
svn commit: samba r13188 - in trunk/examples/LDAP: .
Author: jmcd
Date: 2006-01-27 15:31:02 + (Fri, 27 Jan 2006)
New Revision: 13188
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13188
Log:
Merge from 3.0 - samba schema updates for ITDS from [EMAIL PROTECTED]
Modified:
trunk/examples/LDAP/samba.schema.at.IBM-DS
trunk/examples/LDAP/samba.schema.oc.IBM-DS
Changeset:
Modified: trunk/examples/LDAP/samba.schema.at.IBM-DS
===
--- trunk/examples/LDAP/samba.schema.at.IBM-DS 2006-01-27 15:14:55 UTC (rev
13187)
+++ trunk/examples/LDAP/samba.schema.at.IBM-DS 2006-01-27 15:31:02 UTC (rev
13188)
@@ -76,3 +76,24 @@
attributetypes=( 1.3.6.1.4.1.7165.2.1.56 NAME 'sambaAccountPolicyName' DESC
'Account Policy Name' EQUALITY caseIgnoreMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.15{255} SINGLE-VALUE )
attributetypes=( 1.3.6.1.4.1.7165.2.1.57 NAME 'sambaAccountPolicyValue' DESC
'Account Policy Value' EQUALITY integerMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.58 NAME 'sambaMinPwdLength' DESC
'Minimal password length (default: 5)' EQUALITY integerMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.59 NAME 'sambaPwdHistoryLength' DESC
'Length of Password History Entries (default: 0 => off)' EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.60 NAME 'sambaLogonToChgPwd' DESC 'Force
Users to logon for password change (default: 0 => off, 2 => on)' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.61 NAME 'sambaMaxPwdAge' DESC 'Maximum
password age, in seconds (default: -1 => never expire passwords)' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.62 NAME 'sambaMinPwdAge' DESC 'Minimum
password age, in seconds (default: 0 => allow immediate password change)'
EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.63 NAME 'sambaLockoutDuration' DESC
'Lockout duration in minutes (default: 30, -1 => forever)' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.64 NAME 'sambaLockoutObservationWindow'
DESC 'Reset time after lockout in minutes (default: 30)' EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.65 NAME 'sambaLockoutThreshold' DESC
'Lockout users after bad logon attempts (default: 0 => off)' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.66 NAME 'sambaForceLogoff' DESC
'Disconnect Users outside logon hours (default: -1 => off, 0 => on)' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.67 NAME 'sambaRefuseMachinePwdChange'
DESC 'Allow Machine Password changes (default: 0 => off)' EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
Modified: trunk/examples/LDAP/samba.schema.oc.IBM-DS
===
--- trunk/examples/LDAP/samba.schema.oc.IBM-DS 2006-01-27 15:14:55 UTC (rev
13187)
+++ trunk/examples/LDAP/samba.schema.oc.IBM-DS 2006-01-27 15:31:02 UTC (rev
13188)
@@ -4,7 +4,7 @@
objectclasses=( 1.3.6.1.4.1.7165.2.2.4 NAME 'sambaGroupMapping' SUP top
AUXILIARY DESC 'Samba Group Mapping' MUST ( gidNumber $ sambaSID $
sambaGroupType ) MAY ( displayName $ description $ sambaSIDList ))
-objectclasses=( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomain' SUP top STRUCTURAL
DESC 'Samba Domain Information' MUST ( sambaDomainName $ sambaSID ) MAY (
sambaNextRid $ sambaNextGroupRid $ sambaNextUserRid $ sambaAlgorithmicRidBase )
)
+objectclasses=( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomain' SUP top STRUCTURAL
DESC 'Samba Domain Information' MUST ( sambaDomainName $ sambaSID ) MAY (
sambaNextRid $ sambaNextGroupRid $ sambaNextUserRid $ sambaAlgorithmicRidBase $
sambaMinPwdLength $ sambaPwdHistoryLength $ sambaLogonToChgPwd $ sambaMaxPwdAge
$ sambaMinPwdAge $ sambaLockoutDuration $ sambaLockoutObservationWindow $
sambaLockoutThreshold $ sambaForceLogoff $ sambaRefuseMachinePwdChange ) )
objectclasses=( 1.3.6.1.4.1.7165.1.2.2.7 NAME 'sambaUnixIdPool' SUP top
AUXILIARY DESC 'Pool for allocating UNIX uids/gids' MUST ( uidNumber $
gidNumber ) )
svn commit: samba r13187 - in branches/SAMBA_3_0/examples/LDAP: .
Author: jmcd
Date: 2006-01-27 15:14:55 + (Fri, 27 Jan 2006)
New Revision: 13187
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13187
Log:
IBM Tivoli Directory Server schema updates from John Janosik
<[EMAIL PROTECTED]>
Modified:
branches/SAMBA_3_0/examples/LDAP/samba.schema.at.IBM-DS
branches/SAMBA_3_0/examples/LDAP/samba.schema.oc.IBM-DS
Changeset:
Modified: branches/SAMBA_3_0/examples/LDAP/samba.schema.at.IBM-DS
===
--- branches/SAMBA_3_0/examples/LDAP/samba.schema.at.IBM-DS 2006-01-27
13:29:47 UTC (rev 13186)
+++ branches/SAMBA_3_0/examples/LDAP/samba.schema.at.IBM-DS 2006-01-27
15:14:55 UTC (rev 13187)
@@ -76,3 +76,24 @@
attributetypes=( 1.3.6.1.4.1.7165.2.1.56 NAME 'sambaAccountPolicyName' DESC
'Account Policy Name' EQUALITY caseIgnoreMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.15{255} SINGLE-VALUE )
attributetypes=( 1.3.6.1.4.1.7165.2.1.57 NAME 'sambaAccountPolicyValue' DESC
'Account Policy Value' EQUALITY integerMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.58 NAME 'sambaMinPwdLength' DESC
'Minimal password length (default: 5)' EQUALITY integerMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.59 NAME 'sambaPwdHistoryLength' DESC
'Length of Password History Entries (default: 0 => off)' EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.60 NAME 'sambaLogonToChgPwd' DESC 'Force
Users to logon for password change (default: 0 => off, 2 => on)' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.61 NAME 'sambaMaxPwdAge' DESC 'Maximum
password age, in seconds (default: -1 => never expire passwords)' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.62 NAME 'sambaMinPwdAge' DESC 'Minimum
password age, in seconds (default: 0 => allow immediate password change)'
EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.63 NAME 'sambaLockoutDuration' DESC
'Lockout duration in minutes (default: 30, -1 => forever)' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.64 NAME 'sambaLockoutObservationWindow'
DESC 'Reset time after lockout in minutes (default: 30)' EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.65 NAME 'sambaLockoutThreshold' DESC
'Lockout users after bad logon attempts (default: 0 => off)' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.66 NAME 'sambaForceLogoff' DESC
'Disconnect Users outside logon hours (default: -1 => off, 0 => on)' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
+attributetypes=( 1.3.6.1.4.1.7165.2.1.67 NAME 'sambaRefuseMachinePwdChange'
DESC 'Allow Machine Password changes (default: 0 => off)' EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+
Modified: branches/SAMBA_3_0/examples/LDAP/samba.schema.oc.IBM-DS
===
--- branches/SAMBA_3_0/examples/LDAP/samba.schema.oc.IBM-DS 2006-01-27
13:29:47 UTC (rev 13186)
+++ branches/SAMBA_3_0/examples/LDAP/samba.schema.oc.IBM-DS 2006-01-27
15:14:55 UTC (rev 13187)
@@ -4,7 +4,7 @@
objectclasses=( 1.3.6.1.4.1.7165.2.2.4 NAME 'sambaGroupMapping' SUP top
AUXILIARY DESC 'Samba Group Mapping' MUST ( gidNumber $ sambaSID $
sambaGroupType ) MAY ( displayName $ description $ sambaSIDList ))
-objectclasses=( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomain' SUP top STRUCTURAL
DESC 'Samba Domain Information' MUST ( sambaDomainName $ sambaSID ) MAY (
sambaNextRid $ sambaNextGroupRid $ sambaNextUserRid $ sambaAlgorithmicRidBase )
)
+objectclasses=( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomain' SUP top STRUCTURAL
DESC 'Samba Domain Information' MUST ( sambaDomainName $ sambaSID ) MAY (
sambaNextRid $ sambaNextGroupRid $ sambaNextUserRid $ sambaAlgorithmicRidBase $
sambaMinPwdLength $ sambaPwdHistoryLength $ sambaLogonToChgPwd $ sambaMaxPwdAge
$ sambaMinPwdAge $ sambaLockoutDuration $ sambaLockoutObservationWindow $
sambaLockoutThreshold $ sambaForceLogoff $ sambaRefuseMachinePwdChange ) )
objectclasses=( 1.3.6.1.4.1.7165.1.2.2.7 NAME 'sambaUnixIdPool' SUP top
AUXILIARY DESC 'Pool for allocating UNIX uids/gids' MUST ( uidNumber $
gidNumber ) )
svn commit: samba r13186 - in branches/SAMBA_4_0/source/lib/charset: .
Author: jelmer
Date: 2006-01-27 13:29:47 + (Fri, 27 Jan 2006)
New Revision: 13186
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13186
Log:
Remove assumption that callers that specify -1 actually mean sizeof(pstring)
Modified:
branches/SAMBA_4_0/source/lib/charset/charcnv.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/charset/charcnv.c
===
--- branches/SAMBA_4_0/source/lib/charset/charcnv.c 2006-01-27 13:27:13 UTC
(rev 13185)
+++ branches/SAMBA_4_0/source/lib/charset/charcnv.c 2006-01-27 13:29:47 UTC
(rev 13186)
@@ -22,7 +22,6 @@
*/
#include "includes.h"
#include "system/iconv.h"
-#include "pstring.h"
/**
* @file
@@ -303,10 +302,6 @@
return ret;
}
- /* treat a pstring as "unlimited" length */
- if (dest_len == (size_t)-1)
- dest_len = sizeof(pstring);
-
src_len = strlen(src);
if (flags & (STR_TERMINATE | STR_TERMINATE_ASCII))
@@ -352,9 +347,6 @@
{
size_t ret;
- if (dest_len == (size_t)-1)
- dest_len = sizeof(pstring);
-
if (flags & (STR_TERMINATE | STR_TERMINATE_ASCII)) {
if (src_len == (size_t)-1) {
src_len = strlen(src) + 1;
@@ -406,10 +398,6 @@
return ret;
}
- /* treat a pstring as "unlimited" length */
- if (dest_len == (size_t)-1)
- dest_len = sizeof(pstring);
-
if (flags & STR_TERMINATE)
src_len++;
@@ -482,9 +470,6 @@
{
size_t ret;
- if (dest_len == (size_t)-1)
- dest_len = sizeof(pstring);
-
if (ucs2_align(NULL, src, flags)) {
src = (const void *)((const char *)src + 1);
if (src_len > 0)
svn commit: samba r13185 - in branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-unstable: .
Author: jerry
Date: 2006-01-27 13:27:13 + (Fri, 27 Jan 2006)
New Revision: 13185
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13185
Log:
and one more packaging fix
Modified:
branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-unstable/samba-common.dhcp
Changeset:
Modified:
branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-unstable/samba-common.dhcp
===
---
branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-unstable/samba-common.dhcp
2006-01-27 13:25:04 UTC (rev 13184)
+++
branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-unstable/samba-common.dhcp
2006-01-27 13:27:13 UTC (rev 13185)
@@ -1,6 +1,7 @@
#!/bin/sh
SAMBA_DHCP_CONF=/etc/samba/dhcp.conf
+SAMBA_DHCP_CONF_INFO_FILE=""
netbios_setup() {
# No need to continue if we're called with an unsupported option
@@ -15,6 +16,7 @@
# Nor should we continue if no settings have changed
if [ "$new_netbios_name_servers" = "$old_netbios_name_servers" ] \
&& [ "$new_netbios_scope" = "$old_netbios_scope" ]
+ && [ -f $SAMBA_DHCP_CONF ]
then
return
fi
@@ -33,6 +35,8 @@
done
echo -n > $SAMBA_DHCP_CONF
+ test -n "$SAMBA_DHCP_CONF_INFO_FILE" -a -f "$SAMBA_DHCP_CONF_INFO_FILE"
&& \
+ cat "$SAMBA_DHCP_CONF_INFO_FILE" >> $SAMBA_DHCP_CONF
# If we're updating on failure/expire, AND there are no WINS
# servers for other interfaces, leave the file empty.
svn commit: samba r13184 - in branches/SAMBA_3_0_RELEASE/source/include: .
Author: jerry Date: 2006-01-27 13:25:04 + (Fri, 27 Jan 2006) New Revision: 13184 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13184 Log: missed merge of James' debug.h fix for the MIPSPro compiler Modified: branches/SAMBA_3_0_RELEASE/source/include/debug.h Changeset: Modified: branches/SAMBA_3_0_RELEASE/source/include/debug.h === --- branches/SAMBA_3_0_RELEASE/source/include/debug.h 2006-01-27 13:23:52 UTC (rev 13183) +++ branches/SAMBA_3_0_RELEASE/source/include/debug.h 2006-01-27 13:25:04 UTC (rev 13184) @@ -43,6 +43,12 @@ BOOL dbgtext( const char *, ... ) PRINTF_ATTRIBUTE(1,2); BOOL dbghdr( int level, const char *file, const char *func, int line ); +#if defined(sgi) && (_COMPILER_VERSION >= 730) +#pragma mips_frequency_hint NEVER Debug1 +#pragma mips_frequency_hint NEVER dbgtext +#pragma mips_frequency_hint NEVER dbghdr +#endif + extern XFILE *dbf; extern pstring debugf;
svn commit: samba r13183 - in branches/SAMBA_3_0_RELEASE: . source/libsmb source/rpc_server source/web
Author: jerry
Date: 2006-01-27 13:23:52 + (Fri, 27 Jan 2006)
New Revision: 13183
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13183
Log:
Final touches on 3.0.21b.
* Add new commits to release notes, fix incorrect attributions,
correct typos, etc...
* Merge fixes from jra (swat, NTLMv2, false credentials error message)
The tree is basically current with SAMBA_3_0 as of r13132
Modified:
branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
branches/SAMBA_3_0_RELEASE/source/libsmb/credentials.c
branches/SAMBA_3_0_RELEASE/source/libsmb/spnego.c
branches/SAMBA_3_0_RELEASE/source/rpc_server/srv_netlog_nt.c
branches/SAMBA_3_0_RELEASE/source/rpc_server/srv_pipe.c
branches/SAMBA_3_0_RELEASE/source/web/swat.c
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-01-27 13:10:24 UTC (rev
13182)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-01-27 13:23:52 UTC (rev
13183)
@@ -8,13 +8,13 @@
bug-fixes. Please read the following important changes in this
release.
-
Common bugs fixed in 3.0.21b include:
- o Server crashes in smbd
- o Compile issues on 64-bit platforms
- o Crash bugs on big-endian systems
+ o Server crashes in smbd.
+ o Compile issues on 64-bit platforms.
+ o Crash bugs on big-endian systems.
o Packaging fixes for RHEL/Fedora, Solaris, & Debian.
+ o Over 30 bugzilla reports closed.
##
@@ -41,6 +41,7 @@
* Force smbd to exit if the guest account internal setup fails.
* BUG 3419: vfs_full_audit fixes for multiple connections.
* Ensure SWAT lists running processes.
+* Fix NTLMv2 interoperability bug between Samba servers.
o Andrew Bartlett <[EMAIL PROTECTED]>
@@ -89,8 +90,6 @@
* Prevent 'net rpc' from dumping clear text password at high log
levels unless built with DEBUG_PASSWORD.
* Fix 'net ads user add' with a Windows 2003 SP1 DC.
-* Convert net command touse stderr for error messages rather than
- stdout.
* Fix python build.
* Fix segfault in pdb_nds.c.
* Don't write null sid mappings into the winbindd_cache.tdb.
@@ -189,6 +188,8 @@
* BUG 3264: Support backwards compatible setups using
'idmap backend = idmap_rid'.
* Add %w macro for the winbind separator.
+* Convert net command to use stderr for error messages rather
+ than stdout.
o James Peach <[EMAIL PROTECTED]>
Modified: branches/SAMBA_3_0_RELEASE/source/libsmb/credentials.c
===
--- branches/SAMBA_3_0_RELEASE/source/libsmb/credentials.c 2006-01-27
13:10:24 UTC (rev 13182)
+++ branches/SAMBA_3_0_RELEASE/source/libsmb/credentials.c 2006-01-27
13:23:52 UTC (rev 13183)
@@ -156,7 +156,7 @@
if (memcmp(dc->clnt_chal.data, rcv_cli_chal_in->data, 8)) {
DEBUG(5,("creds_server_check: challenge : %s\n",
credstr(rcv_cli_chal_in->data)));
DEBUG(5,("calculated: %s\n", credstr(dc->clnt_chal.data)));
- DEBUG(0,("creds_server_check: credentials check failed.\n"));
+ DEBUG(2,("creds_server_check: credentials check failed.\n"));
return False;
}
DEBUG(10,("creds_server_check: credentials check OK.\n"));
Modified: branches/SAMBA_3_0_RELEASE/source/libsmb/spnego.c
===
--- branches/SAMBA_3_0_RELEASE/source/libsmb/spnego.c 2006-01-27 13:10:24 UTC
(rev 13182)
+++ branches/SAMBA_3_0_RELEASE/source/libsmb/spnego.c 2006-01-27 13:23:52 UTC
(rev 13183)
@@ -341,4 +341,3 @@
out:
return ret;
}
-
Modified: branches/SAMBA_3_0_RELEASE/source/rpc_server/srv_netlog_nt.c
===
--- branches/SAMBA_3_0_RELEASE/source/rpc_server/srv_netlog_nt.c
2006-01-27 13:10:24 UTC (rev 13182)
+++ branches/SAMBA_3_0_RELEASE/source/rpc_server/srv_netlog_nt.c
2006-01-27 13:23:52 UTC (rev 13183)
@@ -470,7 +470,7 @@
/* Step the creds chain forward. */
if (!creds_server_step(p->dc, &q_u->clnt_id.cred, &cred_out)) {
- DEBUG(0,("_net_srv_pwset: creds_server_step failed. Rejecting
auth "
+ DEBUG(2,("_net_srv_pwset: creds_server_step failed. Rejecting
auth "
"request from client %s machine account %s\n",
p->dc->remote_machine, p->dc->mach_acct ));
return NT_STATUS_ACCESS_DENIED;
@@ -573,7 +573,7 @@
/* checks and updates credentials. creates reply credentials */
if (!creds_server_step(p->dc, &q_u->sam_id.client.cred,
&r_u->srv_creds)) {
- DEBUG(0,("_net_sam_logoff: creds_server_step failed. Rejecting
auth "
+ DEBUG(2,("_net_sam_logoff: creds_server_step fail
svn commit: samba r13182 - in branches/SAMBA_4_0/source/torture: . nbt
Author: jelmer
Date: 2006-01-27 13:10:24 + (Fri, 27 Jan 2006)
New Revision: 13182
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13182
Log:
Add first bits of browsing testsuite.
Added:
branches/SAMBA_4_0/source/torture/nbt/browse.c
Modified:
branches/SAMBA_4_0/source/torture/config.mk
branches/SAMBA_4_0/source/torture/torture.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/config.mk
===
--- branches/SAMBA_4_0/source/torture/config.mk 2006-01-27 05:10:20 UTC (rev
13181)
+++ branches/SAMBA_4_0/source/torture/config.mk 2006-01-27 13:10:24 UTC (rev
13182)
@@ -174,7 +174,8 @@
nbt/wins.o \
nbt/winsbench.o \
nbt/winsreplication.o \
- nbt/dgram.o
+ nbt/dgram.o \
+ nbt/browse.o
REQUIRED_SUBSYSTEMS = \
LIBSMB LIBCLI_NBT LIBCLI_WREPL
# End SUBSYSTEM TORTURE_NBT
Added: branches/SAMBA_4_0/source/torture/nbt/browse.c
===
--- branches/SAMBA_4_0/source/torture/nbt/browse.c 2006-01-27 05:10:20 UTC
(rev 13181)
+++ branches/SAMBA_4_0/source/torture/nbt/browse.c 2006-01-27 13:10:24 UTC
(rev 13182)
@@ -0,0 +1,53 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ Browse service
+
+ (C) Jelmer Vernooij 2005
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
+
+/*
+ test nbt dgram operations
+*/
+BOOL torture_nbt_browse(void)
+{
+ const char *address;
+ struct nbt_name name;
+ TALLOC_CTX *mem_ctx = talloc_new(NULL);
+ NTSTATUS status;
+ BOOL ret = True;
+
+ name.name = lp_workgroup();
+ name.type = NBT_NAME_BROWSER;
+ name.scope = NULL;
+
+ /* do an initial name resolution to find its IP */
+ status = resolve_name(&name, mem_ctx, &address, NULL);
+ if (!NT_STATUS_IS_OK(status)) {
+ printf("Failed to resolve %s - %s\n",
+ name.name, nt_errstr(status));
+ talloc_free(mem_ctx);
+ return False;
+ }
+
+ talloc_free(mem_ctx);
+
+ return ret;
+}
Property changes on: branches/SAMBA_4_0/source/torture/nbt/browse.c
___
Name: svn:eol-style
+ native
Modified: branches/SAMBA_4_0/source/torture/torture.c
===
--- branches/SAMBA_4_0/source/torture/torture.c 2006-01-27 05:10:20 UTC (rev
13181)
+++ branches/SAMBA_4_0/source/torture/torture.c 2006-01-27 13:10:24 UTC (rev
13182)
@@ -2334,6 +2334,7 @@
{"NBT-WINS", torture_nbt_wins, 0},
{"NBT-DGRAM", torture_nbt_dgram, 0},
{"NBT-WINSREPLICATION", torture_nbt_winsreplication, 0},
+ {"NBT-BROWSE", torture_nbt_browse, 0},
/* libnet tests */
{"NET-USERINFO", torture_userinfo, 0},
