[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3615-g3f884c4
The branch, v3-3-test has been updated
via 3f884c4ae36f3260e63626bdd4989d9258ae6497 (commit)
from 8819c51809cabe6ad0843f3838de53e785a10b47 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 3f884c4ae36f3260e63626bdd4989d9258ae6497
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Tue Aug 12 22:31:52 2008 +0200
Attempt to fix bug 5684
With the ctdb checkin dde9f3f006 tdb optimized out write lock checks for
write-enabled transaction. Sadly, this also removed the possibility to ever
remove dead records left over from tdb_delete calls within a transaction.
Tridge, please check this! Did dde9f3f006 have any reason beyond performance
optimizations?
Thanks,
Volker
---
Summary of changes:
source/lib/tdb/common/tdb.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/tdb/common/tdb.c b/source/lib/tdb/common/tdb.c
index 767452c..c7cec29 100644
--- a/source/lib/tdb/common/tdb.c
+++ b/source/lib/tdb/common/tdb.c
@@ -243,7 +243,7 @@ int tdb_do_delete(struct tdb_context *tdb, tdb_off_t
rec_ptr, struct list_struct
if (tdb-read_only || tdb-traverse_read) return -1;
- if (tdb-traverse_write != 0 ||
+ if (((tdb-traverse_write != 0) (!TDB_DEAD(rec))) ||
tdb_write_lock_record(tdb, rec_ptr) == -1) {
/* Someone traversing here: mark it as dead */
rec-magic = TDB_DEAD_MAGIC;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2811-g96d683d
The branch, v3-2-test has been updated
via 96d683d3ec1e95cddf9ec96326ebaf8e9cc2079c (commit)
from 8c66020a82d9b92fb10d14359b1381d58ad4972b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 96d683d3ec1e95cddf9ec96326ebaf8e9cc2079c
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Tue Aug 12 22:31:52 2008 +0200
Attempt to fix bug 5684
With the ctdb checkin dde9f3f006 tdb optimized out write lock checks for
write-enabled transaction. Sadly, this also removed the possibility to ever
remove dead records left over from tdb_delete calls within a transaction.
Tridge, please check this! Did dde9f3f006 have any reason beyond performance
optimizations?
Thanks,
Volker
---
Summary of changes:
source/lib/tdb/common/tdb.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/tdb/common/tdb.c b/source/lib/tdb/common/tdb.c
index 767452c..c7cec29 100644
--- a/source/lib/tdb/common/tdb.c
+++ b/source/lib/tdb/common/tdb.c
@@ -243,7 +243,7 @@ int tdb_do_delete(struct tdb_context *tdb, tdb_off_t
rec_ptr, struct list_struct
if (tdb-read_only || tdb-traverse_read) return -1;
- if (tdb-traverse_write != 0 ||
+ if (((tdb-traverse_write != 0) (!TDB_DEAD(rec))) ||
tdb_write_lock_record(tdb, rec_ptr) == -1) {
/* Someone traversing here: mark it as dead */
rec-magic = TDB_DEAD_MAGIC;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3616-g9920473
The branch, v3-3-test has been updated
via 9920473cc165e75ee9aa5cbb9e568eb5fb67e9e6 (commit)
from 3f884c4ae36f3260e63626bdd4989d9258ae6497 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 9920473cc165e75ee9aa5cbb9e568eb5fb67e9e6
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Mon May 19 18:15:06 2008 +0200
Add winbind:online check timeout parameter
This is a band-aid for the rather convoluted offline/online mess in winbind
right now. Winbind re-uses the offline functionality that is targeted at
domain
client installations on laptops to not overload disfunctional DCs. It uses
the
winbind cache timeout as the retry timeout after a DC reboot.
I am using a parametric options because when this mess is cleaned up, that
parameter needs to go away again.
I'd recommend to use something like
winbind:online check timeout = 30
in typical LAN environments. This means a reconnect is attempted every 30
seconds.
Volker
---
Summary of changes:
source/winbindd/winbindd_cm.c | 16
1 files changed, 16 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c
index 47df4e4..c6dab6f 100644
--- a/source/winbindd/winbindd_cm.c
+++ b/source/winbindd/winbindd_cm.c
@@ -292,6 +292,22 @@ static void check_domain_online_handler(struct
event_context *ctx,
static void calc_new_online_timeout_check(struct winbindd_domain *domain)
{
int wbc = lp_winbind_cache_time();
+ int domain_online_check;
+
+ /*
+* If winbind:online check timeout is set explicitly,
+* override the default of winbind cache timeout
+*
+* Add this as a parametric option and don't document it. The
+* whole offline abuse for non-reachable DCs needs
+* fixing. Till then, use this hackish parameter.
+*/
+
+ domain_online_check = lp_parm_int(-1, winbind,
+ online check timeout, 0);
+ if (domain_online_check != 0) {
+ wbc = domain_online_check;
+ }
if (domain-startup) {
domain-check_online_timeout = 10;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3705-g3102582
The branch, v3-3-test has been updated via 3102582f0232359069577174b2faea37e5489014 (commit) via 061a46a35d019e2cd4100a8d63ce9c25753e4c38 (commit) via e70529e477125a04d4368885f80be3c828ce2205 (commit) via ba17854342cfe8a0ad63b0f4800d16152291b50f (commit) via 815613c65597bbcde9aa1a133b86fce6a9ec554b (commit) via fe7847f3e539ed737d7b1cd5b874e2d3add78129 (commit) via 7eb4ebd364bfcfcdebb0b1a68531e440f4221574 (commit) via a687949d19ba9690f96e7869aa22e4d87840640e (commit) via 4c2ec600731117316a6bec763e9cde2845e2356c (commit) via 7f0e1732a06709131475d0174103467aa795ec19 (commit) via 30a5f682b5fe6edcdb119af6dc736f4beb40bc26 (commit) via 5d482fe9873a20d3fd97f54f1e1216c1f13f46a1 (commit) via f2ab2cebb9b81453dc0b6370288b85909182ae49 (commit) via a958c6bf1e0394e98df286974d78d3b07498e0b4 (commit) via bbd49f9e1c4b50c4a596fb991f3306e1e90c0177 (commit) via 6fe27d296c389473c24e8c627a61bd56b364ad9f (commit) via 30b83245a22ebd5e4fa4739dd2aa1805373a7eb2 (commit) via 9d3217bb28765e107c230fb90b578dcc6f5d4375 (commit) via ec8f3d75a22e7d2d7617ed33836836cd73610095 (commit) via 1d8024d261264a709b9df22fa35cdad03ab4af19 (commit) via 4b04ec29c76df837a7909725bbbf4c79d5abdb4d (commit) via 89556d28974dc2390dd88a8edd5e32912c45d27c (commit) via 9442c78b7e91051803df61f2e36e06e248e7798e (commit) via a2f70fc175b748ef160a998d0563c28381ea3466 (commit) via 571ec7893c8b40959c005d510c039e3f231ffc67 (commit) via a9f277da8b018af89ab7b9509460a158380e09d6 (commit) via 22dbe158ed62ae47bbcb41bba3db345294f75437 (commit) via ddf3022595fe8ca378c5f52107f42e296f852685 (commit) via fe6a03e7b11cd859fddae5ba924ea5e071b8ccea (commit) via 226b7d3bdf63970fc75ef08423ee984e3b7e94a5 (commit) via 2481bfce4307274806584b0d8e295cc7f638e184 (commit) via 9b1fa59d83890534264bec8f1190831eea37d9c3 (commit) via a633390d3a7cb04a7c4e14cba9c533621793287e (commit) via ba64a757f86fb60994e12e81416083ac0fa11c21 (commit) via 30a697c82db53f9d801e220a7c6277f873ebce67 (commit) via 76fbe56e827193d939676da23a580aa0f9394dd1 (commit) via 32b8db27652a66a2ade547a6d27f34d0816f7296 (commit) via 037516f1362c8d64da1d47a0cdaf83198d3eaeaf (commit) via 21729256a550509c3c038efa5acdd6ac39027dce (commit) via 2e85cbe88b3d1674b915f62e02be7d005fddaa39 (commit) via f91a3e0f7b7737c1d0667cd961ea950e2b93e592 (commit) via 126f4ac8e85458ee4693b89a184b99420f1b6bee (commit) via 87e0688a261590d45d42f17e4cdce329ebe4cd8f (commit) via cb4c74c9c206e5a445ca636fa6562ce721ea5839 (commit) via d776d8df262e1753fb428450140df94e63035af5 (commit) via 147573d7f6faab0ad90258b6a28c4b9575ccb6ea (commit) via be8c6b4f2f40014313899b5cbc1da9d390d94fee (commit) via ff413a4614c8b272a34b2a9e56a329a8e8749a34 (commit) via eaf76c751f9bde2843174b400c109304831df83e (commit) via 5258907818f8c1e338ab2c8fb4e8d83c6142a24e (commit) via f4aab595a0219305fbedf8890e787b690660a55a (commit) via 09a197e756459877cab7b4d09f534c6a41cfdd71 (commit) via 2bcc9e6ecef876030e552a607d92597f60203db2 (commit) via d004c9a7281d2577c3ba2012c8f790cc198ea700 (commit) via c939c55e5182258092faceefa58a7f328f18619e (commit) via b822bba9b9ae327bc6cee3f412f7e22ce28c1388 (commit) via 7e73792c738447049b8662617da340a73fae9bf0 (commit) via 09329f1f9114af44fc4e5e4f29a7315912313125 (commit) via bd2158fb5f5d5c0c410fe2853f61776787e1461f (commit) via e63a1a396c5cee837aed8a54b5c5ea3b2116d755 (commit) via d795c2d5dc860fbfa668160054be084fe23aa44a (commit) via 3323456e208742e160b9cabb79dc68bfbe8b1970 (commit) via fc9b30bed2d774dca6660b497cb50f982b23b885 (commit) via 7f3787a79a9949e7e80c9c5e16ec504ad1c4bdb7 (commit) via f7706c6437d6500a477cb704cb916f16fdfa1395 (commit) via 1fee80b8a643c22d356d0ca8860d5fc9580c8918 (commit) via 7c3e4a324248d61504c4c77a63d4d31e587802af (commit) via 19becb776148b7930a0abaec8038fee1158a66c4 (commit) via 549db133df6782bcca7d033e8573e47716877cbd (commit) via 5fd51833a31b326d83ac2f76d06560920547f657 (commit) via e52e2f7f1a09fff8ec37174a9dc98dc9b440ef87 (commit) via 3d24c5b4602140470c40f002d206212e388ae59b (commit) via ace315c2ffc4e81c87ba1d30c28578719cb1692b (commit) via ae2a353286a1a02936fb80edd6f899b1941403af (commit) via f978df86f9af480de26a6cf67c4f8e60d1e27139 (commit) via d18287b6284597878bc3683f16f001b949857e54 (commit) via 0d64606da69edba20f545789e526a71d01ca40b0 (commit) via c0ecb63d9e7b11bb5c31bdf95605d68c02206220 (commit) via 58085063c46f3c55c8aebc83bb79a2dd19f73622 (commit) via 1cd7201e5387ca11e9b735d37b806cb14d4a8dd3 (commit)
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2812-g5ea6991
The branch, v3-2-test has been updated
via 5ea69915a75447d9f66b651ef5601c0a7ac6cfbb (commit)
from 96d683d3ec1e95cddf9ec96326ebaf8e9cc2079c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 5ea69915a75447d9f66b651ef5601c0a7ac6cfbb
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Aug 12 19:38:22 2008 +0200
netapi: add c++ guard.
Guenther
---
Summary of changes:
source/lib/netapi/netapi.h | 10 +-
1 files changed, 9 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/netapi.h b/source/lib/netapi/netapi.h
index e9fcc37..ce97e4c 100644
--- a/source/lib/netapi/netapi.h
+++ b/source/lib/netapi/netapi.h
@@ -20,6 +20,10 @@
#ifndef __LIB_NETAPI_H__
#define __LIB_NETAPI_H__
+#ifdef __cplusplus
+extern C {
+#endif /* __cplusplus */
+
/
NET_API_STATUS
/
@@ -459,4 +463,8 @@ NET_API_STATUS NetQueryDisplayInformation(const char *
server_name /* [in] [uniq
uint32_t *entries_read /* [out] [ref]
*/,
void **buffer /* [out] [noprint,ref]
*/);
-#endif
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LIB_NETAPI_H__ */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3706-gc9e38fe
The branch, v3-3-test has been updated
via c9e38fef647520e4038f04bd163678bf4b30853d (commit)
from 3102582f0232359069577174b2faea37e5489014 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit c9e38fef647520e4038f04bd163678bf4b30853d
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Aug 12 19:38:22 2008 +0200
netapi: add c++ guard.
Guenther
---
Summary of changes:
source/lib/netapi/netapi.h |9 -
1 files changed, 8 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/netapi.h b/source/lib/netapi/netapi.h
index dbf293e..5f9cff9 100644
--- a/source/lib/netapi/netapi.h
+++ b/source/lib/netapi/netapi.h
@@ -20,6 +20,10 @@
#ifndef __LIB_NETAPI_H__
#define __LIB_NETAPI_H__
+#ifdef __cplusplus
+extern C {
+#endif /* __cplusplus */
+
/
NET_API_STATUS
/
@@ -1200,5 +1204,8 @@ NET_API_STATUS NetLocalGroupSetMembers(const char *
server_name /* [in] */,
NET_API_STATUS NetRemoteTOD(const char * server_name /* [in] */,
uint8_t **buf /* [out] [ref] */);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
-#endif
+#endif /* __LIB_NETAPI_H__ */
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - b567e215f5c58d646a392408b9cc1df8ef029b33
The branch, master has been updated
via b567e215f5c58d646a392408b9cc1df8ef029b33 (commit)
from c4ad24e7c2b27b168d43ebfa95c459da27697d1e (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit b567e215f5c58d646a392408b9cc1df8ef029b33
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Wed Aug 13 22:03:29 2008 +1000
Add two new ctdb commands :
ctdb backupdb : which will copy a database out from ctdb and write it to a
file
ctdb restoredb : which will read a database backup from a file and write it
into ctdb
---
Summary of changes:
tools/ctdb.c | 270 +-
1 files changed, 269 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/tools/ctdb.c b/tools/ctdb.c
index 4a3aa87..55f1908 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -1751,7 +1751,7 @@ static int control_attach(struct ctdb_context *ctdb, int
argc, const char **argv
}
/*
- dump memory usage
+ run an eventscript on a node
*/
static int control_eventscript(struct ctdb_context *ctdb, int argc, const char
**argv)
{
@@ -1782,6 +1782,272 @@ static int control_eventscript(struct ctdb_context
*ctdb, int argc, const char *
return 0;
}
+struct db_file_header {
+ unsigned long persistent;
+ unsigned long size;
+};
+
+/*
+ * backup a database to a file
+ */
+static int control_backupdb(struct ctdb_context *ctdb, int argc, const char
**argv)
+{
+ int i, ret;
+ struct ctdb_dbid_map *dbmap=NULL;
+ struct ctdb_node_map *nodemap=NULL;
+ TALLOC_CTX *tmp_ctx = talloc_new(ctdb);
+ TDB_DATA outdata;
+ struct db_file_header dbhdr;
+ int fh;
+ uint32_t *nodes;
+
+ if (argc != 2) {
+ DEBUG(DEBUG_ERR,(Invalid arguments\n));
+ return -1;
+ }
+
+ ret = ctdb_ctrl_getdbmap(ctdb, TIMELIMIT(), options.pnn, tmp_ctx,
dbmap);
+ if (ret != 0) {
+ DEBUG(DEBUG_ERR, (Unable to get dbids from node %u\n,
options.pnn));
+ return ret;
+ }
+
+ for(i=0;idbmap-num;i++){
+ const char *name;
+
+ ctdb_ctrl_getdbname(ctdb, TIMELIMIT(), options.pnn,
dbmap-dbs[i].dbid, tmp_ctx, name);
+ if(!strcmp(argv[0], name)){
+ talloc_free(discard_const(name));
+ break;
+ }
+ talloc_free(discard_const(name));
+ }
+ if (i == dbmap-num) {
+ DEBUG(DEBUG_ERR,(No database with name '%s' found\n,
argv[0]));
+ talloc_free(tmp_ctx);
+ return -1;
+ }
+
+ ret = ctdb_ctrl_getnodemap(ctdb, TIMELIMIT(), options.pnn, ctdb,
nodemap);
+ if (ret != 0) {
+ DEBUG(DEBUG_ERR, (Unable to get nodemap from node %u\n,
options.pnn));
+ talloc_free(tmp_ctx);
+ return ret;
+ }
+
+ /* freeze all nodes */
+ nodes = list_of_active_nodes(ctdb, nodemap, tmp_ctx, true);
+ if (ctdb_client_async_control(ctdb, CTDB_CONTROL_FREEZE,
+ nodes, TIMELIMIT(),
+ false, tdb_null,
+ NULL, NULL,
+ NULL) != 0) {
+ DEBUG(DEBUG_ERR, (Unable to freeze nodes.\n));
+ ctdb_ctrl_setrecmode(ctdb, TIMELIMIT(), options.pnn,
CTDB_RECOVERY_ACTIVE);
+ talloc_free(tmp_ctx);
+ return -1;
+ }
+
+ ret = ctdb_ctrl_pulldb(ctdb, options.pnn, dbmap-dbs[i].dbid,
+ CTDB_LMASTER_ANY, tmp_ctx,
+ TIMELIMIT(), outdata);
+ if (ret != 0) {
+ DEBUG(DEBUG_ERR,(__location__ Unable to copy db from node
%u\n, options.pnn));
+ ctdb_ctrl_setrecmode(ctdb, TIMELIMIT(), options.pnn,
CTDB_RECOVERY_ACTIVE);
+ talloc_free(tmp_ctx);
+ return -1;
+ }
+
+ /* thaw all nodes */
+ nodes = list_of_active_nodes(ctdb, nodemap, tmp_ctx, true);
+ if (ctdb_client_async_control(ctdb, CTDB_CONTROL_THAW,
+ nodes, TIMELIMIT(),
+ false, tdb_null,
+ NULL, NULL,
+ NULL) != 0) {
+ DEBUG(DEBUG_ERR, (Unable to thaw nodes.\n));
+ ctdb_ctrl_setrecmode(ctdb, TIMELIMIT(), options.pnn,
CTDB_RECOVERY_ACTIVE);
+ talloc_free(tmp_ctx);
+ return -1;
+ }
+
+ fh = open(argv[1], O_RDWR|O_CREAT, 0600);
+ if (fh == -1) {
+ DEBUG(DEBUG_ERR,(Failed to open file '%s'\n, argv[1]));
+ talloc_free(tmp_ctx);
+ return -1;
+
svn commit: samba-web r1214 - in trunk/devel: .
Author: kseeger Date: 2008-08-13 13:05:12 + (Wed, 13 Aug 2008) New Revision: 1214 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1214 Log: -Fix current release -Add new branches -Remove superfluous list item Karolin Modified: trunk/devel/index.html Changeset: Modified: trunk/devel/index.html === --- trunk/devel/index.html 2008-08-05 12:38:30 UTC (rev 1213) +++ trunk/devel/index.html 2008-08-13 13:05:12 UTC (rev 1214) @@ -20,9 +20,9 @@ 3.0.x and 2.2.x versions of Samba, which are no longer in active development. /p -pThe latest production release is emSamba 3.2.0/em (a -href=/samba/history/samba-3.0.30.htmlrelease notes/a and a -href=/samba/download/download/a)./p +pThe latest production release is emSamba 3.2.1/em (a +href=/samba/history/samba-3.2.1.htmlrelease notes/a and a +href=/samba/download/download/a)./p pWith the release of version 3 of the GPL, the Samba Team has decided to release the next major production version of Samba under GPLv3. The next version @@ -55,6 +55,18 @@ ul li + h4emv3-devel/em/h4 + pThis is the permanent branch for 3.x development./p +/li +li + h4emv3-3-test/em/h4 + pThis is the current branch for 3.2.x development./p +/li +li + h4emv3-3-stable/em/h4 + pThis is the current branch for 3.2.x production releases./p +/li +li h4emv3-2-test/em/h4 pThis is the current branch for 3.2.x development./p /li @@ -79,7 +91,6 @@ h4emv4-0-stable/em/h4 pThis is the current branch for 4.x.x Alpha releases./p /li -li /ul br /
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3708-ge25fadd
The branch, v3-devel has been updated via e25fadd35900bda1ab411ac5abcf664b5eeb531f (commit) via 1ed4b2151e60050455e0b3564afe01b0c030b71e (commit) from c9e38fef647520e4038f04bd163678bf4b30853d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel - Log - commit e25fadd35900bda1ab411ac5abcf664b5eeb531f Author: Karolin Seeger [EMAIL PROTECTED] Date: Wed Aug 13 15:29:06 2008 +0200 WHATSNEW: Start WHATSNEW for 3.4.0pre1. Karolin commit 1ed4b2151e60050455e0b3564afe01b0c030b71e Author: Karolin Seeger [EMAIL PROTECTED] Date: Wed Aug 13 15:25:09 2008 +0200 VERSION: Raise version number. Karolin --- Summary of changes: WHATSNEW.txt | 10 +- source/VERSION |6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 730f816..65d226c 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,14 +1,14 @@ = - Release Notes for Samba 3.3.0pre1 -August 19, 2008 + Release Notes for Samba 3.4.0pre1 + = -This is the first preview release of Samba 3.3.0. This is *not* +This is the first preview release of Samba 3.4. This is *not* intended for production environments and is designed for testing purposes only. Please report any defects via the Samba bug reporting system at https://bugzilla.samba.org/. -Major enhancements in Samba 3.3.0 include: +Major enhancements in Samba 3.4.0 include: o @@ -23,7 +23,7 @@ joining the #samba-technical IRC channel on irc.freenode.net. If you do report problems then please try to send high quality feedback. If you don't provide vital information to help us track down the problem then you will probably be ignored. All bug reports should -be filed under the Samba 3.2 product in the project's Bugzilla +be filed under the Samba 3.4 product in the project's Bugzilla database (https://bugzilla.samba.org/). diff --git a/source/VERSION b/source/VERSION index 758956e..180d04e 100644 --- a/source/VERSION +++ b/source/VERSION @@ -24,7 +24,7 @@ # - 3.0.0 # SAMBA_VERSION_MAJOR=3 -SAMBA_VERSION_MINOR=3 +SAMBA_VERSION_MINOR=4 SAMBA_VERSION_RELEASE=0 @@ -46,7 +46,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # - 2.2.9pre1 # -SAMBA_VERSION_PRE_RELEASE=1 +SAMBA_VERSION_PRE_RELEASE= # For 'rc' releases the version will be# @@ -84,7 +84,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=yes # SAMBA_VERSION_VENDOR_FUNCTION # # # -SAMBA_VERSION_VENDOR_SUFFIX=test +SAMBA_VERSION_VENDOR_SUFFIX=devel SAMBA_VERSION_VENDOR_PATCH= -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3707-gadf9673
The branch, v3-3-test has been updated via adf967308193f61d2c710857af403cf0b09848a1 (commit) from c9e38fef647520e4038f04bd163678bf4b30853d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit adf967308193f61d2c710857af403cf0b09848a1 Author: Karolin Seeger [EMAIL PROTECTED] Date: Wed Aug 13 16:04:32 2008 +0200 WHATSNEW: Fix version string. Karolin --- Summary of changes: WHATSNEW.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 730f816..539a1c6 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -23,7 +23,7 @@ joining the #samba-technical IRC channel on irc.freenode.net. If you do report problems then please try to send high quality feedback. If you don't provide vital information to help us track down the problem then you will probably be ignored. All bug reports should -be filed under the Samba 3.2 product in the project's Bugzilla +be filed under the Samba 3.3 product in the project's Bugzilla database (https://bugzilla.samba.org/). -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-2-0pre2-3707-g423cc3e
The branch, v3-3-stable has been updated via 423cc3ef27511592b960d3cc4020ef4c8fd9c75f (commit) from c9e38fef647520e4038f04bd163678bf4b30853d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable - Log - commit 423cc3ef27511592b960d3cc4020ef4c8fd9c75f Author: Karolin Seeger [EMAIL PROTECTED] Date: Wed Aug 13 16:04:32 2008 +0200 WHATSNEW: Fix version string. Karolin (cherry picked from commit adf967308193f61d2c710857af403cf0b09848a1) --- Summary of changes: WHATSNEW.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 730f816..539a1c6 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -23,7 +23,7 @@ joining the #samba-technical IRC channel on irc.freenode.net. If you do report problems then please try to send high quality feedback. If you don't provide vital information to help us track down the problem then you will probably be ignored. All bug reports should -be filed under the Samba 3.2 product in the project's Bugzilla +be filed under the Samba 3.3 product in the project's Bugzilla database (https://bugzilla.samba.org/). -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2813-gf03ffcb
The branch, v3-2-test has been updated via f03ffcb78e4ea8a8bd4a5fa0d26642544314a5e4 (commit) from 5ea69915a75447d9f66b651ef5601c0a7ac6cfbb (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit f03ffcb78e4ea8a8bd4a5fa0d26642544314a5e4 Author: Karolin Seeger [EMAIL PROTECTED] Date: Wed Aug 13 16:38:18 2008 +0200 WHATSNEW: Update changes since 3.2.1. Karolin --- Summary of changes: WHATSNEW.txt | 19 ++- 1 files changed, 18 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 163f7e2..a10605a 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -7,7 +7,9 @@ This is the third stable release of Samba 3.2. Major bug fixes included in Samba 3.2.2 are: - o + o Fix removal of dead records in tdb files. This can lead to very large +tdb files and to overflowing partitions as a consequence on systems +running an nmbd daemon. ## @@ -21,11 +23,14 @@ Changes since 3.2.1 o Michael Adam [EMAIL PROTECTED] * Fix replacement of random seed generator. * Fix a race condition in idmap_tdb2_allocate_id(). +* Fix unix_convert() for * after changing map_nt_error_from_unix(). +* Make sure to always set errno on error path in OpenDir. o Jeremy Allison [EMAIL PROTECTED] * BUG 5675: Fix smbspool program assuming Kerberos authentication by mistake. +* BUG 5686: Fix segfaults in libsmbclient. * Several build fixes. @@ -40,14 +45,26 @@ o Yannick Bergeron [EMAIL PROTECTED] rep_initgroups(). +o Günther Deschner [EMAIL PROTECTED] +* Fix build warning. +* Add add c++ guard to netapi. + + o Volker Lendecke [EMAIL PROTECTED] +* BUG 5684: Fix removal of dead records in tdb files. * Fix smb_len calculation for chained requests. +o Herb Lewis [EMAIL PROTECTED] +* Fix output of test status. + + o Andrew Tridgell [EMAIL PROTECTED] * Fix a fd leak when trying to regain contact to a domain controller in Winbind. * Fix permissions on ctdb databases. +* Fix passing back success when a function had in fact failed in two + places. ## -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-1-29-gb4c445f
The branch, v3-2-stable has been updated via b4c445fd2439df65839049371d9e9ed6373b9cd7 (commit) via b8942e2d1f4160dfaa519a21a49c056ae84378bf (commit) via ba0b188abb3f680ee0686f53a903d25fe363d83e (commit) via 377017b3a14140a8a74623c2fdf00299de441317 (commit) via 40dc7e9a38e6c5f9c551625a7553fb0c9eb1d867 (commit) via 6a658505d697c350cba7d417534f11784ac3100c (commit) via 5a695336462f5a21debdd20b2346c712adbfae6e (commit) via 9fcc15e0307ec1621482101b5730de1a635a191d (commit) from 9936dd1f611c275a38b9e5148bc6bf383bc306c0 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit b4c445fd2439df65839049371d9e9ed6373b9cd7 Author: Karolin Seeger [EMAIL PROTECTED] Date: Wed Aug 13 16:38:18 2008 +0200 WHATSNEW: Update changes since 3.2.1. Karolin (cherry picked from commit f03ffcb78e4ea8a8bd4a5fa0d26642544314a5e4) commit b8942e2d1f4160dfaa519a21a49c056ae84378bf Author: Günther Deschner [EMAIL PROTECTED] Date: Tue Aug 12 19:38:22 2008 +0200 netapi: add c++ guard. Guenther (cherry picked from commit 5ea69915a75447d9f66b651ef5601c0a7ac6cfbb) commit ba0b188abb3f680ee0686f53a903d25fe363d83e Author: Volker Lendecke [EMAIL PROTECTED] Date: Tue Aug 12 22:31:52 2008 +0200 Attempt to fix bug 5684 With the ctdb checkin dde9f3f006 tdb optimized out write lock checks for write-enabled transaction. Sadly, this also removed the possibility to ever remove dead records left over from tdb_delete calls within a transaction. Tridge, please check this! Did dde9f3f006 have any reason beyond performance optimizations? Thanks, Volker (cherry picked from commit 96d683d3ec1e95cddf9ec96326ebaf8e9cc2079c) commit 377017b3a14140a8a74623c2fdf00299de441317 Author: Andrew Tridgell [EMAIL PROTECTED] Date: Sun Aug 10 10:43:36 2008 +1000 I found lots of places where we assume error will be set when calling one of our virtualised functions, such as db_open(), but error is only set when a system call fails, and it is not uncommon for us to fail a function internally without ever making a system call. That led to us passing back success when a function had in fact failed. I found two places where we relied on map_nt_error_from_unix() returning success when errno==0, but lots and lots of places where we relied on the reverse, so I fixed those two places. map_nt_error_from_unix() will now always return an error, returning NT_STATUS_UNSUCCESSFUL if errno is 0 (cherry picked from commit 69d40ca4c1af925d4b0e59ddc69ef8c26e6501d1) (cherry picked from commit 8c66020a82d9b92fb10d14359b1381d58ad4972b) commit 40dc7e9a38e6c5f9c551625a7553fb0c9eb1d867 Author: Michael Adam [EMAIL PROTECTED] Date: Tue Aug 12 14:59:59 2008 +0200 Fix unix_convert() for * after changing map_nt_error_from_unix(). map_nt_error_from_unix() now assumes that it is called in an error path and returns an error even for a given errno == 0. The original behaviour of unix_convert() used the mapping of errno == 0 == NT_STATUS_OK to return success through an error path. I think this must have been an oversight, and unix_convert() worked only by coincidence (or because explicitly using the knowledge of the conceptually wrong working of map_nt_error_from_unix(). This patch puts this straight by not interpreting errno == 0 as an error condition and proceeding in that case. Jeremy - please check! Michael (cherry picked from commit 736bdf15d934028b579a02dc411aed6c14a437f3) commit 6a658505d697c350cba7d417534f11784ac3100c Author: Michael Adam [EMAIL PROTECTED] Date: Tue Aug 12 15:19:17 2008 +0200 Make sure to always set errno on error path in OpenDir (and hence scan_directory). Michael (cherry picked from commit 06304f3c5f538c75bfc63c7abc1457d2b4dc0f0b) commit 5a695336462f5a21debdd20b2346c712adbfae6e Author: Herb Lewis [EMAIL PROTECTED] Date: Tue Aug 12 13:38:51 2008 -0700 print correct test status (cherry picked from commit ccd413b8b10c99f18b6369717116765c3397edfb) commit 9fcc15e0307ec1621482101b5730de1a635a191d Author: Jeremy Allison [EMAIL PROTECTED] Date: Tue Aug 12 13:34:00 2008 -0700 Fix bug 5686 - libsmbclient segfaults with more than one SMBCCTX. Here is a patch to allow many subsystems to be re-initialized. The only functional change I made was to remove the null context tracking, as the memory allocated here is designed to be left for the complete lifetime of the program. Freeing this early (when all smb contexts are destroyed) could crash other users of talloc. Jeremy. (cherry picked from commit 4779f1efccc8364fd8b3ba446aa96ba0bddec689) --- Summary of
SVN repository problem.
Hi, I don't know if it's right list to ask for. But I'm having some problems to checkout a specific project from svn. I'm trying to fetch sangria (samba management python framework). svn co svn://svnanon.samba.org/lorikeet/trunk/sangria sangria svn: Can't find a temporary directory I asked at irc channel and they tell me to ask in samba's list. Here's the log: 11:37 brunors hi all, I have a doubt about fetching a repo in svn. how can I fetch this project using svn? http://viewcvs.samba.org/cgi-bin/viewcvs.cgi/trunk/sangria/?root=lorikeet 11:38 brunors I'm interested in samba management python framework inside this project 11:52 obnox do you want to checkout the main lorikeet / heimdal? 11:53 brunors only sangria if it's possible 11:54 brunors sangria is a samba management python framework, I'm interested because I'm developing a python/django web interface to samba 11:54 obnox lemme check 11:58 brunors thanks 12:03 obnox brunors: svn co svn://svnanon.samba.org/lorikeet should actually work 12:05 brunors let me try 12:06 brunors svn: Can't find a temporary directory 12:06 obnox hmm, same here 12:06 obnox but it worked, though 12:07 brunors ls -l lorikeet/ 12:07 brunors total 0 12:07 obnox but .svn is there 12:07 obnox svn list works 12:08 brunors well, but how can I fetch the files? 12:13 obnox hmm, getting the same error 12:14 metze_away hmm xinetd doesn't listen on the svn port 12:15 obnox aha 12:16 metze_away grr, I looked at the pid not the port number 12:16 metze_away it runs 12:16 obnox i can svn list svn://svnanon.samba.org/lorikeet 12:16 obnox its the same for all repos there 12:21 metze_away brunors: please write a mail to the list 12:21 metze_away I have to leave now 12:29 obnox i have no permission to change things on the server. 13:03 brunors thanks, I'll post the problem on list 13:03 brunors obnox: thanks for the help 13:03 brunors metze_away: thanks Can somebody help me please? Thanks! Bruno Ribeiro
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3708-g68b79e0
The branch, v3-3-test has been updated
via 68b79e073d940bcdef6ff9eb79a39657ff6e909e (commit)
from adf967308193f61d2c710857af403cf0b09848a1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 68b79e073d940bcdef6ff9eb79a39657ff6e909e
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Wed Aug 13 17:40:30 2008 +0200
If it is a forced DOS error, nt_errstr should say so
---
Summary of changes:
source/libsmb/nterr.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/nterr.c b/source/libsmb/nterr.c
index fc63403..a52a1bc 100644
--- a/source/libsmb/nterr.c
+++ b/source/libsmb/nterr.c
@@ -658,6 +658,11 @@ const char *nt_errstr(NTSTATUS nt_code)
}
#endif
+ if (NT_STATUS_IS_DOS(nt_code)) {
+ return smb_dos_err_name(NT_STATUS_DOS_CLASS(nt_code),
+ NT_STATUS_DOS_CODE(nt_code));
+ }
+
while (nt_errs[idx].nt_errstr != NULL) {
if (NT_STATUS_EQUAL(nt_errs[idx].nt_errcode, nt_code)) {
return nt_errs[idx].nt_errstr;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3709-gef5489a
The branch, v3-devel has been updated
via ef5489ac805237274d6088aaa7ae870cc0deb52f (commit)
from e25fadd35900bda1ab411ac5abcf664b5eeb531f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit ef5489ac805237274d6088aaa7ae870cc0deb52f
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Wed Aug 13 17:40:30 2008 +0200
If it is a forced DOS error, nt_errstr should say so
---
Summary of changes:
source/libsmb/nterr.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/nterr.c b/source/libsmb/nterr.c
index fc63403..a52a1bc 100644
--- a/source/libsmb/nterr.c
+++ b/source/libsmb/nterr.c
@@ -658,6 +658,11 @@ const char *nt_errstr(NTSTATUS nt_code)
}
#endif
+ if (NT_STATUS_IS_DOS(nt_code)) {
+ return smb_dos_err_name(NT_STATUS_DOS_CLASS(nt_code),
+ NT_STATUS_DOS_CODE(nt_code));
+ }
+
while (nt_errs[idx].nt_errstr != NULL) {
if (NT_STATUS_EQUAL(nt_errs[idx].nt_errcode, nt_code)) {
return nt_errs[idx].nt_errstr;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3709-g64e26c5
The branch, v3-3-test has been updated
via 64e26c59e1b9bea68501b2bcb1de572abfbde2e4 (commit)
from 68b79e073d940bcdef6ff9eb79a39657ff6e909e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 64e26c59e1b9bea68501b2bcb1de572abfbde2e4
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Wed Aug 13 18:17:53 2008 +0200
Revert If it is a forced DOS error, nt_errstr should say so
This reverts commit 68b79e073d940bcdef6ff9eb79a39657ff6e909e.
Always, always build and run make test before checkin...
---
Summary of changes:
source/libsmb/nterr.c |5 -
1 files changed, 0 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/nterr.c b/source/libsmb/nterr.c
index a52a1bc..fc63403 100644
--- a/source/libsmb/nterr.c
+++ b/source/libsmb/nterr.c
@@ -658,11 +658,6 @@ const char *nt_errstr(NTSTATUS nt_code)
}
#endif
- if (NT_STATUS_IS_DOS(nt_code)) {
- return smb_dos_err_name(NT_STATUS_DOS_CLASS(nt_code),
- NT_STATUS_DOS_CODE(nt_code));
- }
-
while (nt_errs[idx].nt_errstr != NULL) {
if (NT_STATUS_EQUAL(nt_errs[idx].nt_errcode, nt_code)) {
return nt_errs[idx].nt_errstr;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3710-ge987e99
The branch, v3-devel has been updated
via e987e9956f02557c7ec87a369b92f87083fda620 (commit)
from ef5489ac805237274d6088aaa7ae870cc0deb52f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit e987e9956f02557c7ec87a369b92f87083fda620
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Wed Aug 13 18:19:06 2008 +0200
Revert If it is a forced DOS error, nt_errstr should say so
This reverts commit ef5489ac805237274d6088aaa7ae870cc0deb52f.
---
Summary of changes:
source/libsmb/nterr.c |5 -
1 files changed, 0 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/nterr.c b/source/libsmb/nterr.c
index a52a1bc..fc63403 100644
--- a/source/libsmb/nterr.c
+++ b/source/libsmb/nterr.c
@@ -658,11 +658,6 @@ const char *nt_errstr(NTSTATUS nt_code)
}
#endif
- if (NT_STATUS_IS_DOS(nt_code)) {
- return smb_dos_err_name(NT_STATUS_DOS_CLASS(nt_code),
- NT_STATUS_DOS_CODE(nt_code));
- }
-
while (nt_errs[idx].nt_errstr != NULL) {
if (NT_STATUS_EQUAL(nt_errs[idx].nt_errcode, nt_code)) {
return nt_errs[idx].nt_errstr;
--
Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3616-g9920473
On Wed, Aug 13, 2008 at 04:52:43AM -0500, Michael Adam wrote: The branch, v3-3-test has been updated via 9920473cc165e75ee9aa5cbb9e568eb5fb67e9e6 (commit) from 3f884c4ae36f3260e63626bdd4989d9258ae6497 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 9920473cc165e75ee9aa5cbb9e568eb5fb67e9e6 Author: Volker Lendecke [EMAIL PROTECTED] Date: Mon May 19 18:15:06 2008 +0200 Add winbind:online check timeout parameter This is a band-aid for the rather convoluted offline/online mess in winbind right now. Winbind re-uses the offline functionality that is targeted at domain client installations on laptops to not overload disfunctional DCs. It uses the winbind cache timeout as the retry timeout after a DC reboot. I am using a parametric options because when this mess is cleaned up, that parameter needs to go away again. I'd recommend to use something like winbind:online check timeout = 30 in typical LAN environments. This means a reconnect is attempted every 30 seconds. Can you give me some background on what you're fixing with this please ? Jeremy.
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3710-g4985f26
The branch, v3-3-test has been updated
via 4985f2622ba9de7c8d7a661c89c5510300505b0b (commit)
from 64e26c59e1b9bea68501b2bcb1de572abfbde2e4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 4985f2622ba9de7c8d7a661c89c5510300505b0b
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Wed Aug 13 19:46:16 2008 +0200
Revert Add winbind:online check timeout parameter
This reverts commit 9920473cc165e75ee9aa5cbb9e568eb5fb67e9e6.
---
Summary of changes:
source/winbindd/winbindd_cm.c | 16
1 files changed, 0 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c
index c6dab6f..47df4e4 100644
--- a/source/winbindd/winbindd_cm.c
+++ b/source/winbindd/winbindd_cm.c
@@ -292,22 +292,6 @@ static void check_domain_online_handler(struct
event_context *ctx,
static void calc_new_online_timeout_check(struct winbindd_domain *domain)
{
int wbc = lp_winbind_cache_time();
- int domain_online_check;
-
- /*
-* If winbind:online check timeout is set explicitly,
-* override the default of winbind cache timeout
-*
-* Add this as a parametric option and don't document it. The
-* whole offline abuse for non-reachable DCs needs
-* fixing. Till then, use this hackish parameter.
-*/
-
- domain_online_check = lp_parm_int(-1, winbind,
- online check timeout, 0);
- if (domain_online_check != 0) {
- wbc = domain_online_check;
- }
if (domain-startup) {
domain-check_online_timeout = 10;
--
Samba Shared Repository
svn commit: samba-web r1215 - in trunk/patches: . patches-3.2.1
Author: jerry Date: 2008-08-13 18:46:59 + (Wed, 13 Aug 2008) New Revision: 1215 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1215 Log: Prepping for patches for 3.2.1 Added: trunk/patches/patches-3.2.1/ trunk/patches/patches-3.2.1/series trunk/patches/series-3.2.1 Modified: trunk/patches/patches trunk/patches/series Changeset: Modified: trunk/patches/patches === --- trunk/patches/patches 2008-08-13 13:05:12 UTC (rev 1214) +++ trunk/patches/patches 2008-08-13 18:46:59 UTC (rev 1215) @@ -1 +1 @@ -link patches-3.0.24 \ No newline at end of file +link patches-3.2.1 \ No newline at end of file Added: trunk/patches/patches-3.2.1/series === Modified: trunk/patches/series === --- trunk/patches/series2008-08-13 13:05:12 UTC (rev 1214) +++ trunk/patches/series2008-08-13 18:46:59 UTC (rev 1215) @@ -1 +1 @@ -link patches-3.0.24/series \ No newline at end of file +link patches-3.2.1/series \ No newline at end of file Added: trunk/patches/series-3.2.1 === --- trunk/patches/series-3.2.1 2008-08-13 13:05:12 UTC (rev 1214) +++ trunk/patches/series-3.2.1 2008-08-13 18:46:59 UTC (rev 1215) @@ -0,0 +1 @@ +link patches-3.2.1/series \ No newline at end of file Property changes on: trunk/patches/series-3.2.1 ___ Name: svn:special + *
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2814-g43054b1
The branch, v3-2-test has been updated via 43054b199cb2a5f12c8e0c2bb14cf2328a945152 (commit) from f03ffcb78e4ea8a8bd4a5fa0d26642544314a5e4 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 43054b199cb2a5f12c8e0c2bb14cf2328a945152 Author: Jim McDonough [EMAIL PROTECTED] Date: Wed Aug 13 18:03:51 2008 -0400 Prevent NT_STATUS 0xF100 errors from appearing when dos errors are used and there is no error. It should be mapped directly to NT_STATUS_OK. smbclient to older servers didn't work. --- Summary of changes: source/libsmb/async_smb.c |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/libsmb/async_smb.c b/source/libsmb/async_smb.c index 04c22a9..58bba2b 100644 --- a/source/libsmb/async_smb.c +++ b/source/libsmb/async_smb.c @@ -31,6 +31,12 @@ NTSTATUS cli_pull_error(char *buf) return NT_STATUS(IVAL(buf, smb_rcls)); } + /* if the client uses dos errors, but there is no error, + we should return no error here, otherwise it looks + like an unknown bad NT_STATUS. jmcd */ + if (CVAL(buf, smb_rcls) == 0) + return NT_STATUS_OK; + return NT_STATUS_DOS(CVAL(buf, smb_rcls), SVAL(buf,smb_err)); } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3711-gaf817c2
The branch, v3-3-test has been updated via af817c2817e56aa95ac8641537f13e77307e9eb8 (commit) from 4985f2622ba9de7c8d7a661c89c5510300505b0b (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit af817c2817e56aa95ac8641537f13e77307e9eb8 Author: Jim McDonough [EMAIL PROTECTED] Date: Wed Aug 13 18:03:51 2008 -0400 Prevent NT_STATUS 0xF100 errors from appearing when dos errors are used and there is no error. It should be mapped directly to NT_STATUS_OK. smbclient to older servers didn't work. --- Summary of changes: source/libsmb/async_smb.c |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/libsmb/async_smb.c b/source/libsmb/async_smb.c index 04c22a9..58bba2b 100644 --- a/source/libsmb/async_smb.c +++ b/source/libsmb/async_smb.c @@ -31,6 +31,12 @@ NTSTATUS cli_pull_error(char *buf) return NT_STATUS(IVAL(buf, smb_rcls)); } + /* if the client uses dos errors, but there is no error, + we should return no error here, otherwise it looks + like an unknown bad NT_STATUS. jmcd */ + if (CVAL(buf, smb_rcls) == 0) + return NT_STATUS_OK; + return NT_STATUS_DOS(CVAL(buf, smb_rcls), SVAL(buf,smb_err)); } -- Samba Shared Repository
[SCM] CTDB repository - branch master updated - 0674b33a7492cc1a194833f5ca87d8b30457faee
The branch, master has been updated
via 0674b33a7492cc1a194833f5ca87d8b30457faee (commit)
via 77762170ad1dbc4620565bb898af5d493fac117d (commit)
from b567e215f5c58d646a392408b9cc1df8ef029b33 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 0674b33a7492cc1a194833f5ca87d8b30457faee
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Thu Aug 14 08:36:39 2008 +1000
store the database name, not the backup filename in the database header
commit 77762170ad1dbc4620565bb898af5d493fac117d
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Thu Aug 14 08:35:19 2008 +1000
Encode a file version number in the database backup header
Encode the database name in the header so we dont need to provide the
database
name when doing a restore
Encode a timestamp in the header telling us when the backup was created
---
Summary of changes:
tools/ctdb.c | 38 --
1 files changed, 32 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/tools/ctdb.c b/tools/ctdb.c
index 55f1908..7d8cf84 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -1782,9 +1782,14 @@ static int control_eventscript(struct ctdb_context
*ctdb, int argc, const char *
return 0;
}
+#define DB_VERSION 1
+#define MAX_DB_NAME 64
struct db_file_header {
+ unsigned long version;
+ time_t timestamp;
unsigned long persistent;
unsigned long size;
+ const char name[MAX_DB_NAME];
};
/*
@@ -1878,8 +1883,16 @@ static int control_backupdb(struct ctdb_context *ctdb,
int argc, const char **ar
return -1;
}
+ dbhdr.version = DB_VERSION;
+ dbhdr.timestamp = time(NULL);
dbhdr.persistent = dbmap-dbs[i].persistent;
dbhdr.size = outdata.dsize;
+ if (strlen(argv[0]) = MAX_DB_NAME) {
+ DEBUG(DEBUG_ERR,(Too long dbname\n));
+ talloc_free(tmp_ctx);
+ return -1;
+ }
+ strncpy(discard_const(dbhdr.name), argv[0], MAX_DB_NAME);
write(fh, dbhdr, sizeof(dbhdr));
write(fh, outdata.dptr, outdata.dsize);
@@ -1905,20 +1918,28 @@ static int control_restoredb(struct ctdb_context *ctdb,
int argc, const char **a
struct ctdb_control_wipe_database w;
uint32_t *nodes;
uint32_t generation;
+ struct tm *tm;
+ char tbuf[100];
- if (argc != 2) {
+ if (argc != 1) {
DEBUG(DEBUG_ERR,(Invalid arguments\n));
return -1;
}
- fh = open(argv[1], O_RDONLY);
+ fh = open(argv[0], O_RDONLY);
if (fh == -1) {
- DEBUG(DEBUG_ERR,(Failed to open file '%s'\n, argv[1]));
+ DEBUG(DEBUG_ERR,(Failed to open file '%s'\n, argv[0]));
talloc_free(tmp_ctx);
return -1;
}
read(fh, dbhdr, sizeof(dbhdr));
+ if (dbhdr.version != DB_VERSION) {
+ DEBUG(DEBUG_ERR,(Invalid version of database dump. File is
version %lu but expected version was %u\n, dbhdr.version, DB_VERSION));
+ talloc_free(tmp_ctx);
+ return -1;
+ }
+
outdata.dsize = dbhdr.size;
outdata.dptr = talloc_size(tmp_ctx, outdata.dsize);
if (outdata.dptr == NULL) {
@@ -1930,10 +1951,15 @@ static int control_restoredb(struct ctdb_context *ctdb,
int argc, const char **a
read(fh, outdata.dptr, outdata.dsize);
close(fh);
+ tm = localtime(dbhdr.timestamp);
+ strftime(tbuf,sizeof(tbuf)-1,%Y/%m/%d %H:%M:%S, tm);
+ printf(Restoring database '%s' from backup @ %s\n,
+ dbhdr.name, tbuf);
+
- ctdb_db = ctdb_attach(ctdb, argv[0], dbhdr.persistent, 0);
+ ctdb_db = ctdb_attach(ctdb, dbhdr.name, dbhdr.persistent, 0);
if (ctdb_db == NULL) {
- DEBUG(DEBUG_ERR,(Unable to attach to database '%s'\n,
argv[0]));
+ DEBUG(DEBUG_ERR,(Unable to attach to database '%s'\n,
dbhdr.name));
talloc_free(tmp_ctx);
return -1;
}
@@ -2247,7 +2273,7 @@ static const struct {
{ delip, control_delip, false, delete an ip
address from a node, ip},
{ eventscript, control_eventscript, true, run the
eventscript with the given parameters on a node, arguments},
{ backupdb,control_backupdb, false, backup the
database into a file., database file},
- { restoredb,control_restoredb, false, restore the
database from a file., database file},
+ { restoredb,control_restoredb, false, restore the
database from a file., file},
};
/*
--
CTDB repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2815-g93c977e
The branch, v3-2-test has been updated via 93c977e80594e20ebd562b1eb8a03d57b9299461 (commit) from 43054b199cb2a5f12c8e0c2bb14cf2328a945152 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 93c977e80594e20ebd562b1eb8a03d57b9299461 Author: Jeremy Allison [EMAIL PROTECTED] Date: Wed Aug 13 15:48:26 2008 -0700 Fix for bug #5617, reported and patched by Bartosz Antosik [EMAIL PROTECTED] xp/2003 explorer freezes browsing shares on samba ipv6 hosts. Caused by missing reply packet to SMB printclose packet. Jeremy --- Summary of changes: source/smbd/reply.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/smbd/reply.c b/source/smbd/reply.c index ef49d58..88c8ae8 100644 --- a/source/smbd/reply.c +++ b/source/smbd/reply.c @@ -4672,6 +4672,8 @@ void reply_printclose(struct smb_request *req) return; } + reply_outbuf(req, 0, 0); + END_PROFILE(SMBsplclose); return; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3712-g086cb13
The branch, v3-3-test has been updated via 086cb13da4cc95ab01c75a68db5631e35a658449 (commit) from af817c2817e56aa95ac8641537f13e77307e9eb8 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 086cb13da4cc95ab01c75a68db5631e35a658449 Author: Jeremy Allison [EMAIL PROTECTED] Date: Wed Aug 13 15:46:35 2008 -0700 Fix for bug #5617, reported and patched by Bartosz Antosik [EMAIL PROTECTED] xp/2003 explorer freezes browsing shares on samba ipv6 hosts. Caused by missing reply packet to SMB printclose packet. Jeremy --- Summary of changes: source/smbd/reply.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/smbd/reply.c b/source/smbd/reply.c index d32d998..b3d691f 100644 --- a/source/smbd/reply.c +++ b/source/smbd/reply.c @@ -4702,6 +4702,8 @@ void reply_printclose(struct smb_request *req) return; } + reply_outbuf(req, 0, 0); + END_PROFILE(SMBsplclose); return; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2816-ga46dc15
The branch, v3-2-test has been updated
via a46dc151f692e6b4bd14d3881f90bca5fe5b9474 (commit)
from 93c977e80594e20ebd562b1eb8a03d57b9299461 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit a46dc151f692e6b4bd14d3881f90bca5fe5b9474
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Aug 13 16:46:49 2008 -0700
Fix for bug #5688 from SATOH Fumiyasu [EMAIL PROTECTED]. LPQ process is
orphaned if socket address parameter is invalid.
If the socket address parameter is a null string that is an invalid value
for Samba 3.2 but valid for Samba 3.0.
Jeremy.
---
Summary of changes:
source/smbd/server.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/server.c b/source/smbd/server.c
index 035469c..176cd5f 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -465,7 +465,8 @@ static bool open_sockets_smbd(bool is_daemon, bool
interactive, const char *smb_
char *sock_tok;
const char *sock_ptr;
- if (strequal(sock_addr, 0.0.0.0) ||
+ if (sock_addr[0] == '\0' ||
+ strequal(sock_addr, 0.0.0.0) ||
strequal(sock_addr, ::)) {
#if HAVE_IPV6
sock_addr = ::,0.0.0.0;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3713-gf84bf45
The branch, v3-3-test has been updated
via f84bf454eef9e53b72c481ddd5d520d8c3e901d2 (commit)
from 086cb13da4cc95ab01c75a68db5631e35a658449 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit f84bf454eef9e53b72c481ddd5d520d8c3e901d2
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Aug 13 16:45:34 2008 -0700
Fix for bug #5688 from SATOH Fumiyasu [EMAIL PROTECTED]. LPQ process is
orphaned if socket address parameter is invalid.
If the socket address parameter is a null string that is an invalid value
for Samba 3.2 but valid for Samba 3.0.
Jeremy.
---
Summary of changes:
source/smbd/server.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/server.c b/source/smbd/server.c
index 0d855f8..53116f3 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -469,7 +469,8 @@ static bool open_sockets_smbd(bool is_daemon, bool
interactive, const char *smb_
char *sock_tok;
const char *sock_ptr;
- if (strequal(sock_addr, 0.0.0.0) ||
+ if (sock_addr[0] == '\0' ||
+ strequal(sock_addr, 0.0.0.0) ||
strequal(sock_addr, ::)) {
#if HAVE_IPV6
sock_addr = ::,0.0.0.0;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3714-g60718a2
The branch, v3-3-test has been updated
via 60718a203c1d90dbdcdcb2eaf6b37f6135fb411b (commit)
from f84bf454eef9e53b72c481ddd5d520d8c3e901d2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 60718a203c1d90dbdcdcb2eaf6b37f6135fb411b
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Aug 13 16:52:53 2008 -0700
Fix coverity CID: 594. Resource leak on error path.
Jeremy.
---
Summary of changes:
source/rpc_server/srv_spoolss_nt.c |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_server/srv_spoolss_nt.c
b/source/rpc_server/srv_spoolss_nt.c
index f802400..635898a 100644
--- a/source/rpc_server/srv_spoolss_nt.c
+++ b/source/rpc_server/srv_spoolss_nt.c
@@ -5037,8 +5037,10 @@ static WERROR getprinter_level_7(Printer_entry
*print_hnd, int snum, RPC_BUFFER
if((printer=SMB_MALLOC_P(PRINTER_INFO_7))==NULL)
return WERR_NOMEM;
- if (!construct_printer_info_7(print_hnd, printer, snum))
- return WERR_NOMEM;
+ if (!construct_printer_info_7(print_hnd, printer, snum)) {
+ result = WERR_NOMEM;
+ goto out;
+ }
/* check the required size. */
*needed += spoolss_size_printer_info_7(printer);
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - ff413beb4bb31e277e843235a1ce5e5ad7b92c71
The branch, master has been updated
via ff413beb4bb31e277e843235a1ce5e5ad7b92c71 (commit)
from 0674b33a7492cc1a194833f5ca87d8b30457faee (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit ff413beb4bb31e277e843235a1ce5e5ad7b92c71
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Thu Aug 14 09:52:23 2008 +1000
only freeze the local node when doing a backup and not the entire cluster
---
Summary of changes:
tools/ctdb.c | 31 +++
1 files changed, 7 insertions(+), 24 deletions(-)
Changeset truncated at 500 lines:
diff --git a/tools/ctdb.c b/tools/ctdb.c
index 7d8cf84..9ebc852 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -1799,12 +1799,10 @@ static int control_backupdb(struct ctdb_context *ctdb,
int argc, const char **ar
{
int i, ret;
struct ctdb_dbid_map *dbmap=NULL;
- struct ctdb_node_map *nodemap=NULL;
TALLOC_CTX *tmp_ctx = talloc_new(ctdb);
TDB_DATA outdata;
struct db_file_header dbhdr;
int fh;
- uint32_t *nodes;
if (argc != 2) {
DEBUG(DEBUG_ERR,(Invalid arguments\n));
@@ -1833,21 +1831,10 @@ static int control_backupdb(struct ctdb_context *ctdb,
int argc, const char **ar
return -1;
}
- ret = ctdb_ctrl_getnodemap(ctdb, TIMELIMIT(), options.pnn, ctdb,
nodemap);
+ /* freeze the node */
+ ret = ctdb_ctrl_freeze(ctdb, TIMELIMIT(), options.pnn);
if (ret != 0) {
- DEBUG(DEBUG_ERR, (Unable to get nodemap from node %u\n,
options.pnn));
- talloc_free(tmp_ctx);
- return ret;
- }
-
- /* freeze all nodes */
- nodes = list_of_active_nodes(ctdb, nodemap, tmp_ctx, true);
- if (ctdb_client_async_control(ctdb, CTDB_CONTROL_FREEZE,
- nodes, TIMELIMIT(),
- false, tdb_null,
- NULL, NULL,
- NULL) != 0) {
- DEBUG(DEBUG_ERR, (Unable to freeze nodes.\n));
+ DEBUG(DEBUG_ERR, (Unable to freeze node\n));
ctdb_ctrl_setrecmode(ctdb, TIMELIMIT(), options.pnn,
CTDB_RECOVERY_ACTIVE);
talloc_free(tmp_ctx);
return -1;
@@ -1863,14 +1850,10 @@ static int control_backupdb(struct ctdb_context *ctdb,
int argc, const char **ar
return -1;
}
- /* thaw all nodes */
- nodes = list_of_active_nodes(ctdb, nodemap, tmp_ctx, true);
- if (ctdb_client_async_control(ctdb, CTDB_CONTROL_THAW,
- nodes, TIMELIMIT(),
- false, tdb_null,
- NULL, NULL,
- NULL) != 0) {
- DEBUG(DEBUG_ERR, (Unable to thaw nodes.\n));
+ /* thaw the node */
+ ret = ctdb_ctrl_thaw(ctdb, TIMELIMIT(), options.pnn);
+ if (ret != 0) {
+ DEBUG(DEBUG_ERR, (Unable to thaw node.\n));
ctdb_ctrl_setrecmode(ctdb, TIMELIMIT(), options.pnn,
CTDB_RECOVERY_ACTIVE);
talloc_free(tmp_ctx);
return -1;
--
CTDB repository
Build status as of Thu Aug 14 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-08-13 00:00:47.0 + +++ /home/build/master/cache/broken_results.txt 2008-08-14 00:00:17.0 + @@ -1,23 +1,23 @@ -Build status as of Wed Aug 13 00:00:02 2008 +Build status as of Thu Aug 14 00:00:02 2008 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 33 9 0 +ccache 32 9 0 ctdb 0 0 0 distcc 1 0 0 -ldb 33 32 0 -libreplace 33 11 0 -lorikeet-heimdal 28 21 0 -pidl 20 19 0 -ppp 12 0 0 -rsync34 12 0 +ldb 32 31 0 +libreplace 32 11 0 +lorikeet-heimdal 27 20 0 +pidl 19 18 0 +ppp 11 0 0 +rsync33 12 0 samba-docs 0 0 0 samba-gtk7 7 0 -samba_3_X_devel 29 13 0 -samba_3_X_test 29 17 0 -samba_4_0_test 31 28 0 -smb-build32 5 0 -talloc 32 5 0 -tdb 33 12 0 +samba_3_X_devel 28 12 0 +samba_3_X_test 29 15 0 +samba_4_0_test 31 27 0 +smb-build31 5 0 +talloc 31 5 0 +tdb 31 12 0
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-253-g5e08b28
The branch, v4-0-test has been updated
via 5e08b285319e35afd3a9a6e6f5f59145350f2d80 (commit)
via 7e48dad4c7724f3f11236171a777603574224c42 (commit)
from 9246924effd4d0b08ca1ef87e45ad510020df93e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 5e08b285319e35afd3a9a6e6f5f59145350f2d80
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Thu Aug 14 15:27:48 2008 +1000
cope with arbitrary unknown pac buffer types, so when MS adds
a new one we don't break our server
commit 7e48dad4c7724f3f11236171a777603574224c42
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Thu Aug 14 15:27:22 2008 +1000
cope with not knowing the kdc key
---
Summary of changes:
source/librpc/idl/krb5pac.idl |6 ++-
source/torture/auth/pac.c | 97 +++-
2 files changed, 61 insertions(+), 42 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/idl/krb5pac.idl b/source/librpc/idl/krb5pac.idl
index 3505fc8..b450908 100644
--- a/source/librpc/idl/krb5pac.idl
+++ b/source/librpc/idl/krb5pac.idl
@@ -70,7 +70,11 @@ interface krb5pac
[case(PAC_TYPE_SRV_CHECKSUM)] PAC_SIGNATURE_DATA srv_cksum;
[case(PAC_TYPE_KDC_CHECKSUM)] PAC_SIGNATURE_DATA kdc_cksum;
[case(PAC_TYPE_LOGON_NAME)] PAC_LOGON_NAME logon_name;
- [case(PAC_TYPE_UNKNOWN_12)] [subcontext(0)] DATA_BLOB_REM
unknown;
+ /* when new PAC info types are added they are supposed to be
done
+ in such a way that they are backwards compatible with
existing
+ servers. This makes it safe to just use a [default] for
+ unknown types, which lets us ignore the data */
+ [default] [subcontext(0)] DATA_BLOB_REM unknown;
/* [case(PAC_TYPE_UNKNOWN_12)] PAC_UNKNOWN_12 unknown; */
} PAC_INFO;
diff --git a/source/torture/auth/pac.c b/source/torture/auth/pac.c
index 7fdd7e5..4e51c66 100644
--- a/source/torture/auth/pac.c
+++ b/source/torture/auth/pac.c
@@ -279,7 +279,7 @@ static bool torture_pac_saved_check(struct torture_context
*tctx)
struct auth_serversupplied_info *server_info_out;
krb5_keyblock server_keyblock;
- krb5_keyblock krbtgt_keyblock;
+ krb5_keyblock krbtgt_keyblock, *krbtgt_keyblock_p;
struct samr_Password *krbtgt_bytes, *krbsrv_bytes;
krb5_error_code ret;
@@ -309,9 +309,13 @@ static bool torture_pac_saved_check(struct torture_context
*tctx)
/* The krbtgt key in use when the above PAC was generated.
* This is an arcfour-hmac-md5 key, extracted with our 'net
* samdump' tool. */
- krbtgt_bytes = smbpasswd_gethexpwd(mem_ctx, pac_kdc_key);
- if (!krbtgt_bytes) {
- torture_fail(tctx, (saved test) Could not interpret krbtgt
key);
+ if (*pac_kdc_key == 0) {
+ krbtgt_bytes = NULL;
+ } else {
+ krbtgt_bytes = smbpasswd_gethexpwd(mem_ctx, pac_kdc_key);
+ if (!krbtgt_bytes) {
+ torture_fail(tctx, (saved test) Could not interpret
krbtgt key);
+ }
}
krbsrv_bytes = smbpasswd_gethexpwd(mem_ctx, pac_member_key);
@@ -329,18 +333,23 @@ static bool torture_pac_saved_check(struct
torture_context *tctx)
smb_get_krb5_error_message(smb_krb5_context-krb5_context,
ret,
mem_ctx)));
- ret = krb5_keyblock_init(smb_krb5_context-krb5_context,
-ENCTYPE_ARCFOUR_HMAC,
-krbtgt_bytes-hash, sizeof(krbtgt_bytes-hash),
-krbtgt_keyblock);
- if (ret) {
- krb5_free_keyblock_contents(smb_krb5_context-krb5_context,
- server_keyblock);
- torture_fail(tctx,
-talloc_asprintf(tctx,
-(saved test) Server Keyblock
encoding failed: %s,
-
smb_get_krb5_error_message(smb_krb5_context-krb5_context,
- ret,
mem_ctx)));
+ if (krbtgt_bytes) {
+ ret = krb5_keyblock_init(smb_krb5_context-krb5_context,
+ENCTYPE_ARCFOUR_HMAC,
+krbtgt_bytes-hash,
sizeof(krbtgt_bytes-hash),
+krbtgt_keyblock);
+ if (ret) {
+
krb5_free_keyblock_contents(smb_krb5_context-krb5_context,
+ server_keyblock);
+
