svn commit: samba r24918 - in branches/SAMBA_4_0/source: dsdb/samdb rpc_server/lsa
Author: abartlet
Date: 2007-09-03 07:56:29 + (Mon, 03 Sep 2007)
New Revision: 24918
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24918
Log:
Fix the build (forgot to include dcesrv_lsa.c in the previous commit)
and improve error strings returned from samdb.c
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/samdb.c2007-09-03 05:36:19 UTC
(rev 24917)
+++ branches/SAMBA_4_0/source/dsdb/samdb/samdb.c2007-09-03 07:56:29 UTC
(rev 24918)
@@ -691,6 +691,8 @@
*errstring = NULL;
if (!ldb_dn_add_child_fmt(basedn, CN=Template%s, name)) {
+ *errstring = talloc_asprintf(msg, samdb_copy_template: ERROR:
Failed to contruct DN for template '%s',
+name);
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -702,7 +704,7 @@
return ret;
}
if (res-count != 1) {
- *errstring = talloc_asprintf(msg, samdb_copy_template: ERROR:
template '%s' matched %d records, expected 1\n,
+ *errstring = talloc_asprintf(msg, samdb_copy_template: ERROR:
template '%s' matched %d records, expected 1,
name,
res-count);
talloc_free(res);
@@ -726,7 +728,7 @@
ret = samdb_find_or_add_attribute(ldb, msg, el-name,
(char
*)el-values[j].data);
if (ret) {
- *errstring = talloc_asprintf(msg, Adding
attribute %s failed.\n, el-name);
+ *errstring = talloc_asprintf(msg, Adding
attribute %s failed., el-name);
talloc_free(res);
return ret;
}
Modified: branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
===
--- branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c 2007-09-03
05:36:19 UTC (rev 24917)
+++ branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c 2007-09-03
07:56:29 UTC (rev 24918)
@@ -2284,7 +2284,7 @@
/* pull in all the template attributes. Note this is always from the
global samdb */
ret = samdb_copy_template(secret_state-policy-sam_ldb, msg,
-
((cn=TemplateSecret)(objectclass=secretTemplate)), errstr);
+ secret, errstr);
if (ret != 0) {
DEBUG(0,(Failed to load TemplateSecret from samdb: %s\n,
errstr));
svn commit: samba r24919 - in branches/SAMBA_4_0_RELEASE/source: dsdb/samdb rpc_server/lsa
Author: abartlet
Date: 2007-09-03 07:58:18 + (Mon, 03 Sep 2007)
New Revision: 24919
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24919
Log:
Merge build fix and improved error strings to release branch.
Andrew Bartlett
Modified:
branches/SAMBA_4_0_RELEASE/source/dsdb/samdb/samdb.c
branches/SAMBA_4_0_RELEASE/source/rpc_server/lsa/dcesrv_lsa.c
Changeset:
Modified: branches/SAMBA_4_0_RELEASE/source/dsdb/samdb/samdb.c
===
--- branches/SAMBA_4_0_RELEASE/source/dsdb/samdb/samdb.c2007-09-03
07:56:29 UTC (rev 24918)
+++ branches/SAMBA_4_0_RELEASE/source/dsdb/samdb/samdb.c2007-09-03
07:58:18 UTC (rev 24919)
@@ -691,6 +691,8 @@
*errstring = NULL;
if (!ldb_dn_add_child_fmt(basedn, CN=Template%s, name)) {
+ *errstring = talloc_asprintf(msg, samdb_copy_template: ERROR:
Failed to contruct DN for template '%s',
+name);
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -702,7 +704,7 @@
return ret;
}
if (res-count != 1) {
- *errstring = talloc_asprintf(msg, samdb_copy_template: ERROR:
template '%s' matched %d records, expected 1\n,
+ *errstring = talloc_asprintf(msg, samdb_copy_template: ERROR:
template '%s' matched %d records, expected 1,
name,
res-count);
talloc_free(res);
@@ -726,7 +728,7 @@
ret = samdb_find_or_add_attribute(ldb, msg, el-name,
(char
*)el-values[j].data);
if (ret) {
- *errstring = talloc_asprintf(msg, Adding
attribute %s failed.\n, el-name);
+ *errstring = talloc_asprintf(msg, Adding
attribute %s failed., el-name);
talloc_free(res);
return ret;
}
Modified: branches/SAMBA_4_0_RELEASE/source/rpc_server/lsa/dcesrv_lsa.c
===
--- branches/SAMBA_4_0_RELEASE/source/rpc_server/lsa/dcesrv_lsa.c
2007-09-03 07:56:29 UTC (rev 24918)
+++ branches/SAMBA_4_0_RELEASE/source/rpc_server/lsa/dcesrv_lsa.c
2007-09-03 07:58:18 UTC (rev 24919)
@@ -2284,7 +2284,7 @@
/* pull in all the template attributes. Note this is always from the
global samdb */
ret = samdb_copy_template(secret_state-policy-sam_ldb, msg,
-
((cn=TemplateSecret)(objectclass=secretTemplate)), errstr);
+ secret, errstr);
if (ret != 0) {
DEBUG(0,(Failed to load TemplateSecret from samdb: %s\n,
errstr));
svn commit: samba r24921 - in branches: . 4.0-spoolsstest 4.0-spoolsstest/source/rpc_server/spoolss 4.0-spoolsstest/source/selftest 4.0-spoolsstest/source/torture 4.0-spoolsstest/source/torture/rpc
Author: jelmer Date: 2007-09-03 12:36:47 + (Mon, 03 Sep 2007) New Revision: 24921 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24921 Log: Add trivial ReplyOpenPrinter implementation and test. Added: branches/4.0-spoolsstest/ Modified: branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c branches/4.0-spoolsstest/source/selftest/test_rpc.sh branches/4.0-spoolsstest/source/torture/config.mk branches/4.0-spoolsstest/source/torture/rpc/rpc.c branches/4.0-spoolsstest/source/torture/rpc/spoolss.c Changeset: Copied: branches/4.0-spoolsstest (from rev 23158, branches/SAMBA_4_0) Property changes on: branches/4.0-spoolsstest ___ Name: bzr:revision-info ...skipped... Name: bzr:revprop:branch-nick ...skipped... Name: bzr:file-ids ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Name: bzr:merge ...skipped... Name: svk:merge ...skipped...
svn commit: samba r24922 - in branches/4.0-spoolsstest: . source/rpc_server/spoolss source/torture/rpc
Author: jelmer
Date: 2007-09-03 12:37:38 + (Mon, 03 Sep 2007)
New Revision: 24922
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24922
Log:
Add generic tests for ReplyOpenPrinter() and ReplyClosePrinter().
Modified:
branches/4.0-spoolsstest/
branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
branches/4.0-spoolsstest/source/torture/rpc/spoolss.c
Changeset:
Property changes on: branches/4.0-spoolsstest
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
===
--- branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
2007-09-03 12:36:47 UTC (rev 24921)
+++ branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
2007-09-03 12:37:38 UTC (rev 24922)
@@ -1070,7 +1070,13 @@
static WERROR dcesrv_spoolss_ReplyClosePrinter(struct dcesrv_call_state
*dce_call, TALLOC_CTX *mem_ctx,
struct spoolss_ReplyClosePrinter *r)
{
- DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+ struct dcesrv_handle *handle;
+
+ DCESRV_PULL_HANDLE_WERR(handle, r-in.handle, SPOOLSS_NOTIFY);
+
+ talloc_free(handle);
+
+ return WERR_OK;
}
Modified: branches/4.0-spoolsstest/source/torture/rpc/spoolss.c
===
--- branches/4.0-spoolsstest/source/torture/rpc/spoolss.c 2007-09-03
12:36:47 UTC (rev 24921)
+++ branches/4.0-spoolsstest/source/torture/rpc/spoolss.c 2007-09-03
12:37:38 UTC (rev 24922)
@@ -2072,6 +2072,41 @@
return ret;
}
+/** Test that makes sure that calling ReplyOpenPrinter()
+ * on Samba 4 will cause an irpc broadcast call.
+ */
+static bool test_ReplyOpenPrinter(struct torture_context *tctx,
+ struct
dcerpc_pipe *pipe)
+{
+ struct spoolss_ReplyOpenPrinter r;
+ struct spoolss_ReplyClosePrinter s;
+ struct policy_handle h;
+
+ r.in.server_name = earth;
+ r.in.printer_local = 2;
+ r.in.type = REG_DWORD;
+ r.in.unknown1 = 0;
+ r.in.unknown2 = 0;
+ r.out.handle = h;
+
+ torture_assert_ntstatus_ok(tctx,
+ dcerpc_spoolss_ReplyOpenPrinter(pipe, tctx, r),
+ spoolss_ReplyOpenPrinter call failed);
+
+ torture_assert_werr_ok(tctx, r.out.result, error return code);
+
+ s.in.handle = h;
+ s.out.handle = h;
+
+ torture_assert_ntstatus_ok(tctx,
+ dcerpc_spoolss_ReplyClosePrinter(pipe, tctx, s),
+ spoolss_ReplyClosePrinter call failed);
+
+ torture_assert_werr_ok(tctx, r.out.result, error return code);
+
+ return true;
+}
+
BOOL torture_rpc_spoolss(struct torture_context *torture)
{
NTSTATUS status;
@@ -2133,6 +2168,8 @@
ret = test_EnumPrinterDrivers_old(p, mem_ctx);
+ ret = test_ReplyOpenPrinter(torture, p);
+
talloc_free(mem_ctx);
return ret;
svn commit: samba r24923 - in branches/4.0-spoolsstest: . source/rpc_server/spoolss
Author: jelmer Date: 2007-09-03 12:37:44 + (Mon, 03 Sep 2007) New Revision: 24923 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24923 Log: Zero out handle. Modified: branches/4.0-spoolsstest/ branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c Changeset: Property changes on: branches/4.0-spoolsstest ___ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c === --- branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c 2007-09-03 12:37:38 UTC (rev 24922) +++ branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c 2007-09-03 12:37:44 UTC (rev 24923) @@ -1076,10 +1076,11 @@ talloc_free(handle); + ZERO_STRUCTP(r-out.handle); + return WERR_OK; } - /* spoolss_AddPortEx */
svn commit: samba r24925 - in branches/4.0-spoolsstest: . source/torture/rpc
Author: jelmer
Date: 2007-09-03 12:45:40 + (Mon, 03 Sep 2007)
New Revision: 24925
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24925
Log:
Add file I had forgotten to commit.
Added:
branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
Modified:
branches/4.0-spoolsstest/
Changeset:
Property changes on: branches/4.0-spoolsstest
___
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Added: branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
===
--- branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
2007-09-03 12:43:55 UTC (rev 24924)
+++ branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
2007-09-03 12:45:40 UTC (rev 24925)
@@ -0,0 +1,69 @@
+/*
+ Unix SMB/CIFS implementation.
+ test suite for spoolss rpc notify operations
+
+ Copyright (C) Jelmer Vernooij 2007
+
+ 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 torture/torture.h
+#include torture/ui.h
+#include torture/rpc/rpc.h
+#include librpc/gen_ndr/ndr_spoolss_c.h
+
+/** Test that makes sure that calling ReplyOpenPrinter()
+ * on Samba 4 will cause an irpc broadcast call.
+ */
+static bool test_ReplyOpenPrinter(struct torture_context *tctx,
+ struct
dcerpc_pipe *pipe)
+{
+ struct spoolss_ReplyOpenPrinter r;
+ struct policy_handle h;
+
+ r.in.server_name = earth;
+ r.in.printer_local = 2;
+ r.in.type = REG_DWORD;
+ r.in.unknown1 = 0;
+ r.in.unknown2 = 0;
+ r.out.handle = h;
+
+ /* FIXME: Listen for IRPC calls */
+
+ torture_assert_ntstatus_ok(tctx,
+ dcerpc_spoolss_ReplyOpenPrinter(pipe, tctx, r),
+ spoolss_ReplyOpenPrinter call failed);
+
+ torture_assert_werr_ok(tctx, r.out.result, error return code);
+
+ /* FIXME: Make sure that an irpc call was done */
+
+ return true;
+}
+
+struct torture_suite *torture_rpc_spoolss_notify(void)
+{
+ struct torture_suite *suite = torture_suite_create(
+
talloc_autofree_context(), SPOOLSS-NOTIFY);
+
+ struct torture_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite,
+
notify, dcerpc_table_spoolss);
+
+ torture_rpc_tcase_add_test(tcase, test_replyopenprinter,
+
test_ReplyOpenPrinter);
+
+ return suite;
+}
svn commit: samba r24927 - in branches/4.0-spoolsstest: . source/selftest source/torture/rpc
Author: jelmer
Date: 2007-09-03 12:45:53 + (Mon, 03 Sep 2007)
New Revision: 24927
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24927
Log:
Fix the build.
Modified:
branches/4.0-spoolsstest/
branches/4.0-spoolsstest/source/selftest/test_rpc.sh
branches/4.0-spoolsstest/source/torture/rpc/spoolss.c
branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
Changeset:
Property changes on: branches/4.0-spoolsstest
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-spoolsstest/source/selftest/test_rpc.sh
===
--- branches/4.0-spoolsstest/source/selftest/test_rpc.sh2007-09-03
12:45:46 UTC (rev 24926)
+++ branches/4.0-spoolsstest/source/selftest/test_rpc.sh2007-09-03
12:45:53 UTC (rev 24927)
@@ -38,7 +38,7 @@
done
for bindoptions in $VALIDATE bigendian; do
- for t in $tests; do
+ for t in $auto_rpc_tests; do
plantest $t with $bindoptions dc $VALGRIND $samba4bindir/smbtorture
$TORTURE_OPTIONS \$SERVER[$bindoptions] -U\$USERNAME%\$PASSWORD -W
\$DOMAIN $t $*
done
done
Modified: branches/4.0-spoolsstest/source/torture/rpc/spoolss.c
===
--- branches/4.0-spoolsstest/source/torture/rpc/spoolss.c 2007-09-03
12:45:46 UTC (rev 24926)
+++ branches/4.0-spoolsstest/source/torture/rpc/spoolss.c 2007-09-03
12:45:53 UTC (rev 24927)
@@ -2076,12 +2076,11 @@
return ret;
}
- TREE
/** Test that makes sure that calling ReplyOpenPrinter()
* on Samba 4 will cause an irpc broadcast call.
*/
static bool test_ReplyOpenPrinter(struct torture_context *tctx,
- struct
dcerpc_pipe *pipe)
+ struct dcerpc_pipe *pipe)
{
struct spoolss_ReplyOpenPrinter r;
struct spoolss_ReplyClosePrinter s;
Modified: branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
===
--- branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
2007-09-03 12:45:46 UTC (rev 24926)
+++ branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
2007-09-03 12:45:53 UTC (rev 24927)
@@ -60,7 +60,7 @@
talloc_autofree_context(), SPOOLSS-NOTIFY);
struct torture_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite,
-
notify, dcerpc_table_spoolss);
+
notify, ndr_table_spoolss);
torture_rpc_tcase_add_test(tcase, test_replyopenprinter,
test_ReplyOpenPrinter);
svn commit: samba r24928 - in branches/4.0-spoolsstest: . source/torture/rpc
Author: jelmer Date: 2007-09-03 12:45:57 + (Mon, 03 Sep 2007) New Revision: 24928 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24928 Log: Convert some code to new torture API. Modified: branches/4.0-spoolsstest/ branches/4.0-spoolsstest/.bzrignore branches/4.0-spoolsstest/source/torture/rpc/spoolss.c Changeset: Sorry, the patch is too large (784 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24928
svn commit: samba r24929 - in branches/4.0-spoolsstest: . source/torture/rpc
Author: jelmer Date: 2007-09-03 12:46:01 + (Mon, 03 Sep 2007) New Revision: 24929 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24929 Log: Convert more code to torture API. Modified: branches/4.0-spoolsstest/ branches/4.0-spoolsstest/source/torture/rpc/spoolss.c Changeset: Sorry, the patch is too large (690 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24929
svn commit: samba r24930 - in branches/4.0-spoolsstest: . source/torture/rpc
Author: jelmer Date: 2007-09-03 12:46:09 + (Mon, 03 Sep 2007) New Revision: 24930 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24930 Log: More work on the SPOOLSS API. Modified: branches/4.0-spoolsstest/ branches/4.0-spoolsstest/source/torture/rpc/spoolss.c Changeset: Sorry, the patch is too large (1553 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24930
svn commit: samba r24931 - in branches/4.0-spoolsstest: . source/rpc_server source/torture source/torture/rpc
Author: jelmer Date: 2007-09-03 12:46:13 + (Mon, 03 Sep 2007) New Revision: 24931 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24931 Log: Initial work adding a fake interface server into smbtorture. Modified: branches/4.0-spoolsstest/ branches/4.0-spoolsstest/source/rpc_server/config.mk branches/4.0-spoolsstest/source/rpc_server/dcerpc_server.c branches/4.0-spoolsstest/source/torture/config.mk branches/4.0-spoolsstest/source/torture/rpc/spoolss.c branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c Changeset: Sorry, the patch is too large (643 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24931
svn commit: samba r24932 - in branches/4.0-spoolsstest: . source/rpc_server source/torture/rpc
Author: jelmer Date: 2007-09-03 12:46:17 + (Mon, 03 Sep 2007) New Revision: 24932 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24932 Log: Move smbd-specific code into a separate file. Added: branches/4.0-spoolsstest/source/rpc_server/service_rpc.c Removed: branches/4.0-spoolsstest/source/rpc_server/dcerpc_sock.c Modified: branches/4.0-spoolsstest/ branches/4.0-spoolsstest/source/rpc_server/config.mk branches/4.0-spoolsstest/source/rpc_server/dcerpc_server.c branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c Changeset: Sorry, the patch is too large (1021 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24932
svn commit: samba r24933 - in branches/4.0-spoolsstest: . source/rpc_server source/rpc_server/spoolss source/smbd source/torture/rpc
Author: jelmer
Date: 2007-09-03 12:46:22 + (Mon, 03 Sep 2007)
New Revision: 24933
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24933
Log:
Finish test properly - setup of SMB server is all that's left to do now.
Modified:
branches/4.0-spoolsstest/
branches/4.0-spoolsstest/source/rpc_server/config.mk
branches/4.0-spoolsstest/source/rpc_server/service_rpc.c
branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
branches/4.0-spoolsstest/source/smbd/service_stream.c
branches/4.0-spoolsstest/source/torture/rpc/rpc.c
branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
Changeset:
Property changes on: branches/4.0-spoolsstest
___
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-spoolsstest/source/rpc_server/config.mk
===
--- branches/4.0-spoolsstest/source/rpc_server/config.mk2007-09-03
12:46:17 UTC (rev 24932)
+++ branches/4.0-spoolsstest/source/rpc_server/config.mk2007-09-03
12:46:22 UTC (rev 24933)
@@ -157,7 +157,8 @@
PRIVATE_DEPENDENCIES = \
DCERPC_COMMON \
NDR_SPOOLSS \
- ntptr
+ ntptr \
+ RPC_NDR_SPOOLSS
# End MODULE dcerpc_spoolss
Modified: branches/4.0-spoolsstest/source/rpc_server/service_rpc.c
===
--- branches/4.0-spoolsstest/source/rpc_server/service_rpc.c2007-09-03
12:46:17 UTC (rev 24932)
+++ branches/4.0-spoolsstest/source/rpc_server/service_rpc.c2007-09-03
12:46:22 UTC (rev 24933)
@@ -241,7 +241,7 @@
}
NTSTATUS dcesrv_add_ep_ncalrpc(struct dcesrv_context *dce_ctx, struct
dcesrv_endpoint *e,
- struct event_context *event_ctx, const
struct model_ops *model_ops)
+ struct event_context *event_ctx, const struct
model_ops *model_ops)
{
struct dcesrv_socket_context *dcesrv_sock;
uint16_t port = 1;
Modified: branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
===
--- branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
2007-09-03 12:46:17 UTC (rev 24932)
+++ branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
2007-09-03 12:46:22 UTC (rev 24933)
@@ -27,6 +27,7 @@
#include ntptr/ntptr.h
#include lib/socket/socket.h
#include smbd/service_stream.h
+#include librpc/gen_ndr/ndr_spoolss_c.h
enum spoolss_handle {
SPOOLSS_NOTIFY
@@ -1045,10 +1046,10 @@
handle = dcesrv_handle_new(dce_call-context, SPOOLSS_NOTIFY);
W_ERROR_HAVE_NO_MEMORY(handle);
+ /* For now, just return a handle */
+
*r-out.handle = handle-wire_handle;
- /* TODO: Sent received information by irpc */
-
return WERR_OK;
}
@@ -1126,11 +1127,50 @@
static WERROR dcesrv_spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct
dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct spoolss_RemoteFindFirstPrinterChangeNotifyEx *r)
{
+ struct dcerpc_pipe *p;
+ struct dcerpc_binding *binding;
+ NTSTATUS status;
+ struct spoolss_ReplyOpenPrinter rop;
+
+ DEBUG(2, (Received RFFPCNex from %s\n, r-in.str));
+
/*
-* TODO: for now just return ok,
+* TODO: for now just open a connection to the client and drop it again
* to keep the w2k3 PrintServer
* happy to allow to open the Add Printer GUI
+* and the torture suite passing
*/
+
+ binding = talloc_zero(mem_ctx, struct dcerpc_binding);
+
+ binding-transport = NCACN_NP;
+ if (strncmp(r-in.str, , 2))
+ return WERR_INVALID_COMPUTERNAME;
+ binding-host = r-in.str+2;
+
+ status = dcerpc_pipe_connect_b(mem_ctx, p, binding,
ndr_table_spoolss,
+ NULL, NULL);
+
+ if (NT_STATUS_IS_ERR(status)) {
+ DEBUG(0, (unable to call back to %s\n, r-in.str));
+ return WERR_SERVER_UNAVAILABLE;
+ }
+
+ ZERO_STRUCT(rop);
+ rop.in.server_name = NULL;
+ rop.in.printer_local = 0;
+ rop.in.type = REG_NONE;
+ rop.in.unknown1 = 0;
+ rop.in.unknown2 = 0;
+
+ status = dcerpc_spoolss_ReplyOpenPrinter(p, mem_ctx, rop);
+ if (NT_STATUS_IS_ERR(status)) {
+ DEBUG(0, (unable to open remote printer %s\n, r-in.str));
+ return WERR_SERVER_UNAVAILABLE;
+ }
+
+ talloc_free(p);
+
return WERR_OK;
}
Modified: branches/4.0-spoolsstest/source/smbd/service_stream.c
===
---
svn commit: samba r24934 - in branches/4.0-spoolsstest: . source source/lib/socket source/rpc_server source/rpc_server/spoolss source/smb_server source/smbd source/torture source/torture/rpc
Author: jelmer
Date: 2007-09-03 12:46:29 + (Mon, 03 Sep 2007)
New Revision: 24934
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24934
Log:
Start the SMB server from smbtorture.
Modified:
branches/4.0-spoolsstest/
branches/4.0-spoolsstest/source/lib/socket/netif.h
branches/4.0-spoolsstest/source/main.mk
branches/4.0-spoolsstest/source/rpc_server/dcerpc_server.c
branches/4.0-spoolsstest/source/rpc_server/service_rpc.c
branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
branches/4.0-spoolsstest/source/smb_server/smb_server.c
branches/4.0-spoolsstest/source/smb_server/smb_server.h
branches/4.0-spoolsstest/source/smbd/process_model.h
branches/4.0-spoolsstest/source/smbd/process_single.c
branches/4.0-spoolsstest/source/torture/config.mk
branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
Changeset:
Property changes on: branches/4.0-spoolsstest
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-spoolsstest/source/lib/socket/netif.h
===
--- branches/4.0-spoolsstest/source/lib/socket/netif.h 2007-09-03 12:46:22 UTC
(rev 24933)
+++ branches/4.0-spoolsstest/source/lib/socket/netif.h 2007-09-03 12:46:29 UTC
(rev 24934)
@@ -19,6 +19,8 @@
along with this program. If not, see http://www.gnu.org/licenses/.
*/
+#include system/network.h
+
struct iface_struct {
char name[16];
struct in_addr ip;
Modified: branches/4.0-spoolsstest/source/main.mk
===
--- branches/4.0-spoolsstest/source/main.mk 2007-09-03 12:46:22 UTC (rev
24933)
+++ branches/4.0-spoolsstest/source/main.mk 2007-09-03 12:46:29 UTC (rev
24934)
@@ -315,7 +315,7 @@
testenv: everything
$(SELFTEST) --socket-wrapper --testenv
-valgrindtest: valgrindtest-quick
+valgrindtest: valgrindtest-all
valgrindtest-quick: all
SMBD_VALGRIND=xterm -n smbd -e valgrind -q --db-attach=yes
--num-callers=30 \
@@ -332,7 +332,7 @@
VALGRIND=valgrind -q --num-callers=30
--log-file=${selftest_prefix}/valgrind.log \
$(SELFTEST) --socket-wrapper --testenv
-gdbtest: gdbtest-quick
+gdbtest: gdbtest-all
gdbtest-quick: all
SMBD_VALGRIND=xterm -n smbd -e $(srcdir)/script/gdb_run \
Modified: branches/4.0-spoolsstest/source/rpc_server/dcerpc_server.c
===
--- branches/4.0-spoolsstest/source/rpc_server/dcerpc_server.c 2007-09-03
12:46:22 UTC (rev 24933)
+++ branches/4.0-spoolsstest/source/rpc_server/dcerpc_server.c 2007-09-03
12:46:29 UTC (rev 24934)
@@ -1362,3 +1362,20 @@
return critical_sizes;
}
+
+/*
+ initialise the dcerpc server context for ncacn_np based services
+*/
+_PUBLIC_ NTSTATUS dcesrv_init_ipc_context(TALLOC_CTX *mem_ctx, struct
dcesrv_context **_dce_ctx)
+{
+ NTSTATUS status;
+ struct dcesrv_context *dce_ctx;
+
+ status = dcesrv_init_context(mem_ctx, lp_dcerpc_endpoint_servers(),
dce_ctx);
+ NT_STATUS_NOT_OK_RETURN(status);
+
+ *_dce_ctx = dce_ctx;
+ return NT_STATUS_OK;
+}
+
+
Modified: branches/4.0-spoolsstest/source/rpc_server/service_rpc.c
===
--- branches/4.0-spoolsstest/source/rpc_server/service_rpc.c2007-09-03
12:46:22 UTC (rev 24933)
+++ branches/4.0-spoolsstest/source/rpc_server/service_rpc.c2007-09-03
12:46:29 UTC (rev 24934)
@@ -453,19 +453,4 @@
return register_server_service(rpc, dcesrv_init);
}
-/*
- initialise the dcerpc server context for ncacn_np based services
-*/
-_PUBLIC_ NTSTATUS dcesrv_init_ipc_context(TALLOC_CTX *mem_ctx, struct
dcesrv_context **_dce_ctx)
-{
- NTSTATUS status;
- struct dcesrv_context *dce_ctx;
- status = dcesrv_init_context(mem_ctx, lp_dcerpc_endpoint_servers(),
dce_ctx);
- NT_STATUS_NOT_OK_RETURN(status);
-
- *_dce_ctx = dce_ctx;
- return NT_STATUS_OK;
-}
-
-
Modified: branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
===
--- branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
2007-09-03 12:46:22 UTC (rev 24933)
+++ branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
2007-09-03 12:46:29 UTC (rev 24934)
@@ -28,6 +28,7 @@
#include lib/socket/socket.h
#include smbd/service_stream.h
#include librpc/gen_ndr/ndr_spoolss_c.h
+#include auth/credentials/credentials.h
enum spoolss_handle {
SPOOLSS_NOTIFY
@@ -1131,6 +1132,7 @@
struct dcerpc_binding *binding;
NTSTATUS status;
struct spoolss_ReplyOpenPrinter rop;
+ struct cli_credentials *creds;
DEBUG(2, (Received RFFPCNex from %s\n, r-in.str));
@@ -1148,8
svn commit: samba r24935 - in branches/4.0-spoolsstest: . source/libcli/nbt source/librpc/rpc source/rpc_server/spoolss source/torture/rpc
Author: jelmer
Date: 2007-09-03 12:46:35 + (Mon, 03 Sep 2007)
New Revision: 24935
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24935
Log:
Fix bug in librpc/ that caused a crash when an only IP address was specified.
Modified:
branches/4.0-spoolsstest/
branches/4.0-spoolsstest/source/libcli/nbt/nbtname.c
branches/4.0-spoolsstest/source/librpc/rpc/dcerpc_connect.c
branches/4.0-spoolsstest/source/librpc/rpc/dcerpc_smb.c
branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
Changeset:
Property changes on: branches/4.0-spoolsstest
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-spoolsstest/source/libcli/nbt/nbtname.c
===
--- branches/4.0-spoolsstest/source/libcli/nbt/nbtname.c2007-09-03
12:46:29 UTC (rev 24934)
+++ branches/4.0-spoolsstest/source/libcli/nbt/nbtname.c2007-09-03
12:46:35 UTC (rev 24935)
@@ -401,7 +401,7 @@
n-scope = NULL;
n-type = type;
- if (is_ipaddress(name)) {
+ if (is_ipaddress(name) || name == NULL) {
n-name = *SMBSERVER;
return;
}
Modified: branches/4.0-spoolsstest/source/librpc/rpc/dcerpc_connect.c
===
--- branches/4.0-spoolsstest/source/librpc/rpc/dcerpc_connect.c 2007-09-03
12:46:29 UTC (rev 24934)
+++ branches/4.0-spoolsstest/source/librpc/rpc/dcerpc_connect.c 2007-09-03
12:46:35 UTC (rev 24935)
@@ -110,7 +110,10 @@
remote rpc server */
conn-in.dest_host = s-io.binding-host;
conn-in.port = 0;
- conn-in.called_name= s-io.binding-target_hostname;
+ if (s-io.binding-target_hostname == NULL)
+ conn-in.called_name = *SMBSERVER;
+ else
+ conn-in.called_name=
s-io.binding-target_hostname;
conn-in.service= IPC$;
conn-in.service_type = NULL;
conn-in.workgroup = lp_workgroup();
Modified: branches/4.0-spoolsstest/source/librpc/rpc/dcerpc_smb.c
===
--- branches/4.0-spoolsstest/source/librpc/rpc/dcerpc_smb.c 2007-09-03
12:46:29 UTC (rev 24934)
+++ branches/4.0-spoolsstest/source/librpc/rpc/dcerpc_smb.c 2007-09-03
12:46:35 UTC (rev 24935)
@@ -430,7 +430,9 @@
/* if we don't have a binding on this pipe yet, then create one */
if (p-binding == NULL) {
NTSTATUS status;
- char *s = talloc_asprintf(p, ncacn_np:%s,
tree-session-transport-socket-hostname);
+ char *s;
+ SMB_ASSERT(tree-session-transport-socket-hostname != NULL);
+ s = talloc_asprintf(p, ncacn_np:%s,
tree-session-transport-socket-hostname);
if (s == NULL) return NULL;
status = dcerpc_parse_binding(p, s, p-binding);
talloc_free(s);
Modified: branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
===
--- branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
2007-09-03 12:46:29 UTC (rev 24934)
+++ branches/4.0-spoolsstest/source/rpc_server/spoolss/dcesrv_spoolss.c
2007-09-03 12:46:35 UTC (rev 24935)
@@ -1133,6 +1133,7 @@
NTSTATUS status;
struct spoolss_ReplyOpenPrinter rop;
struct cli_credentials *creds;
+ struct policy_handle notify_handle;
DEBUG(2, (Received RFFPCNex from %s\n, r-in.str));
@@ -1161,11 +1162,13 @@
}
ZERO_STRUCT(rop);
- rop.in.server_name = NULL;
+ rop.in.server_name = lp_netbios_name();
+ W_ERROR_HAVE_NO_MEMORY(rop.in.server_name);
rop.in.printer_local = 0;
rop.in.type = REG_NONE;
rop.in.unknown1 = 0;
rop.in.unknown2 = 0;
+ rop.out.handle = notify_handle;
status = dcerpc_spoolss_ReplyOpenPrinter(p, mem_ctx, rop);
if (NT_STATUS_IS_ERR(status)) {
Modified: branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
===
--- branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
2007-09-03 12:46:29 UTC (rev 24934)
+++ branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
2007-09-03 12:46:35 UTC (rev 24935)
@@ -30,6 +30,7 @@
#include smb_server/smb_server.h
#include lib/socket/netif.h
#include dlinklist.h
+#include ntvfs/ntvfs.h
static NTSTATUS spoolss__op_bind(struct dcesrv_call_state *dce_call, const
struct dcesrv_interface *iface)
{
@@ -222,6 +223,8 @@
torture_assert_ntstatus_ok(tctx, dcerpc_register_ep_server(ep_server),
svn commit: samba r24936 - in branches/4.0-spoolsstest: . source/torture/rpc
Author: jelmer Date: 2007-09-03 12:46:40 + (Mon, 03 Sep 2007) New Revision: 24936 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24936 Log: Fix formatting. Modified: branches/4.0-spoolsstest/ branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c Changeset: Property changes on: branches/4.0-spoolsstest ___ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c === --- branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c 2007-09-03 12:46:35 UTC (rev 24935) +++ branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c 2007-09-03 12:46:40 UTC (rev 24936) @@ -286,9 +286,8 @@ struct torture_suite *suite = torture_suite_create(mem_ctx, SPOOLSS-NOTIFY); struct torture_rpc_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite, - notify, ndr_table_spoolss); + notify, ndr_table_spoolss); - ntvfs_init(); torture_rpc_tcase_add_test(tcase, testRFFPCNEx, test_RFFPCNEx);
svn commit: samba r24937 - in branches/SAMBA_4_0: . source source/lib/socket source/libcli/nbt source/librpc/rpc source/rpc_server source/rpc_server/spoolss source/smb_server source/smbd source/tortur
Author: jelmer Date: 2007-09-03 13:13:25 + (Mon, 03 Sep 2007) New Revision: 24937 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24937 Log: Merge tests spoolss RPC callbacks. Added: branches/SAMBA_4_0/source/rpc_server/service_rpc.c branches/SAMBA_4_0/source/torture/rpc/spoolss_notify.c Removed: branches/SAMBA_4_0/source/rpc_server/dcerpc_sock.c Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/.bzrignore branches/SAMBA_4_0/source/lib/socket/netif.h branches/SAMBA_4_0/source/libcli/nbt/nbtname.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb.c branches/SAMBA_4_0/source/main.mk branches/SAMBA_4_0/source/rpc_server/config.mk branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c branches/SAMBA_4_0/source/rpc_server/spoolss/dcesrv_spoolss.c branches/SAMBA_4_0/source/smb_server/smb_server.c branches/SAMBA_4_0/source/smb_server/smb_server.h branches/SAMBA_4_0/source/smbd/process_model.h branches/SAMBA_4_0/source/smbd/process_single.c branches/SAMBA_4_0/source/smbd/service_stream.c branches/SAMBA_4_0/source/torture/config.mk branches/SAMBA_4_0/source/torture/rpc/rpc.c branches/SAMBA_4_0/source/torture/rpc/spoolss.c Changeset: Sorry, the patch is too large (4163 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24937
svn commit: samba r24938 - in branches/SAMBA_3_0_25/packaging/Debian/debian-sarge: . patches
Author: idra
Date: 2007-09-03 16:09:30 + (Mon, 03 Sep 2007)
New Revision: 24938
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24938
Log:
Patches to build 3.0.25c
Added:
branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch.unused
branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/py_smb.patch
Removed:
branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch
Modified:
branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/changelog
branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/documentation.patch
Changeset:
Modified: branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/changelog
===
--- branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/changelog
2007-09-03 13:13:25 UTC (rev 24937)
+++ branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/changelog
2007-09-03 16:09:30 UTC (rev 24938)
@@ -1,3 +1,15 @@
+samba (3.0.25c-1) stable; urgency=low
+
+ * samba 3.0.25c bugfix release
+
+ -- Simo Sorce [EMAIL PROTECTED] Mon, 3 Sep 2007 11:18:30 -0400
+
+samba (3.0.25b-1) stable; urgency=low
+
+ * samba 3.0.25b bugfix release
+
+ -- Simo Sorce [EMAIL PROTECTED] Mon, 2 Jul 2007 12:16:30 -0400
+
samba (3.0.25a-2) stable; urgency=low
* Fix bug in fhs.patch
Modified:
branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/documentation.patch
===
---
branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/documentation.patch
2007-09-03 13:13:25 UTC (rev 24937)
+++
branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/documentation.patch
2007-09-03 16:09:30 UTC (rev 24938)
@@ -13,15 +13,15 @@
.PP
@@ -87,12 +94,12 @@
.TP 3n
- #8226;
+ \(bu
-/usr/local/samba/sbin/swat
+/usr/sbin/swat
.TP 3n
- #8226;
+ \(bu
-/usr/local/samba/swat/images/*
+/usr/share/samba/swat/images/*
.TP 3n
- #8226;
+ \(bu
-/usr/local/samba/swat/help/*
+/usr/share/samba/swat/help/*
.SS Inetd Installation
@@ -43,8 +43,8 @@
-you should add a line like this:
+you should add a line like this (not needed for Debian since the maintainer
scripts do it automatically. You need to uncomment the line, though, because it
is added commented out for security reasons):
.PP
--\fBswat stream tcp nowait.400 root /usr/local/samba/sbin/swat swat\fR
-+\fBswat stream tcp nowait.400 root /usr/sbin/swat swat\fR
+-swat stream tcp nowait.400 root /usr/local/samba/sbin/swat swat
++swat stream tcp nowait.400 root /usr/sbin/swat swat
.PP
Once you have edited
\fI/etc/services\fR
Deleted:
branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch
===
---
branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch
2007-09-03 13:13:25 UTC (rev 24937)
+++
branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch
2007-09-03 16:09:30 UTC (rev 24938)
@@ -1,20 +0,0 @@
-diff -uNr samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c
samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c
samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c 2002-11-26
20:54:19.0 -0600
-+++ samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c2002-12-16
23:34:13.0 -0600
-@@ -214,12 +214,16 @@
- extern struct in_addr loopback_ip;
-
- if(num_interfaces == 0) {
-+ void (*old_handler)(int);
-+
- DEBUG(0,(create_subnets: No local interfaces !\n));
- DEBUG(0,(create_subnets: Waiting for an interface to appear
...\n));
-+ old_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
- while (iface_count() == 0) {
- sleep(5);
- load_interfaces();
- }
-+ CatchSignal( SIGTERM, SIGNAL_CAST old_handler );
- }
-
- num_interfaces = iface_count();
Copied:
branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch.unused
(from rev 24937,
branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch)
Added: branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/py_smb.patch
===
--- branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/py_smb.patch
2007-09-03 13:13:25 UTC (rev 24937)
+++ branches/SAMBA_3_0_25/packaging/Debian/debian-sarge/patches/py_smb.patch
2007-09-03 16:09:30 UTC (rev 24938)
@@ -0,0 +1,11 @@
+--- samba-3.0.25c.orig/source/python/py_smb.c 2007-09-03 15:34:13.0
+
samba-3.0.25c/source/python/py_smb.c 2007-09-03 15:34:31.0
+
+@@ -48,7 +48,7 @@
+
+ ZERO_STRUCT(ip);
+
+- if (!cli_connect(cli, server, ip))
++ if (!NT_STATUS_IS_OK(cli_connect(cli, server, ip)))
+
svn commit: samba r24939 - in branches/SAMBA_4_0: . source/lib/socket
Author: jelmer Date: 2007-09-03 22:39:16 + (Mon, 03 Sep 2007) New Revision: 24939 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24939 Log: Integrate IPv4 and IPv6 modules (a lot of code can be shared). Added: branches/SAMBA_4_0/source/lib/socket/socket_ip.c Removed: branches/SAMBA_4_0/source/lib/socket/socket_ipv4.c branches/SAMBA_4_0/source/lib/socket/socket_ipv6.c Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/lib/socket/config.mk Changeset: Sorry, the patch is too large (2095 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24939
Build status as of Tue Sep 4 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-09-03 00:02:38.0 + +++ /home/build/master/cache/broken_results.txt 2007-09-04 00:01:37.0 + @@ -0,0 +1,24 @@ +Build status as of Tue Sep 4 00:00:02 2007 + +Build counts: +Tree Total Broken Panic +SOC 0 0 0 +build_farm 0 0 0 +ccache 28 9 0 +ctdb 0 0 0 +distcc 2 0 0 +ldb 26 4 0 +libreplace 26 8 0 +lorikeet-heimdal 23 11 0 +pidl 15 4 0 +ppp 9 7 0 +python 0 0 0 +rsync28 13 0 +samba-docs 0 0 0 +samba-gtk2 2 0 +samba4 25 24 0 +samba_3_229 16 0 +smb-build25 25 0 +talloc 28 1 0 +tdb 27 3 0 +
svn commit: samba r24940 - in branches/SAMBA_4_0: . source/smb_server
Author: jelmer Date: 2007-09-04 01:08:39 + (Tue, 04 Sep 2007) New Revision: 24940 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24940 Log: Fix undeclared warning. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/smb_server/smb_server.h Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:revision-info ...skipped... Name: bzr:file-ids ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/smb_server/smb_server.h === --- branches/SAMBA_4_0/source/smb_server/smb_server.h 2007-09-03 22:39:16 UTC (rev 24939) +++ branches/SAMBA_4_0/source/smb_server/smb_server.h 2007-09-04 01:08:39 UTC (rev 24940) @@ -376,6 +376,8 @@ struct share_context *share_context; }; +struct model_ops; + NTSTATUS smbsrv_add_socket(struct event_context *event_context, const struct model_ops *model_ops, const char *address);
svn commit: samba r24941 - in branches/SAMBA_4_0/source: dsdb/samdb lib/util
Author: abartlet
Date: 2007-09-04 02:08:36 + (Tue, 04 Sep 2007)
New Revision: 24941
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24941
Log:
Simplify samdb_result_nttime(), and remove nttime_from_string()
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
branches/SAMBA_4_0/source/lib/util/time.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/samdb.c2007-09-04 01:08:39 UTC
(rev 24940)
+++ branches/SAMBA_4_0/source/dsdb/samdb/samdb.c2007-09-04 02:08:36 UTC
(rev 24941)
@@ -449,9 +449,7 @@
*/
NTTIME samdb_result_nttime(struct ldb_message *msg, const char *attr, NTTIME
default_value)
{
- const char *str = ldb_msg_find_attr_as_string(msg, attr, NULL);
- if (!str) return default_value;
- return nttime_from_string(str);
+ return ldb_msg_find_attr_as_uint64(msg, attr, default_value);
}
/*
Modified: branches/SAMBA_4_0/source/lib/util/time.c
===
--- branches/SAMBA_4_0/source/lib/util/time.c 2007-09-04 01:08:39 UTC (rev
24940)
+++ branches/SAMBA_4_0/source/lib/util/time.c 2007-09-04 02:08:36 UTC (rev
24941)
@@ -374,14 +374,6 @@
}
/**
- parse a nttime as a large integer in a string and return a NTTIME
-*/
-_PUBLIC_ NTTIME nttime_from_string(const char *s)
-{
- return strtoull(s, NULL, 0);
-}
-
-/**
return (tv1 - tv2) in microseconds
*/
_PUBLIC_ int64_t usec_time_diff(struct timeval *tv1, struct timeval *tv2)
svn commit: samba r24942 - in branches/SAMBA_4_0/source: rpc_server/samr torture/rpc
Author: abartlet Date: 2007-09-04 02:22:04 + (Tue, 04 Sep 2007) New Revision: 24942 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24942 Log: Patch from Matthias Walln?\195?\182fer [EMAIL PROTECTED] and a testsuite to prove it is correct. This should fix bug #4824: User Manager for Domains - Account Expires. Thanks! Andrew Bartlett Modified: branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c branches/SAMBA_4_0/source/torture/rpc/samr.c Changeset: Modified: branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c === --- branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c 2007-09-04 02:08:36 UTC (rev 24941) +++ branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c 2007-09-04 02:22:04 UTC (rev 24942) @@ -3363,7 +3363,9 @@ break; case 21: -#define IFSET(bit) if (bit r-in.info-info21.fields_present) +#define IFSET(bit) if (bit r-in.info-info21.fields_present) + IFSET(SAMR_FIELD_ACCT_EXPIRY) + SET_UINT64(msg, info21.acct_expiry, accountExpires); IFSET(SAMR_FIELD_ACCOUNT_NAME) SET_STRING(msg, info21.account_name, samAccountName); IFSET(SAMR_FIELD_FULL_NAME) @@ -3391,15 +3393,14 @@ IFSET(SAMR_FIELD_COUNTRY_CODE) SET_UINT (msg, info21.country_code, countryCode); IFSET(SAMR_FIELD_CODE_PAGE) - SET_UINT (msg, info21.code_page, codePage); - - - /* Any reason the rest of these can't be set? */ + SET_UINT (msg, info21.code_page, codePage); #undef IFSET break; case 23: #define IFSET(bit) if (bit r-in.info-info23.info.fields_present) + IFSET(SAMR_FIELD_ACCT_EXPIRY) + SET_UINT64(msg, info23.info.acct_expiry, accountExpires); IFSET(SAMR_FIELD_ACCOUNT_NAME) SET_STRING(msg, info23.info.account_name, samAccountName); IFSET(SAMR_FIELD_FULL_NAME) @@ -3454,6 +3455,8 @@ case 25: #define IFSET(bit) if (bit r-in.info-info25.info.fields_present) + IFSET(SAMR_FIELD_ACCT_EXPIRY) + SET_UINT64(msg, info25.info.acct_expiry, accountExpires); IFSET(SAMR_FIELD_ACCOUNT_NAME) SET_STRING(msg, info25.info.account_name, samAccountName); IFSET(SAMR_FIELD_FULL_NAME) Modified: branches/SAMBA_4_0/source/torture/rpc/samr.c === --- branches/SAMBA_4_0/source/torture/rpc/samr.c2007-09-04 02:08:36 UTC (rev 24941) +++ branches/SAMBA_4_0/source/torture/rpc/samr.c2007-09-04 02:22:04 UTC (rev 24942) @@ -386,6 +386,11 @@ TEST_USERINFO_INT(21, code_page, 21, code_page, __LINE__, SAMR_FIELD_CODE_PAGE); + TEST_USERINFO_INT(17, acct_expiry, 21, acct_expiry, __LINE__, 0); + TEST_USERINFO_INT(17, acct_expiry, 5, acct_expiry, __LINE__, 0); + TEST_USERINFO_INT(21, acct_expiry, 21, acct_expiry, __LINE__, + SAMR_FIELD_ACCT_EXPIRY); + TEST_USERINFO_INT(4, logon_hours.bits[3], 3, logon_hours.bits[3], 1, 0); TEST_USERINFO_INT(4, logon_hours.bits[3], 5, logon_hours.bits[3], 2, 0); TEST_USERINFO_INT(4, logon_hours.bits[3], 21, logon_hours.bits[3], 3, 0);
svn commit: samba r24943 - in branches: SAMBA_3_2/source/utils SAMBA_3_2_0/source/utils
Author: vlendec
Date: 2007-09-04 05:39:06 + (Tue, 04 Sep 2007)
New Revision: 24943
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24943
Log:
Some stackframes
Modified:
branches/SAMBA_3_2/source/utils/nmblookup.c
branches/SAMBA_3_2/source/utils/pdbedit.c
branches/SAMBA_3_2/source/utils/sharesec.c
branches/SAMBA_3_2/source/utils/smbcacls.c
branches/SAMBA_3_2/source/utils/smbcquotas.c
branches/SAMBA_3_2/source/utils/smbfilter.c
branches/SAMBA_3_2/source/utils/smbget.c
branches/SAMBA_3_2/source/utils/smbpasswd.c
branches/SAMBA_3_2/source/utils/smbtree.c
branches/SAMBA_3_2_0/source/utils/nmblookup.c
branches/SAMBA_3_2_0/source/utils/pdbedit.c
branches/SAMBA_3_2_0/source/utils/sharesec.c
branches/SAMBA_3_2_0/source/utils/smbcacls.c
branches/SAMBA_3_2_0/source/utils/smbcquotas.c
branches/SAMBA_3_2_0/source/utils/smbfilter.c
branches/SAMBA_3_2_0/source/utils/smbget.c
branches/SAMBA_3_2_0/source/utils/smbpasswd.c
branches/SAMBA_3_2_0/source/utils/smbtree.c
Changeset:
Modified: branches/SAMBA_3_2/source/utils/nmblookup.c
===
--- branches/SAMBA_3_2/source/utils/nmblookup.c 2007-09-04 02:22:04 UTC (rev
24942)
+++ branches/SAMBA_3_2/source/utils/nmblookup.c 2007-09-04 05:39:06 UTC (rev
24943)
@@ -193,6 +193,7 @@
static BOOL find_master=False;
static BOOL lookup_by_ip = False;
poptContext pc;
+ TALLOC_CTX *frame = talloc_stackframe();
struct poptOption long_options[] = {
POPT_AUTOHELP
@@ -292,6 +293,6 @@
}
poptFreeContext(pc);
-
+ TALLOC_FREE(frame);
return(0);
}
Modified: branches/SAMBA_3_2/source/utils/pdbedit.c
===
--- branches/SAMBA_3_2/source/utils/pdbedit.c 2007-09-04 02:22:04 UTC (rev
24942)
+++ branches/SAMBA_3_2/source/utils/pdbedit.c 2007-09-04 05:39:06 UTC (rev
24943)
@@ -758,6 +758,7 @@
static BOOL pw_from_stdin = False;
struct pdb_methods *bin, *bout, *bdef;
char *configfile = NULL;
+ TALLOC_CTX *frame = talloc_stackframe();
poptContext pc;
struct poptOption long_options[] = {
POPT_AUTOHELP
@@ -798,6 +799,7 @@
/* we shouldn't have silly checks like this */
if (getuid() != 0) {
d_fprintf(stderr, You must be root to use pdbedit\n);
+ TALLOC_FREE(frame);
return -1;
}
@@ -1050,5 +1052,6 @@
}
poptPrintHelp(pc, stderr, 0);
+ TALLOC_FREE(frame);
return 1;
}
Modified: branches/SAMBA_3_2/source/utils/sharesec.c
===
--- branches/SAMBA_3_2/source/utils/sharesec.c 2007-09-04 02:22:04 UTC (rev
24942)
+++ branches/SAMBA_3_2/source/utils/sharesec.c 2007-09-04 05:39:06 UTC (rev
24943)
@@ -507,7 +507,7 @@
{ NULL }
};
- if ( !(ctx = talloc_init(main)) ) {
+ if ( !(ctx = talloc_stackframe()) ) {
fprintf( stderr, Failed to initialize talloc context!\n);
return -1;
}
Modified: branches/SAMBA_3_2/source/utils/smbcacls.c
===
--- branches/SAMBA_3_2/source/utils/smbcacls.c 2007-09-04 02:22:04 UTC (rev
24942)
+++ branches/SAMBA_3_2/source/utils/smbcacls.c 2007-09-04 05:39:06 UTC (rev
24943)
@@ -824,7 +824,7 @@
load_case_tables();
- ctx=talloc_init(main);
+ ctx=talloc_stackframe();
/* set default debug level to 1 regardless of what smb.conf sets */
setup_logging( smbcacls, True );
Modified: branches/SAMBA_3_2/source/utils/smbcquotas.c
===
--- branches/SAMBA_3_2/source/utils/smbcquotas.c2007-09-04 02:22:04 UTC
(rev 24942)
+++ branches/SAMBA_3_2/source/utils/smbcquotas.c2007-09-04 05:39:06 UTC
(rev 24943)
@@ -401,6 +401,7 @@
struct cli_state *cli;
BOOL fix_user = False;
SMB_NTQUOTA_STRUCT qt;
+ TALLOC_CTX *frame = talloc_stackframe();
poptContext pc;
struct poptOption long_options[] = {
POPT_AUTOHELP
@@ -544,6 +545,8 @@
break;
}
+ talloc_free(frame);
+
return result;
}
Modified: branches/SAMBA_3_2/source/utils/smbfilter.c
===
--- branches/SAMBA_3_2/source/utils/smbfilter.c 2007-09-04 02:22:04 UTC (rev
24942)
+++ branches/SAMBA_3_2/source/utils/smbfilter.c 2007-09-04 05:39:06 UTC (rev
24943)
@@ -220,6 +220,7 @@
{
char *desthost;
pstring configfile;
+ TALLOC_CTX *frame = talloc_stackframe();
setup_logging(argv[0],True);
@@ -240,5 +241,6 @@
}
start_filter(desthost);
+ TALLOC_FREE(frame);
return 0;
}
Modified:
svn commit: samba r24944 - in branches/SAMBA_4_0_RELEASE/source: rpc_server/samr torture/rpc
Author: abartlet Date: 2007-09-04 05:57:54 + (Tue, 04 Sep 2007) New Revision: 24944 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24944 Log: Merge acct_expiry fix to release branch. Andrew Bartlett Modified: branches/SAMBA_4_0_RELEASE/source/rpc_server/samr/dcesrv_samr.c branches/SAMBA_4_0_RELEASE/source/torture/rpc/samr.c Changeset: Modified: branches/SAMBA_4_0_RELEASE/source/rpc_server/samr/dcesrv_samr.c === --- branches/SAMBA_4_0_RELEASE/source/rpc_server/samr/dcesrv_samr.c 2007-09-04 05:39:06 UTC (rev 24943) +++ branches/SAMBA_4_0_RELEASE/source/rpc_server/samr/dcesrv_samr.c 2007-09-04 05:57:54 UTC (rev 24944) @@ -3363,7 +3363,9 @@ break; case 21: -#define IFSET(bit) if (bit r-in.info-info21.fields_present) +#define IFSET(bit) if (bit r-in.info-info21.fields_present) + IFSET(SAMR_FIELD_ACCT_EXPIRY) + SET_UINT64(msg, info21.acct_expiry, accountExpires); IFSET(SAMR_FIELD_ACCOUNT_NAME) SET_STRING(msg, info21.account_name, samAccountName); IFSET(SAMR_FIELD_FULL_NAME) @@ -3391,15 +3393,14 @@ IFSET(SAMR_FIELD_COUNTRY_CODE) SET_UINT (msg, info21.country_code, countryCode); IFSET(SAMR_FIELD_CODE_PAGE) - SET_UINT (msg, info21.code_page, codePage); - - - /* Any reason the rest of these can't be set? */ + SET_UINT (msg, info21.code_page, codePage); #undef IFSET break; case 23: #define IFSET(bit) if (bit r-in.info-info23.info.fields_present) + IFSET(SAMR_FIELD_ACCT_EXPIRY) + SET_UINT64(msg, info23.info.acct_expiry, accountExpires); IFSET(SAMR_FIELD_ACCOUNT_NAME) SET_STRING(msg, info23.info.account_name, samAccountName); IFSET(SAMR_FIELD_FULL_NAME) @@ -3454,6 +3455,8 @@ case 25: #define IFSET(bit) if (bit r-in.info-info25.info.fields_present) + IFSET(SAMR_FIELD_ACCT_EXPIRY) + SET_UINT64(msg, info25.info.acct_expiry, accountExpires); IFSET(SAMR_FIELD_ACCOUNT_NAME) SET_STRING(msg, info25.info.account_name, samAccountName); IFSET(SAMR_FIELD_FULL_NAME) Modified: branches/SAMBA_4_0_RELEASE/source/torture/rpc/samr.c === --- branches/SAMBA_4_0_RELEASE/source/torture/rpc/samr.c2007-09-04 05:39:06 UTC (rev 24943) +++ branches/SAMBA_4_0_RELEASE/source/torture/rpc/samr.c2007-09-04 05:57:54 UTC (rev 24944) @@ -386,6 +386,11 @@ TEST_USERINFO_INT(21, code_page, 21, code_page, __LINE__, SAMR_FIELD_CODE_PAGE); + TEST_USERINFO_INT(17, acct_expiry, 21, acct_expiry, __LINE__, 0); + TEST_USERINFO_INT(17, acct_expiry, 5, acct_expiry, __LINE__, 0); + TEST_USERINFO_INT(21, acct_expiry, 21, acct_expiry, __LINE__, + SAMR_FIELD_ACCT_EXPIRY); + TEST_USERINFO_INT(4, logon_hours.bits[3], 3, logon_hours.bits[3], 1, 0); TEST_USERINFO_INT(4, logon_hours.bits[3], 5, logon_hours.bits[3], 2, 0); TEST_USERINFO_INT(4, logon_hours.bits[3], 21, logon_hours.bits[3], 3, 0);
