[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1183-g662f996
The branch, master has been updated via 662f996b1554508baf7344b8618f152c179f1680 (commit) from dc0e46afb7018a1da666729c6d61e8ea85dcf07d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 662f996b1554508baf7344b8618f152c179f1680 Author: Tim Prouty Date: Wed Feb 25 00:11:31 2009 -0800 s3: Fix 'assignment differ in signedness' warning --- Summary of changes: source3/auth/auth_wbc.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/auth/auth_wbc.c b/source3/auth/auth_wbc.c index b0af9ff..580c8b5 100644 --- a/source3/auth/auth_wbc.c +++ b/source3/auth/auth_wbc.c @@ -74,7 +74,7 @@ static NTSTATUS check_wbc_security(const struct auth_context *auth_context, user_info->internal_username)); params.level = WBC_AUTH_USER_LEVEL_PLAIN; - params.password.plaintext = user_info->plaintext_password.data; + params.password.plaintext = (char *)user_info->plaintext_password.data; } else { DEBUG(3,("Checking encrypted password for %s.\n", user_info->internal_username)); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1184-geb5efd1
The branch, master has been updated via eb5efd1978acd38cf6cc97e067b5105743ca5469 (commit) from 662f996b1554508baf7344b8618f152c179f1680 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit eb5efd1978acd38cf6cc97e067b5105743ca5469 Author: Tim Prouty Date: Tue Feb 24 23:38:42 2009 -0800 s4 heimdal: Link libintl correctly --- Summary of changes: source4/heimdal_build/internal.m4 |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/heimdal_build/internal.m4 b/source4/heimdal_build/internal.m4 index 50a3c8a..a48777f 100644 --- a/source4/heimdal_build/internal.m4 +++ b/source4/heimdal_build/internal.m4 @@ -170,6 +170,12 @@ SMB_ENABLE(OPENPTY,YES) SMB_EXT_LIB(OPENPTY,[${OPENPTY_LIBS}],[${OPENPTY_CFLAGS}],[${OPENPTY_CPPFLAGS}],[${OPENPTY_LDFLAGS}]) +AC_CHECK_LIB_EXT(intl, INTL_LIBS, gettext) + +SMB_ENABLE(INTL,YES) + +SMB_EXT_LIB(INTL, $INTL_LIBS) + smb_save_LIBS=$LIBS RESOLV_LIBS="" LIBS="" -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1188-g24a63ad
The branch, master has been updated via 24a63add2d92afa0084fec956df7508ea28aab89 (commit) via 4823e988b6360646931f9b6369bf7b8f512069a8 (commit) via 2f1b12890a31baceee6a4d446b4782caefb1fcaa (commit) via c2cdb4ad5c9398ef0d3310613107999f8d33c7ce (commit) from eb5efd1978acd38cf6cc97e067b5105743ca5469 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 24a63add2d92afa0084fec956df7508ea28aab89 Merge: 4823e988b6360646931f9b6369bf7b8f512069a8 eb5efd1978acd38cf6cc97e067b5105743ca5469 Author: Andrew Bartlett Date: Wed Feb 25 20:27:43 2009 +1100 Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel commit 4823e988b6360646931f9b6369bf7b8f512069a8 Author: Oliver Liebel Date: Wed Feb 25 20:26:27 2009 +1100 WHATSNEW updates Signed-off-by: Andrew Bartlett commit 2f1b12890a31baceee6a4d446b4782caefb1fcaa Author: Andrew Bartlett Date: Wed Feb 25 17:52:00 2009 +1100 Credit tridge's work on fixing GnuTLS commit c2cdb4ad5c9398ef0d3310613107999f8d33c7ce Author: Andrew Bartlett Date: Wed Feb 25 17:43:07 2009 +1100 Work around ndr_unpack failing on structures with relative pointers. This disgusting hack works around the fact that ndr_pull_struct_blob_all will always fail on structures with relative pointers. So, map ndr_unpack to ndr_pull_struct_blob_all only if we don't have any relative pointers in this structure. Andrew Bartlett --- Summary of changes: WHATSNEW4.txt|9 +++-- pidl/lib/Parse/Pidl/Samba4/Python.pm | 19 ++- 2 files changed, 25 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW4.txt b/WHATSNEW4.txt index 2093a4e..7c637cc 100644 --- a/WHATSNEW4.txt +++ b/WHATSNEW4.txt @@ -69,8 +69,11 @@ In the time since Samba4 alpha6 was released in Janurary 2009, Samba has continued to evolve, but you may particularly notice these areas (in no particular order): - OpenLDAP Multi Master Replication can now also replicate the OpenLDAP - configuration itself. + Multi Master Replication (MMR) configuration can now be generated + for the OpenLDAP-Backend. + + OpenLDAP-Online-Configuration (olc) can now be generated for the + OpenLDAP-Backend. (OpenLDAP-Versions >=2.4.15 required). Support for Windows 7 beta as a member of the Samba4 domain @@ -83,6 +86,8 @@ continued to evolve, but you may particularly notice these areas the corrected IDL back into Samba4 Fixes to allow use of C++ compilers and to increase portability + + Fixed TLS (SSL) support with modern versions of GnuTLS These are just some of the highlights of the work done in the past month. More details can be found in our GIT history. diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm index 48785f5..6099fe5 100644 --- a/pidl/lib/Parse/Pidl/Samba4/Python.pm +++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm @@ -275,7 +275,24 @@ sub PythonStruct($$) $self->pidl("if (!PyArg_ParseTuple(args, \"s#:__ndr_unpack__\", &blob.data, &blob.length))"); $self->pidl("\treturn NULL;"); $self->pidl(""); - $self->pidl("err = ndr_pull_struct_blob_all(&blob, py_talloc_get_mem_ctx(py_obj), NULL, object, (ndr_pull_flags_fn_t)ndr_pull_$name);"); + + # This disgusting hack works around the fact that ndr_pull_struct_blob_all will always fail on structures with relative pointers. +# So, map ndr_unpack to ndr_pull_struct_blob_all only if we don't have any relative pointers in this + my $got_relative = 0; + if ($#{$d->{ELEMENTS}} > -1) { + foreach my $e (@{$d->{ELEMENTS}}) { + my $l = $e->{LEVELS}[0]; + if ($l->{TYPE} eq "POINTER" and ($l->{POINTER_TYPE} eq "relative")) { + $got_relative = 1; + last; + } + } + } + if ($got_relative == 0) { + $self->pidl("err = ndr_pull_struct_blob_all(&blob, py_talloc_get_mem_ctx(py_obj), NULL, object, (ndr_pull_flags_fn_t)ndr_pull_$name);"); + } else { + $self->pidl("err = ndr_pull_struct_blob(&blob, py_talloc_get_mem_ctx(py_obj), NULL, object, (ndr_pull_flags_fn_t)ndr_pull_$name);"); + } $self->pidl("if (err != NDR_ERR_SUCCESS) {"); $self->indent; $self->pidl("PyErr_SetNdrError(err);"); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1189-g9d165fa
The branch, master has been updated via 9d165fa5c69d3c98d1a76a155bb794a7e4c9744a (commit) from 24a63add2d92afa0084fec956df7508ea28aab89 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 9d165fa5c69d3c98d1a76a155bb794a7e4c9744a Author: Günther Deschner Date: Wed Feb 25 01:07:50 2009 +0100 s3-spoolss: add rpccli_spoolss_addprinterex convenience wrapper. Guenther --- Summary of changes: source3/include/proto.h |3 ++ source3/rpc_client/cli_spoolss.c | 42 ++ 2 files changed, 45 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index 9366607..5c9e5d3 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5476,6 +5476,9 @@ WERROR rpccli_spoolss_getprinterdriver2(struct rpc_pipe_client *cli, union spoolss_DriverInfo *info, uint32_t *server_major_version, uint32_t *server_minor_version); +WERROR rpccli_spoolss_addprinterex(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct spoolss_SetPrinterInfoCtr *info_ctr); WERROR rpccli_spoolss_enum_printers(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, char *name, uint32 flags, uint32 level, uint32 *num_printers, PRINTER_INFO_CTR *ctr); diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c index 19e9aae..20599d1 100644 --- a/source3/rpc_client/cli_spoolss.c +++ b/source3/rpc_client/cli_spoolss.c @@ -137,6 +137,48 @@ WERROR rpccli_spoolss_getprinterdriver2(struct rpc_pipe_client *cli, return werror; } +/** + convencience wrapper around rpccli_spoolss_AddPrinterEx +**/ + +WERROR rpccli_spoolss_addprinterex(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct spoolss_SetPrinterInfoCtr *info_ctr) +{ + WERROR result; + NTSTATUS status; + struct spoolss_DevmodeContainer devmode_ctr; + struct sec_desc_buf secdesc_ctr; + struct spoolss_UserLevelCtr userlevel_ctr; + struct spoolss_UserLevel1 level1; + struct policy_handle handle; + + ZERO_STRUCT(devmode_ctr); + ZERO_STRUCT(secdesc_ctr); + + level1.size = 28; + level1.build= 1381; + level1.major= 2; + level1.minor= 0; + level1.processor= 0; + level1.client = talloc_asprintf(mem_ctx, "%s", global_myname()); + W_ERROR_HAVE_NO_MEMORY(level1.client); + level1.user = cli->auth->user_name; + + userlevel_ctr.level = 1; + userlevel_ctr.user_info.level1 = &level1; + + status = rpccli_spoolss_AddPrinterEx(cli, mem_ctx, +cli->srv_name_slash, +info_ctr, +&devmode_ctr, +&secdesc_ctr, +&userlevel_ctr, +&handle, +&result); + return result; +} + /* Decode various spoolss rpc's and info levels / -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1190-g9e3178e
The branch, master has been updated via 9e3178e8387cd85858a145bb4918073f91127d20 (commit) from 9d165fa5c69d3c98d1a76a155bb794a7e4c9744a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 9e3178e8387cd85858a145bb4918073f91127d20 Author: Volker Lendecke Date: Wed Feb 25 10:54:19 2009 +0100 Attempt to fix the OpenChange build -- sorry for the break --- Summary of changes: lib/tevent/tevent.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h index 33747f0..b3d1c6d 100644 --- a/lib/tevent/tevent.h +++ b/lib/tevent/tevent.h @@ -31,7 +31,7 @@ #include #include #include -#include <../lib/replace/replace.h> +#include struct tevent_context; struct tevent_ops; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1197-g59e90d3
The branch, master has been updated via 59e90d3715a577503434ace9e01bfe63dfcfa714 (commit) via c03f2072762d91240fe90a2f02542e521313e7ef (commit) via c7ba20b465e4c2bf893891ab7ace8172704bb27c (commit) via 109ba07b0e2ce45cc0a960bcafd0e8d28c877ae3 (commit) via f8af5130d5515e017330a2123b933109599e072c (commit) via 1a77218dca0222aafff81aae6cd17462706e226e (commit) via 6366084c4a7aa4845816cef6f1782e9d1c1f138c (commit) from 9e3178e8387cd85858a145bb4918073f91127d20 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 59e90d3715a577503434ace9e01bfe63dfcfa714 Author: Günther Deschner Date: Wed Feb 25 01:23:40 2009 +0100 s3-spoolss: remove rpccli_spoolss_getprinter. Guenther commit c03f2072762d91240fe90a2f02542e521313e7ef Author: Günther Deschner Date: Wed Feb 25 00:12:58 2009 +0100 s3-spoolss: remove rpccli_spoolss_setprinter. Guenther commit c7ba20b465e4c2bf893891ab7ace8172704bb27c Author: Günther Deschner Date: Tue Feb 10 23:37:00 2009 +0100 s3-spoolss: remove rpccli_spoolss_addprinterex. Guenther commit 109ba07b0e2ce45cc0a960bcafd0e8d28c877ae3 Author: Günther Deschner Date: Wed Feb 25 01:11:01 2009 +0100 s3-spoolss: use rpccli_spoolss_addprinterex wrapper. Guenther commit f8af5130d5515e017330a2123b933109599e072c Author: Günther Deschner Date: Wed Feb 25 10:58:53 2009 +0100 s3-net: use rpccli_spoolss_getprinter and rpccli_spoolss_SetPrinter. Guenther commit 1a77218dca0222aafff81aae6cd17462706e226e Author: Günther Deschner Date: Sat Feb 14 03:08:06 2009 +0100 s3-rpcclient: use rpccli_spoolss_SetPrinter and rpccli_spoolss_getprinter. Guenther commit 6366084c4a7aa4845816cef6f1782e9d1c1f138c Author: Günther Deschner Date: Sat Feb 14 03:07:01 2009 +0100 s3-spoolss: add rpccli_spoolss_getprinter convenience wrapper. Guenther --- Summary of changes: source3/include/proto.h | 47 +-- source3/include/rpc_spoolss.h | 126 -- source3/rpc_client/cli_spoolss.c | 195 +++--- source3/rpc_parse/parse_spoolss.c | 832 - source3/rpcclient/cmd_spoolss.c | 214 ++ source3/utils/net_rpc_printer.c | 178 ++-- 6 files changed, 312 insertions(+), 1280 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index 5c9e5d3..8084111 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5479,24 +5479,22 @@ WERROR rpccli_spoolss_getprinterdriver2(struct rpc_pipe_client *cli, WERROR rpccli_spoolss_addprinterex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct spoolss_SetPrinterInfoCtr *info_ctr); +WERROR rpccli_spoolss_getprinter(struct rpc_pipe_client *cli, +TALLOC_CTX *mem_ctx, +struct policy_handle *handle, +uint32_t level, +uint32_t offered, +union spoolss_PrinterInfo *info); WERROR rpccli_spoolss_enum_printers(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, char *name, uint32 flags, uint32 level, uint32 *num_printers, PRINTER_INFO_CTR *ctr); WERROR rpccli_spoolss_enum_ports(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32 level, uint32 *num_ports, PORT_INFO_CTR *ctr); -WERROR rpccli_spoolss_getprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - POLICY_HND *pol, uint32 level, - PRINTER_INFO_CTR *ctr); -WERROR rpccli_spoolss_setprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - POLICY_HND *pol, uint32 level, - PRINTER_INFO_CTR *ctr, uint32 command); WERROR rpccli_spoolss_enumprinterdrivers (struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32 level, const char *env, uint32 *num_drivers, PRINTER_DRIVER_CTR *ctr); -WERROR rpccli_spoolss_addprinterex (struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, -uint32 level, PRINTER_INFO_CTR*ctr); WERROR rpccli_spoolss_enumforms(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, POLICY_HND *handle, int level, uint32 *num_forms, FORM_1 **forms); @@ -5807,17 +5805,7 @@ bool sec_io_desc_buf(const char *desc, SEC_DESC_BUF **ppsdb, prs_struct *ps, int bool spoolss_io_system_tim
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1198-ga041d90
The branch, master has been updated via a041d9061922b1a90e5b5047af77934d908afdd5 (commit) from 59e90d3715a577503434ace9e01bfe63dfcfa714 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a041d9061922b1a90e5b5047af77934d908afdd5 Author: Günther Deschner Date: Wed Feb 25 12:09:15 2009 +0100 s3-spoolss: use is_valid_policy_hnd to check for valid policy handles. Guenther --- Summary of changes: source3/rpcclient/cmd_spoolss.c | 40 +++- source3/utils/net_rpc_printer.c | 98 +- 2 files changed, 31 insertions(+), 107 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index ba01f7a..fe2554e 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -469,7 +469,6 @@ static WERROR cmd_spoolss_setprinter(struct rpc_pipe_client *cli, WERROR result; NTSTATUSstatus; uint32 info_level = 2; - boolopened_hnd = False; union spoolss_PrinterInfo info; struct spoolss_SetPrinterInfoCtr info_ctr; const char *printername, *comment = NULL; @@ -500,8 +499,6 @@ static WERROR cmd_spoolss_setprinter(struct rpc_pipe_client *cli, if (!W_ERROR_IS_OK(result)) goto done; - opened_hnd = True; - /* Get printer info */ result = rpccli_spoolss_getprinter(cli, mem_ctx, &pol, @@ -529,7 +526,7 @@ static WERROR cmd_spoolss_setprinter(struct rpc_pipe_client *cli, printf("Success in setting comment.\n"); done: - if (opened_hnd) + if (is_valid_policy_hnd(&pol)) rpccli_spoolss_ClosePrinter(cli, mem_ctx, &pol, NULL); return result; @@ -546,7 +543,6 @@ static WERROR cmd_spoolss_setprintername(struct rpc_pipe_client *cli, WERROR result; NTSTATUSstatus; uint32 info_level = 2; - boolopened_hnd = False; union spoolss_PrinterInfo info; const char *printername, *new_printername = NULL; @@ -578,8 +574,6 @@ static WERROR cmd_spoolss_setprintername(struct rpc_pipe_client *cli, if (!W_ERROR_IS_OK(result)) goto done; - opened_hnd = True; - /* Get printer info */ result = rpccli_spoolss_getprinter(cli, mem_ctx, &pol, @@ -608,7 +602,7 @@ static WERROR cmd_spoolss_setprintername(struct rpc_pipe_client *cli, printf("Success in setting printername.\n"); done: - if (opened_hnd) + if (is_valid_policy_hnd(&pol)) rpccli_spoolss_ClosePrinter(cli, mem_ctx, &pol, NULL); return result; @@ -624,7 +618,6 @@ static WERROR cmd_spoolss_getprinter(struct rpc_pipe_client *cli, POLICY_HND pol; WERROR result; uint32 info_level = 1; - boolopened_hnd = False; const char *printername; union spoolss_PrinterInfo info; @@ -649,8 +642,6 @@ static WERROR cmd_spoolss_getprinter(struct rpc_pipe_client *cli, if (!W_ERROR_IS_OK(result)) goto done; - opened_hnd = True; - /* Get printer info */ result = rpccli_spoolss_getprinter(cli, mem_ctx, @@ -685,7 +676,7 @@ static WERROR cmd_spoolss_getprinter(struct rpc_pipe_client *cli, break; } done: - if (opened_hnd) + if (is_valid_policy_hnd(&pol)) rpccli_spoolss_ClosePrinter(cli, mem_ctx, &pol, NULL); return result; @@ -761,7 +752,6 @@ static WERROR cmd_spoolss_getprinterdata(struct rpc_pipe_client *cli, { POLICY_HND pol; WERROR result; - boolopened_hnd = False; fstring printername; const char *valuename; REGISTRY_VALUE value; @@ -790,8 +780,6 @@ static WERROR cmd_spoolss_getprinterdata(struct rpc_pipe_client *cli, if (!W_ERROR_IS_OK(result)) goto done; - opened_hnd = True; - /* Get printer info */ result = rpccli_spoolss_getprinterdata(cli, mem_ctx, &pol, valuename, &value); @@ -806,7 +794,7 @@ static WERROR cmd_spoolss_getprinterdata(struct rpc_pipe_client *cli, done: - if (opened_hnd) + if (is_valid_policy_hnd(&pol)) rpccli_spoolss_ClosePrinter(cli, mem_ctx, &pol, NULL); return result; @@ -822,7 +810,6 @@ static WERROR cmd_spoolss_getprinterdataex(struct rpc_pipe_client *cli, POLICY_HND pol; WERROR result; NTSTATUSstatus; - boolopened_hnd = False;
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1203-g258ae4c
The branch, master has been updated via 258ae4cec596631b758fb17c170c4494e4db8a8e (commit) via fff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf (commit) via b9cf189404d5ef6b0a2440dc5f9670f0f6d0c131 (commit) via dcb2e7d57718ebd3db75999819ec8ef507f9dd7b (commit) via 10c047c6f4c0f6b9fdebbdf133a3bd72aa8776de (commit) from a041d9061922b1a90e5b5047af77934d908afdd5 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 258ae4cec596631b758fb17c170c4494e4db8a8e Merge: fff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf a041d9061922b1a90e5b5047af77934d908afdd5 Author: Jelmer Vernooij Date: Wed Feb 25 12:49:37 2009 +0100 Merge branch 'master' of ssh://git.samba.org/data/git/samba Conflicts: source4/scripting/python/samba/provision.py commit fff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf Merge: b9cf189404d5ef6b0a2440dc5f9670f0f6d0c131 1a9bb33a7db393aff970619f20490e755f0d282b Author: Jelmer Vernooij Date: Tue Feb 24 01:02:45 2009 +0100 Merge branch 'master' of ssh://git.samba.org/data/git/samba commit b9cf189404d5ef6b0a2440dc5f9670f0f6d0c131 Author: Jelmer Vernooij Date: Tue Feb 24 01:02:26 2009 +0100 expand tabs in python file, consistent with the rest of the file. commit dcb2e7d57718ebd3db75999819ec8ef507f9dd7b Author: Jelmer Vernooij Date: Tue Feb 24 01:00:09 2009 +0100 expand tabs in python file, consistent with the rest of the file. commit 10c047c6f4c0f6b9fdebbdf133a3bd72aa8776de Author: Jelmer Vernooij Date: Tue Feb 24 00:58:29 2009 +0100 Fix finding of setup data. --- Summary of changes: source4/scripting/python/samba/__init__.py|2 +- source4/scripting/python/samba/provision.py |4 ++-- source4/scripting/python/samba/samdb.py | 10 +- source4/scripting/python/samba/tests/__init__.py |4 ++-- source4/scripting/python/samba/tests/provision.py |2 +- 5 files changed, 11 insertions(+), 11 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index e9fc26a..a49e6e1 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -223,7 +223,7 @@ def check_all_substituted(text): :param text: The text to search for substitution variables """ if not "${" in text: - return +return var_start = text.find("${") var_end = text.find("}", var_start) diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index c817bff..0aa84ec 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -52,7 +52,7 @@ def find_setup_dir(): """Find the setup directory used by provision.""" dirname = os.path.dirname(__file__) if "/site-packages/" in dirname: -prefix = dirname[:dirname.index("/site-packages/")] +prefix = "/".join(dirname[:dirname.index("/site-packages/")].split("/")[:-2]) for suffix in ["share/setup", "share/samba/setup", "setup"]: ret = os.path.join(prefix, suffix) if os.path.isdir(ret): @@ -1368,7 +1368,7 @@ def provision_backend(setup_dir=None, message=None, "MMRDN": names.domaindn, "LDAPSERVER" : url, "MMR_PASSWORD": mmr_pass }) - # olc = yes? +# olc = yes? olc_config_pass = "" olc_config_acl = "" olc_syncrepl_config = "" diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py index 9cc55e5..614970d 100644 --- a/source4/scripting/python/samba/samdb.py +++ b/source4/scripting/python/samba/samdb.py @@ -201,11 +201,11 @@ userAccountControl: %u glue.dsdb_attach_schema_from_ldif_file(self, pf, df) def set_invocation_id(self, invocation_id): - """Set the invocation id for this SamDB handle. - - :param invocation_id: GUID of the invocation id. - """ - glue.dsdb_set_ntds_invocation_id(self, invocation_id) +"""Set the invocation id for this SamDB handle. + +:param invocation_id: GUID of the invocation id. +""" +glue.dsdb_set_ntds_invocation_id(self, invocation_id) def setexpiry(self, user, expiry_seconds, noexpiry): """Set the password expiry for a user diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py index d827bfa..b342b93 100644 --- a/source4/scripting/python/samba/tests/__init__.py +++ b/source4/scripting/python/samba/tests/__init__
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1209-g5bab95b
The branch, master has been updated via 5bab95b58366ff001b4967bdb0674f42dc990a77 (commit) via 06b018767b6e6f3ee0221c3aee142cb2b4836fc9 (commit) via 423c1d88fcd0f128bceaf8b0c371281aa4a41003 (commit) via be4913fbe6f6bb2fefbeeb1559692e04a15758f9 (commit) via 00ad0c4a4317db810bf2197503006ae5a6bb8bce (commit) via d1c7bbd893c27ebff28571b4ea611bd3e35148c1 (commit) from 258ae4cec596631b758fb17c170c4494e4db8a8e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 5bab95b58366ff001b4967bdb0674f42dc990a77 Author: Volker Lendecke Date: Wed Feb 25 13:03:03 2009 +0100 Fix a missing prototype commit 06b018767b6e6f3ee0221c3aee142cb2b4836fc9 Author: Volker Lendecke Date: Wed Feb 25 12:55:47 2009 +0100 Fix an incompatible pointer passed to winbind_get_groups This is the same bug that was fixed in other places of the code a few times already: A C compiler ONLY does automatic type conversions during an assignment. Passing down a pointer to type A to a function taking type B as an argument does NOT do any automatic type conversions. If required, I can dig up the relevant portions of the C standard. commit 423c1d88fcd0f128bceaf8b0c371281aa4a41003 Author: Volker Lendecke Date: Wed Feb 25 12:45:39 2009 +0100 Remove async_req based async_send commit be4913fbe6f6bb2fefbeeb1559692e04a15758f9 Author: Volker Lendecke Date: Wed Feb 25 12:44:26 2009 +0100 Convert rpc_sock_write to use tevent_req base async_send commit 00ad0c4a4317db810bf2197503006ae5a6bb8bce Author: Volker Lendecke Date: Wed Feb 25 12:38:32 2009 +0100 Remove async_req based async_recv commit d1c7bbd893c27ebff28571b4ea611bd3e35148c1 Author: Volker Lendecke Date: Wed Feb 25 12:35:48 2009 +0100 Convert rpc_sock_read to use tevent_req base async_read --- Summary of changes: lib/async_req/async_sock.c | 300 --- lib/async_req/async_sock.h | 11 -- source3/include/proto.h |4 + source3/passdb/pdb_wbc_sam.c|4 +- source3/rpc_client/rpc_transport_sock.c | 110 ++-- 5 files changed, 100 insertions(+), 329 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c index 3563421..40e7bca 100644 --- a/lib/async_req/async_sock.c +++ b/lib/async_req/async_sock.c @@ -30,45 +30,6 @@ #endif /** - * Discriminator for async_syscall_state - */ -enum async_syscall_type { - ASYNC_SYSCALL_SEND, - ASYNC_SYSCALL_RECV, -}; - -/** - * Holder for syscall arguments and the result - */ - -struct async_syscall_state { - enum async_syscall_type syscall_type; - struct tevent_fd *fde; - - union { - struct param_send { - int fd; - const void *buffer; - size_t length; - int flags; - } param_send; - struct param_recv { - int fd; - void *buffer; - size_t length; - int flags; - } param_recv; - } param; - - union { - ssize_t result_ssize_t; - size_t result_size_t; - int result_int; - } result; - int sys_errno; -}; - -/** * @brief Map async_req states to unix-style errnos * @param[in] req The async req to get the state from * @param[out] err Pointer to take the unix-style errno @@ -117,267 +78,6 @@ int async_req_simple_recv_errno(struct async_req *req) return 0; } -/** - * @brief Create a new async syscall req - * @param[in] mem_ctx The memory context to hang the result off - * @param[in] ev The event context to work from - * @param[in] type Which syscall will this be - * @param[in] pstate Where to put the newly created private_data state - * @retval The new request - * - * This is a helper function to prepare a new struct async_req with an - * associated struct async_syscall_state. The async_syscall_state will be put - * into the async_req as private_data. - */ - -static struct async_req *async_syscall_new(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - enum async_syscall_type type, - struct async_syscall_state **pstate) -{ - struct async_req *result; - struct async_syscall_state *state; - - if (!async_req_setup(mem_ctx, &result, &state, -struct async_syscall_state)) { - return NULL; - } - state->syscall_type = type; - - result->private_data = state; - - *pstate = sta
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1210-g13ac0dc
The branch, master has been updated via 13ac0dc4565b1cbdb977b6959562f3f8f9ac5ff8 (commit) from 5bab95b58366ff001b4967bdb0674f42dc990a77 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 13ac0dc4565b1cbdb977b6959562f3f8f9ac5ff8 Author: Stefan Metzmacher Date: Wed Feb 25 13:53:19 2009 +0100 tevent: add tevent_req_poll() function metze --- Summary of changes: lib/tevent/tevent.h |3 +++ lib/tevent/tevent_req.c | 15 +++ 2 files changed, 18 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h index b3d1c6d..b361122 100644 --- a/lib/tevent/tevent.h +++ b/lib/tevent/tevent.h @@ -296,6 +296,9 @@ struct tevent_req *tevent_req_post(struct tevent_req *req, bool tevent_req_is_in_progress(struct tevent_req *req); +bool tevent_req_poll(struct tevent_req *req, +struct tevent_context *ev); + bool tevent_req_is_error(struct tevent_req *req, enum tevent_req_state *state, uint64_t *error); diff --git a/lib/tevent/tevent_req.c b/lib/tevent/tevent_req.c index 800e385..c17587b 100644 --- a/lib/tevent/tevent_req.c +++ b/lib/tevent/tevent_req.c @@ -235,6 +235,21 @@ bool tevent_req_is_in_progress(struct tevent_req *req) return false; } +bool tevent_req_poll(struct tevent_req *req, +struct tevent_context *ev) +{ + while (tevent_req_is_in_progress(req)) { + int ret; + + ret = tevent_loop_once(ev); + if (ret != 0) { + return false; + } + } + + return true; +} + bool tevent_req_is_error(struct tevent_req *req, enum tevent_req_state *state, uint64_t *error) { -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1211-g2390ea2
The branch, master has been updated via 2390ea274bff7a8878a488db0893a393c9d1b51e (commit) from 13ac0dc4565b1cbdb977b6959562f3f8f9ac5ff8 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2390ea274bff7a8878a488db0893a393c9d1b51e Author: Günther Deschner Date: Wed Feb 25 13:19:12 2009 +0100 s3-rpcclient: more uses of is_valid_policy_hnd in spoolss and samr commands. Guenther --- Summary of changes: source3/rpcclient/cmd_samr.c| 32 +++- source3/rpcclient/cmd_spoolss.c | 25 + 2 files changed, 12 insertions(+), 45 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c index 31977e9..936c208 100644 --- a/source3/rpcclient/cmd_samr.c +++ b/source3/rpcclient/cmd_samr.c @@ -789,7 +789,6 @@ static NTSTATUS cmd_samr_enum_dom_users(struct rpc_pipe_client *cli, struct samr_SamArray *dom_users = NULL; uint32 access_mask = MAXIMUM_ALLOWED_ACCESS; uint32 acb_mask = ACB_NORMAL; - bool got_connect_pol = False, got_domain_pol = False; if ((argc < 1) || (argc > 3)) { printf("Usage: %s [access_mask] [acb_mask]\n", argv[0]); @@ -811,8 +810,6 @@ static NTSTATUS cmd_samr_enum_dom_users(struct rpc_pipe_client *cli, if (!NT_STATUS_IS_OK(result)) goto done; - got_connect_pol = True; - /* Get domain policy handle */ result = rpccli_samr_OpenDomain(cli, mem_ctx, @@ -824,8 +821,6 @@ static NTSTATUS cmd_samr_enum_dom_users(struct rpc_pipe_client *cli, if (!NT_STATUS_IS_OK(result)) goto done; - got_domain_pol = True; - /* Enumerate domain users */ start_idx = 0; @@ -852,10 +847,10 @@ static NTSTATUS cmd_samr_enum_dom_users(struct rpc_pipe_client *cli, } while (NT_STATUS_V(result) == NT_STATUS_V(STATUS_MORE_ENTRIES)); done: - if (got_domain_pol) + if (is_valid_policy_hnd(&domain_pol)) rpccli_samr_Close(cli, mem_ctx, &domain_pol); - if (got_connect_pol) + if (is_valid_policy_hnd(&connect_pol)) rpccli_samr_Close(cli, mem_ctx, &connect_pol); return result; @@ -872,7 +867,6 @@ static NTSTATUS cmd_samr_enum_dom_groups(struct rpc_pipe_client *cli, uint32 start_idx, size, num_dom_groups, i; uint32 access_mask = MAXIMUM_ALLOWED_ACCESS; struct samr_SamArray *dom_groups = NULL; - bool got_connect_pol = False, got_domain_pol = False; if ((argc < 1) || (argc > 2)) { printf("Usage: %s [access_mask]\n", argv[0]); @@ -891,8 +885,6 @@ static NTSTATUS cmd_samr_enum_dom_groups(struct rpc_pipe_client *cli, if (!NT_STATUS_IS_OK(result)) goto done; - got_connect_pol = True; - /* Get domain policy handle */ result = rpccli_samr_OpenDomain(cli, mem_ctx, @@ -904,8 +896,6 @@ static NTSTATUS cmd_samr_enum_dom_groups(struct rpc_pipe_client *cli, if (!NT_STATUS_IS_OK(result)) goto done; - got_domain_pol = True; - /* Enumerate domain groups */ start_idx = 0; @@ -930,10 +920,10 @@ static NTSTATUS cmd_samr_enum_dom_groups(struct rpc_pipe_client *cli, } while (NT_STATUS_V(result) == NT_STATUS_V(STATUS_MORE_ENTRIES)); done: - if (got_domain_pol) + if (is_valid_policy_hnd(&domain_pol)) rpccli_samr_Close(cli, mem_ctx, &domain_pol); - if (got_connect_pol) + if (is_valid_policy_hnd(&connect_pol)) rpccli_samr_Close(cli, mem_ctx, &connect_pol); return result; @@ -950,7 +940,6 @@ static NTSTATUS cmd_samr_enum_als_groups(struct rpc_pipe_client *cli, uint32 start_idx, size, num_als_groups, i; uint32 access_mask = MAXIMUM_ALLOWED_ACCESS; struct samr_SamArray *als_groups = NULL; - bool got_connect_pol = False, got_domain_pol = False; if ((argc < 2) || (argc > 3)) { printf("Usage: %s builtin|domain [access mask]\n", argv[0]); @@ -969,8 +958,6 @@ static NTSTATUS cmd_samr_enum_als_groups(struct rpc_pipe_client *cli, if (!NT_STATUS_IS_OK(result)) goto done; - got_connect_pol = True; - /* Get domain policy handle */ result = get_domain_handle(cli, mem_ctx, argv[1], @@ -982,8 +969,6 @@ static NTSTATUS cmd_samr_enum_als_groups(struct rpc_pipe_client *cli, if (!NT_STATUS_IS_OK(result)) goto done; - got_domain_pol = True; - /* Enumerate alias groups */ start_idx = 0; @@ -1008,10 +993,10 @@ static NTSTATUS cmd_samr_enum_als_groups(struct rpc_pipe_client *cli, } while (NT_STATUS_V(result) == NT_STATUS_V(STATUS_MORE_ENTRIES)); do
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1214-g01d1aaf
The branch, master has been updated via 01d1aaf63e8170936139a01814211f6567c4b125 (commit) via 80a9a41d412aa61877a7497661197fd16ddb4903 (commit) via c46fad3d1bdf1082a695d3df90e55e739e494a5c (commit) from 2390ea274bff7a8878a488db0893a393c9d1b51e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 01d1aaf63e8170936139a01814211f6567c4b125 Author: Günther Deschner Date: Wed Feb 25 13:46:08 2009 +0100 s3-rpcclient: allow to set level in spoolss getform query and display all levels. Guenther commit 80a9a41d412aa61877a7497661197fd16ddb4903 Author: Günther Deschner Date: Wed Feb 25 14:20:40 2009 +0100 s3: re-run make samba3-idl. Guenther commit c46fad3d1bdf1082a695d3df90e55e739e494a5c Author: Günther Deschner Date: Wed Feb 25 13:45:15 2009 +0100 spoolss: add spoolss_FormInfo2 used by Vista. Guenther --- Summary of changes: librpc/gen_ndr/ndr_spoolss.c| 293 +++ librpc/gen_ndr/ndr_spoolss.h|2 + librpc/gen_ndr/spoolss.h| 19 +++ librpc/idl/spoolss.idl | 20 +++ source3/rpcclient/cmd_spoolss.c | 47 ++- 5 files changed, 375 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c index fdafa25..25c9dc4 100644 --- a/librpc/gen_ndr/ndr_spoolss.c +++ b/librpc/gen_ndr/ndr_spoolss.c @@ -12232,6 +12232,275 @@ _PUBLIC_ void ndr_print_spoolss_FormInfo1(struct ndr_print *ndr, const char *nam ndr->depth--; } +static enum ndr_err_code ndr_push_spoolss_FormStringType(struct ndr_push *ndr, int ndr_flags, uint32_t r) +{ + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r)); + return NDR_ERR_SUCCESS; +} + +static enum ndr_err_code ndr_pull_spoolss_FormStringType(struct ndr_pull *ndr, int ndr_flags, uint32_t *r) +{ + uint32_t v; + NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v)); + *r = v; + return NDR_ERR_SUCCESS; +} + +_PUBLIC_ void ndr_print_spoolss_FormStringType(struct ndr_print *ndr, const char *name, uint32_t r) +{ + ndr_print_uint32(ndr, name, r); + ndr->depth++; + ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SPOOLSS_FORM_STRING_TYPE_NONE", SPOOLSS_FORM_STRING_TYPE_NONE, r); + ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SPOOLSS_FORM_STRING_TYPE_MUI_DLL", SPOOLSS_FORM_STRING_TYPE_MUI_DLL, r); + ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SPOOLSS_FORM_STRING_TYPE_LANG_PAIR", SPOOLSS_FORM_STRING_TYPE_LANG_PAIR, r); + ndr->depth--; +} + +static enum ndr_err_code ndr_push_spoolss_FormInfo2(struct ndr_push *ndr, int ndr_flags, const struct spoolss_FormInfo2 *r) +{ + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_push_align(ndr, 4)); + NDR_CHECK(ndr_push_spoolss_FormFlags(ndr, NDR_SCALARS, r->flags)); + { + uint32_t _flags_save_string = ndr->flags; + ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); + NDR_CHECK(ndr_push_relative_ptr1(ndr, r->form_name)); + ndr->flags = _flags_save_string; + } + NDR_CHECK(ndr_push_spoolss_FormSize(ndr, NDR_SCALARS, &r->size)); + NDR_CHECK(ndr_push_spoolss_FormArea(ndr, NDR_SCALARS, &r->area)); + { + uint32_t _flags_save_string = ndr->flags; + ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); + NDR_CHECK(ndr_push_relative_ptr1(ndr, r->keyword)); + ndr->flags = _flags_save_string; + } + NDR_CHECK(ndr_push_spoolss_FormStringType(ndr, NDR_SCALARS, r->string_type)); + { + uint32_t _flags_save_string = ndr->flags; + ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); + NDR_CHECK(ndr_push_relative_ptr1(ndr, r->mui_dll)); + ndr->flags = _flags_save_string; + } + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->ressource_id)); + { + uint32_t _flags_save_string = ndr->flags; + ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); + NDR_CHECK(ndr_push_relative_ptr1(ndr, r->display_name)); + ndr->flags = _flags_save_string; + } + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->lang_id)); + } + if (ndr_flags & NDR_BUFFERS) { + { + uint32_t _flags_save_string = ndr->flags; + ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); + if (r->form_name) { +
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1215-ge2f37ec
The branch, master has been updated via e2f37ec106fb51ec894e0d6160949545e80dfe69 (commit) from 01d1aaf63e8170936139a01814211f6567c4b125 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e2f37ec106fb51ec894e0d6160949545e80dfe69 Author: Stefan Metzmacher Date: Wed Feb 25 14:29:31 2009 +0100 tevent: add private_print function feature to tevent_req metze --- Summary of changes: lib/tevent/tevent.h | 11 +++ lib/tevent/tevent_req.c | 27 --- 2 files changed, 35 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h index b361122..185a8fa 100644 --- a/lib/tevent/tevent.h +++ b/lib/tevent/tevent.h @@ -212,6 +212,15 @@ struct tevent_req { void *private_state; /** +* @brief A function to overwrite the default print function +* +* The implementation doing the work may want to imeplement a +* custom function to print the text representation of the async +* request. +*/ + char *(*private_print)(struct tevent_req *req, TALLOC_CTX *mem_ctx); + + /** * @brief Internal state of the request * * Callers should only access this via functions and never directly. @@ -267,6 +276,8 @@ struct tevent_req { } internal; }; +char *tevent_req_default_print(struct tevent_req *req, TALLOC_CTX *mem_ctx); + char *tevent_req_print(TALLOC_CTX *mem_ctx, struct tevent_req *req); struct tevent_req *_tevent_req_create(TALLOC_CTX *mem_ctx, diff --git a/lib/tevent/tevent_req.c b/lib/tevent/tevent_req.c index c17587b..e243c7d 100644 --- a/lib/tevent/tevent_req.c +++ b/lib/tevent/tevent_req.c @@ -28,14 +28,17 @@ #include "tevent_util.h" /** - * @brief Print an tevent_req structure in debug messages - * @param[in] mem_ctx The memory context for the result + * @brief The default print function for creating debug messages * @param[in] req The request to be printed + * @param[in] mem_ctx The memory context for the result * @retval Text representation of req * + * The function should not be used by users of the asynx API, + * but custom print function can use it and append custom text + * to the string. */ -char *tevent_req_print(TALLOC_CTX *mem_ctx, struct tevent_req *req) +char *tevent_req_default_print(struct tevent_req *req, TALLOC_CTX *mem_ctx) { return talloc_asprintf(mem_ctx, "tevent_req[%p/%s]: state[%d] error[%lld (0x%llX)] " @@ -51,6 +54,24 @@ char *tevent_req_print(TALLOC_CTX *mem_ctx, struct tevent_req *req) } /** + * @brief Print an tevent_req structure in debug messages + * @param[in] mem_ctx The memory context for the result + * @param[in] req The request to be printed + * @retval Text representation of req + * + * This function should be used by callers of the async API + */ + +char *tevent_req_print(TALLOC_CTX *mem_ctx, struct tevent_req *req) +{ + if (!req->private_print) { + return tevent_req_default_print(req, mem_ctx); + } + + return req->private_print(req, mem_ctx); +} + +/** * @brief Create an async request * @param[in] mem_ctx The memory context for the result * @param[in] ev The event context this async request will be driven by -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1217-g2bd8cac
The branch, master has been updated via 2bd8cacf0e5ed6965f5791c4a86320d4978d9b15 (commit) via 543db0f94aa4cdeb6499f62aee8791cda7a670d7 (commit) from e2f37ec106fb51ec894e0d6160949545e80dfe69 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2bd8cacf0e5ed6965f5791c4a86320d4978d9b15 Author: Stefan Metzmacher Date: Wed Feb 25 15:05:24 2009 +0100 s4:lib/events: map TEVENT_DEBUG_TRACE to debug level 10 metze commit 543db0f94aa4cdeb6499f62aee8791cda7a670d7 Author: Stefan Metzmacher Date: Wed Feb 25 15:04:55 2009 +0100 s3:events: map TEVENT_DEBUG_TRACE to debug level 10 metze --- Summary of changes: source3/lib/events.c |2 +- source4/lib/events/tevent_s4.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/events.c b/source3/lib/events.c index 44b4562..9e81a47 100644 --- a/source3/lib/events.c +++ b/source3/lib/events.c @@ -282,7 +282,7 @@ static void s3_event_debug(void *context, enum tevent_debug_level level, samba_level = 2; break; case TEVENT_DEBUG_TRACE: - samba_level = 5; + samba_level = 10; break; }; diff --git a/source4/lib/events/tevent_s4.c b/source4/lib/events/tevent_s4.c index a05ac07..89ca7bb 100644 --- a/source4/lib/events/tevent_s4.c +++ b/source4/lib/events/tevent_s4.c @@ -41,7 +41,7 @@ static void ev_wrap_debug(void *context, enum tevent_debug_level level, samba_level = 2; break; case TEVENT_DEBUG_TRACE: - samba_level = 5; + samba_level = 10; break; }; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1218-gb6457c7
The branch, master has been updated via b6457c78d61992f12903ed0966d9d1608de68da8 (commit) from 2bd8cacf0e5ed6965f5791c4a86320d4978d9b15 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b6457c78d61992f12903ed0966d9d1608de68da8 Author: Günther Deschner Date: Wed Feb 25 14:27:30 2009 +0100 s3-spoolss: remove unused decode_printer_info_7. Guenther --- Summary of changes: source3/rpc_client/cli_spoolss.c | 32 1 files changed, 0 insertions(+), 32 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c index c9d23ef..4c1d57e 100644 --- a/source3/rpc_client/cli_spoolss.c +++ b/source3/rpc_client/cli_spoolss.c @@ -362,38 +362,6 @@ static bool decode_printer_info_3(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, /** **/ -static bool decode_printer_info_7(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer, - uint32 returned, PRINTER_INFO_7 **info) -{ - uint32 i; - PRINTER_INFO_7 *inf; - - if (returned) { - inf=TALLOC_ARRAY(mem_ctx, PRINTER_INFO_7, returned); - if (!inf) { - return False; - } - memset(inf, 0, returned*sizeof(PRINTER_INFO_7)); - } else { - inf = NULL; - } - - prs_set_offset(&buffer->prs,0); - - for (i=0; i
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1222-g59cc0c0
The branch, master has been updated via 59cc0c09d5413d1264758bef505856f5f56131e4 (commit) via 838b950138255beb7135a32d4429a74fec2bfe42 (commit) via f71db89256b65c3700eadaf44b2727623eb831fa (commit) via fc3ffedcfe173900d65f6fa7db3a3cf2608f9f68 (commit) from b6457c78d61992f12903ed0966d9d1608de68da8 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 59cc0c09d5413d1264758bef505856f5f56131e4 Merge: 838b950138255beb7135a32d4429a74fec2bfe42 b6457c78d61992f12903ed0966d9d1608de68da8 Author: Jelmer Vernooij Date: Wed Feb 25 15:22:31 2009 +0100 Merge branch 'master' of ssh://git.samba.org/data/git/samba commit 838b950138255beb7135a32d4429a74fec2bfe42 Author: Jelmer Vernooij Date: Wed Feb 25 15:22:08 2009 +0100 Rerun pidl. commit f71db89256b65c3700eadaf44b2727623eb831fa Author: Jelmer Vernooij Date: Wed Feb 25 15:21:36 2009 +0100 Include header with NTSTATUS, as some IDL files use it. commit fc3ffedcfe173900d65f6fa7db3a3cf2608f9f68 Author: Jelmer Vernooij Date: Wed Feb 25 15:05:43 2009 +0100 Don't define _GNU_SOURCE if it's already defined on the command-line. --- Summary of changes: librpc/gen_ndr/dfs.h |2 ++ librpc/gen_ndr/drsblobs.h|2 ++ librpc/gen_ndr/drsuapi.h |2 ++ librpc/gen_ndr/dssetup.h |2 ++ librpc/gen_ndr/echo.h|2 ++ librpc/gen_ndr/epmapper.h|2 ++ librpc/gen_ndr/eventlog.h|2 ++ librpc/gen_ndr/initshutdown.h|2 ++ librpc/gen_ndr/krb5pac.h |2 ++ librpc/gen_ndr/lsa.h |2 ++ librpc/gen_ndr/misc.h|2 ++ librpc/gen_ndr/named_pipe_auth.h |2 ++ librpc/gen_ndr/nbt.h |2 ++ librpc/gen_ndr/netlogon.h|2 ++ librpc/gen_ndr/ntsvcs.h |2 ++ librpc/gen_ndr/samr.h|2 ++ librpc/gen_ndr/security.h|2 ++ librpc/gen_ndr/spoolss.h |2 ++ librpc/gen_ndr/srvsvc.h |2 ++ librpc/gen_ndr/svcctl.h |2 ++ librpc/gen_ndr/winreg.h |2 ++ librpc/gen_ndr/wkssvc.h |2 ++ librpc/gen_ndr/xattr.h |2 ++ pidl/lib/Parse/Pidl/Samba4/Header.pm |3 +++ pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |2 ++ 25 files changed, 51 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/librpc/gen_ndr/dfs.h b/librpc/gen_ndr/dfs.h index 07548c3..41be3bd 100644 --- a/librpc/gen_ndr/dfs.h +++ b/librpc/gen_ndr/dfs.h @@ -2,6 +2,8 @@ #include +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/misc.h" #ifndef _HEADER_netdfs #define _HEADER_netdfs diff --git a/librpc/gen_ndr/drsblobs.h b/librpc/gen_ndr/drsblobs.h index bb33464..190e012 100644 --- a/librpc/gen_ndr/drsblobs.h +++ b/librpc/gen_ndr/drsblobs.h @@ -2,6 +2,8 @@ #include +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/drsuapi.h" #include "librpc/gen_ndr/misc.h" #include "librpc/gen_ndr/samr.h" diff --git a/librpc/gen_ndr/drsuapi.h b/librpc/gen_ndr/drsuapi.h index e3d4803..8f9b165 100644 --- a/librpc/gen_ndr/drsuapi.h +++ b/librpc/gen_ndr/drsuapi.h @@ -2,6 +2,8 @@ #include +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/security.h" #include "librpc/gen_ndr/misc.h" #include "librpc/gen_ndr/samr.h" diff --git a/librpc/gen_ndr/dssetup.h b/librpc/gen_ndr/dssetup.h index d284a63..5d254fe 100644 --- a/librpc/gen_ndr/dssetup.h +++ b/librpc/gen_ndr/dssetup.h @@ -2,6 +2,8 @@ #include +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/misc.h" #ifndef _HEADER_dssetup #define _HEADER_dssetup diff --git a/librpc/gen_ndr/echo.h b/librpc/gen_ndr/echo.h index 79d4220..9c78304 100644 --- a/librpc/gen_ndr/echo.h +++ b/librpc/gen_ndr/echo.h @@ -2,6 +2,8 @@ #include +#include "libcli/util/ntstatus.h" + #ifndef _HEADER_rpcecho #define _HEADER_rpcecho diff --git a/librpc/gen_ndr/epmapper.h b/librpc/gen_ndr/epmapper.h index e5155a8..ff80fbb 100644 --- a/librpc/gen_ndr/epmapper.h +++ b/librpc/gen_ndr/epmapper.h @@ -2,6 +2,8 @@ #include +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/misc.h" #ifndef _HEADER_epmapper #define _HEADER_epmapper diff --git a/librpc/gen_ndr/eventlog.h b/librpc/gen_ndr/eventlog.h index 2a9b824..b6e792f 100644 --- a/librpc/gen_ndr/eventlog.h +++ b/librpc/gen_ndr/eventlog.h @@ -2,6 +2,8 @@ #include +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/lsa.h" #include "librpc/gen_ndr/security.h" #ifndef _HEADER_eventlog diff --git a/librpc/gen_ndr/initshutdown.h b/librpc/gen_ndr/initshutdown.h index 014e2fe..913eb8f 100644 --
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1223-gfd3f3e6
The branch, master has been updated via fd3f3e68f2e6be0196473f641f8edb41e40ca761 (commit) from 59cc0c09d5413d1264758bef505856f5f56131e4 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit fd3f3e68f2e6be0196473f641f8edb41e40ca761 Author: Simo Sorce Date: Wed Feb 25 10:02:41 2009 -0500 Use stdbool.h instead of manually defining bool --- Summary of changes: source4/lib/ldb/include/ldb.h | 11 +-- 1 files changed, 1 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h index eb8e0ed..be41151 100644 --- a/source4/lib/ldb/include/ldb.h +++ b/source4/lib/ldb/include/ldb.h @@ -46,16 +46,7 @@ #define _LDB_H_ 1 /*! \endcond */ -#ifndef bool -typedef int bool; -#endif -#ifndef true -#define true 1 -#endif -#ifndef false -#define false 0 -#endif - +#include #include "talloc.h" #include "tevent.h" #include "ldb_errors.h" -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1224-gd7c7b31
The branch, master has been updated via d7c7b31bbaf110446ea835b66845ab6f0ee09231 (commit) from fd3f3e68f2e6be0196473f641f8edb41e40ca761 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d7c7b31bbaf110446ea835b66845ab6f0ee09231 Author: Jelmer Vernooij Date: Wed Feb 25 16:54:35 2009 +0100 Only define _GNU_SOURCE if it's not defined yet. --- Summary of changes: pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm index f8209be..f2a96a3 100644 --- a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm +++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm @@ -131,7 +131,9 @@ sub Parse() if (is_intree()) { $res .= "#include \"includes.h\"\n"; } else { + $res .= "#ifndef _GNU_SOURCE\n"; $res .= "#define _GNU_SOURCE\n"; + $res .= "#endif\n"; $res .= "#include \n"; $res .= "#include \n"; $res .= "#include \n"; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5019-g7fea973
The branch, v3-3-test has been updated via 7fea973c6a204f422d92c2abf1d40d3558808696 (commit) from 1cca10ca4c503308f69290358fcc6b653ce09377 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 7fea973c6a204f422d92c2abf1d40d3558808696 Author: Volker Lendecke Date: Thu Oct 2 03:37:52 2008 +0200 Fix bug 6124: Attempt to fix the build on IRIX Under irix, "sa_family" is a #define to sa_union.sa_generic.sa_family2 --- Summary of changes: source/librpc/gen_ndr/nbt.h |2 +- source/librpc/gen_ndr/ndr_nbt.c |6 +++--- source/librpc/idl/nbt.idl |2 +- source/libsmb/dsgetdcname.c |2 +- 4 files changed, 6 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source/librpc/gen_ndr/nbt.h b/source/librpc/gen_ndr/nbt.h index 264b00b..4b872d7 100644 --- a/source/librpc/gen_ndr/nbt.h +++ b/source/librpc/gen_ndr/nbt.h @@ -391,7 +391,7 @@ struct nbt_dgram_packet { }/* [public,flag(LIBNDR_FLAG_NOALIGN|LIBNDR_FLAG_BIGENDIAN|LIBNDR_PRINT_ARRAY_HEX)] */; struct nbt_sockaddr { - uint32_t sa_family; + uint32_t sockaddr_family; const char * pdc_ip;/* [flag(LIBNDR_FLAG_BIGENDIAN)] */ DATA_BLOB remaining;/* [flag(LIBNDR_FLAG_REMAINING)] */ }/* [gensize,public] */; diff --git a/source/librpc/gen_ndr/ndr_nbt.c b/source/librpc/gen_ndr/ndr_nbt.c index 84cfabd..c02b539 100644 --- a/source/librpc/gen_ndr/ndr_nbt.c +++ b/source/librpc/gen_ndr/ndr_nbt.c @@ -1531,7 +1531,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_nbt_sockaddr(struct ndr_push *ndr, int ndr_f { if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_push_align(ndr, 4)); - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->sa_family)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->sockaddr_family)); { uint32_t _flags_save_ipv4address = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_BIGENDIAN); @@ -1554,7 +1554,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_nbt_sockaddr(struct ndr_pull *ndr, int ndr_f { if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 4)); - NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->sa_family)); + NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->sockaddr_family)); { uint32_t _flags_save_ipv4address = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_BIGENDIAN); @@ -1577,7 +1577,7 @@ _PUBLIC_ void ndr_print_nbt_sockaddr(struct ndr_print *ndr, const char *name, co { ndr_print_struct(ndr, name, "nbt_sockaddr"); ndr->depth++; - ndr_print_uint32(ndr, "sa_family", r->sa_family); + ndr_print_uint32(ndr, "sockaddr_family", r->sockaddr_family); ndr_print_ipv4address(ndr, "pdc_ip", r->pdc_ip); ndr_print_DATA_BLOB(ndr, "remaining", r->remaining); ndr->depth--; diff --git a/source/librpc/idl/nbt.idl b/source/librpc/idl/nbt.idl index bd55b11..2ce8fa0 100644 --- a/source/librpc/idl/nbt.idl +++ b/source/librpc/idl/nbt.idl @@ -339,7 +339,7 @@ interface nbt */ typedef [public,gensize] struct { - uint32 sa_family; + uint32 sockaddr_family; [flag(NDR_BIG_ENDIAN)] ipv4address pdc_ip; [flag(NDR_REMAINING)] DATA_BLOB remaining; } nbt_sockaddr; diff --git a/source/libsmb/dsgetdcname.c b/source/libsmb/dsgetdcname.c index 19c8360..a33f684 100644 --- a/source/libsmb/dsgetdcname.c +++ b/source/libsmb/dsgetdcname.c @@ -200,7 +200,7 @@ static NTSTATUS store_cldap_reply(TALLOC_CTX *mem_ctx, /* FIXME */ r->sockaddr_size = 0x10; /* the w32 winsock addr size */ - r->sockaddr.sa_family = 2; /* AF_INET */ + r->sockaddr.sockaddr_family = 2; /* AF_INET */ r->sockaddr.pdc_ip = talloc_strdup(mem_ctx, addr); ndr_err = ndr_push_struct_blob(&blob, mem_ctx, r, -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5020-g8858ed2
The branch, v3-3-test has been updated via 8858ed261917ce6c80562f05f5407109d66bd6a8 (commit) from 7fea973c6a204f422d92c2abf1d40d3558808696 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 8858ed261917ce6c80562f05f5407109d66bd6a8 Author: Jeremy Allison Date: Wed Feb 25 10:00:01 2009 -0800 Fix some NetBSD warnings. Jeremy. --- Summary of changes: source/printing/nt_printing.c |6 -- source/smbd/reply.c |2 +- 2 files changed, 5 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c index 0d91836..ced2124 100644 --- a/source/printing/nt_printing.c +++ b/source/printing/nt_printing.c @@ -1373,7 +1373,8 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, fstr goto error_exit; } old_create_time = st.st_mtime; - DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", old_create_time)); + DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", + (long)old_create_time)); } } close_file(fsp, NORMAL_CLOSE); @@ -1414,7 +1415,8 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, fstr goto error_exit; } new_create_time = st.st_mtime; - DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", new_create_time)); + DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", + (long)new_create_time)); } } close_file(fsp, NORMAL_CLOSE); diff --git a/source/smbd/reply.c b/source/smbd/reply.c index 8e757da..3eec795 100644 --- a/source/smbd/reply.c +++ b/source/smbd/reply.c @@ -2779,9 +2779,9 @@ void send_file_readbraw(connection_struct *conn, return; } -#endif normal_readbraw: +#endif outbuf = TALLOC_ARRAY(NULL, char, nread+4); if (!outbuf) { -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1225-g15f108f
The branch, master has been updated via 15f108f0917eedab89199e9fbf93ed802eed7f89 (commit) from d7c7b31bbaf110446ea835b66845ab6f0ee09231 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 15f108f0917eedab89199e9fbf93ed802eed7f89 Author: Jeremy Allison Date: Wed Feb 25 09:59:53 2009 -0800 Fix some NetBSD warnings. Jeremy. --- Summary of changes: source3/printing/nt_printing.c |6 -- source3/smbd/reply.c |2 +- 2 files changed, 5 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index bbe8ebc..b254ce0 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -1381,7 +1381,8 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, fstr goto error_exit; } old_create_time = st.st_mtime; - DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", old_create_time)); + DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", + (long)old_create_time)); } } close_file(NULL, fsp, NORMAL_CLOSE); @@ -1432,7 +1433,8 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, fstr goto error_exit; } new_create_time = st.st_mtime; - DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", new_create_time)); + DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", + (long)new_create_time)); } } close_file(NULL, fsp, NORMAL_CLOSE); diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index b30ef23..80ed019 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -2808,9 +2808,9 @@ static void send_file_readbraw(connection_struct *conn, } return; } -#endif normal_readbraw: +#endif outbuf = TALLOC_ARRAY(NULL, char, nread+4); if (!outbuf) { -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1226-gf90250b
The branch, master has been updated via f90250b54923588d756a02e76876fc66a6c68074 (commit) from 15f108f0917eedab89199e9fbf93ed802eed7f89 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f90250b54923588d756a02e76876fc66a6c68074 Author: Tim Prouty Date: Wed Feb 25 11:27:37 2009 -0800 s4: make libintl a build dependency of heimdal_krb5 so all dependent binaries are linked properly --- Summary of changes: source4/heimdal_build/internal.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk index 9e32898..77dbf0f 100644 --- a/source4/heimdal_build/internal.mk +++ b/source4/heimdal_build/internal.mk @@ -255,7 +255,7 @@ HEIMDAL_GSSAPI_OBJ_FILES = \ CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND \ HEIMDAL_KRB5_ASN1 HEIMDAL_HX509 HEIMDAL_HCRYPTO \ - LIBNETIF LIBSAMBA-HOSTCONFIG + LIBNETIF LIBSAMBA-HOSTCONFIG INTL PUBLIC_DEPENDENCIES = HEIMDAL_COM_ERR # End SUBSYSTEM HEIMDAL_KRB5 ### -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1236-gd86cb9b
The branch, master has been updated via d86cb9b52d8cdaa03f856665f56278836e6336d3 (commit) via 03efdcb7cb55f61d2b8cf419b25ed6d1eac1d3af (commit) via 820a1c1a17f3848fafd796a54e0b2eeb886aef2e (commit) via 6cd30a351a13822a557f20de3abe04bd8b2e3112 (commit) via 666cc916ebea618fbf7bfed99dbfff38326189fa (commit) via a045dd063d24d004f66c3b11ca11ebf665639971 (commit) via 06d2604d9d1f77dddc1408233da48f0958bb24d0 (commit) via b239a4ee76ec424f09a74ae65bbddeba71026141 (commit) via 92f05e3c96a412d50cf8733d393464acb1d702fd (commit) via 74232e323762abc8fbdc2a6a28c6e77b0020c304 (commit) from f90250b54923588d756a02e76876fc66a6c68074 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d86cb9b52d8cdaa03f856665f56278836e6336d3 Author: Günther Deschner Date: Wed Feb 25 20:50:34 2009 +0100 s3-rpcclient: support level 2 in spoolss_addform. Guenther commit 03efdcb7cb55f61d2b8cf419b25ed6d1eac1d3af Author: Günther Deschner Date: Wed Feb 25 21:08:13 2009 +0100 s3-spoolss: make us pass the RPC-SPOOLSS torture test w.r.t. directory calls. Guenther commit 820a1c1a17f3848fafd796a54e0b2eeb886aef2e Author: Günther Deschner Date: Wed Feb 25 20:48:55 2009 +0100 s3-spoolss: JOB_ACCESS_READ has moved to idl. Guenther commit 6cd30a351a13822a557f20de3abe04bd8b2e3112 Author: Günther Deschner Date: Wed Feb 25 21:10:44 2009 +0100 s4-smbtorture: expand RPC-SPOOLSS enumform and getform tests for level 2 forms. Guenther commit 666cc916ebea618fbf7bfed99dbfff38326189fa Author: Günther Deschner Date: Wed Feb 25 16:17:44 2009 +0100 s4-smbtorture: add test_GetPrintProcessorDirectory to RPC-SPOOLSS. Guenther commit a045dd063d24d004f66c3b11ca11ebf665639971 Author: Günther Deschner Date: Wed Feb 25 21:16:45 2009 +0100 s3: re-run make samba3-idl. Guenther commit 06d2604d9d1f77dddc1408233da48f0958bb24d0 Author: Günther Deschner Date: Wed Feb 25 20:48:43 2009 +0100 spoolss: add JOB_ACCESS_READ. Guenther commit b239a4ee76ec424f09a74ae65bbddeba71026141 Author: Günther Deschner Date: Wed Feb 25 20:48:16 2009 +0100 spoolss: add spoolss_AddFormInfo2. Guenther commit 92f05e3c96a412d50cf8733d393464acb1d702fd Author: Günther Deschner Date: Wed Feb 25 20:46:35 2009 +0100 spoolss: fix spoolss_FormInfo2 (new in vista). keyword is an astring, not an nstring. Guenther commit 74232e323762abc8fbdc2a6a28c6e77b0020c304 Author: Günther Deschner Date: Wed Feb 25 16:17:08 2009 +0100 spoolss: windows ignores level in a spoolss_GetPrintProcessorDirectory query. Guenther --- Summary of changes: librpc/gen_ndr/ndr_spoolss.c| 236 ++- librpc/gen_ndr/ndr_spoolss.h|1 + librpc/gen_ndr/spoolss.h| 17 +++- librpc/idl/spoolss.idl | 21 +++- source3/include/rpc_spoolss.h |1 - source3/rpc_server/srv_spoolss_nt.c | 62 -- source3/rpcclient/cmd_spoolss.c | 54 ++-- source4/torture/rpc/spoolss.c | 138 - 8 files changed, 437 insertions(+), 93 deletions(-) Changeset truncated at 500 lines: diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c index 25c9dc4..5717da9 100644 --- a/librpc/gen_ndr/ndr_spoolss.c +++ b/librpc/gen_ndr/ndr_spoolss.c @@ -11356,6 +11356,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrintProcessorDirectoryInfo(struct n break; } default: { + NDR_CHECK(ndr_push_align(ndr, 4)); + NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); + NDR_CHECK(ndr_push_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); break; } } @@ -11390,6 +11393,9 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcessorDirectoryInfo(struct n break; } default: { + NDR_CHECK(ndr_pull_align(ndr, 4)); + NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); + NDR_CHECK(ndr_pull_spoolss_PrintProcessorDirectoryInfo1(ndr, NDR_SCALARS, &r->info1)); break; } } @@ -11420,6 +11426,7 @@ _PUBLIC_ void ndr_print_spoolss_PrintProcessorDirectoryInfo(struct ndr_print *nd break; default: + ndr_print_spoolss_PrintProcessorDirectoryInfo1(ndr, "info1", &r->info1); break; } @@ -12271,7 +12278,7 @@ static enum ndr_err_code
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1237-g3d7cde5
The branch, master has been updated via 3d7cde5dd3603ba3a7e78e8ca9a28d5bbf816b80 (commit) from d86cb9b52d8cdaa03f856665f56278836e6336d3 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3d7cde5dd3603ba3a7e78e8ca9a28d5bbf816b80 Author: Jeremy Allison Date: Wed Feb 25 12:53:45 2009 -0800 Fix bug in processing of open modes in POSIX open. Was missing case of "If file exists open. If file doesn't exist error." Damn damn damn. CIFSFS client will have to have fallback cases for this error for a long time. Jeremy. --- Summary of changes: source3/smbd/trans2.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 433b8a0..369830b 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -6423,6 +6423,8 @@ static NTSTATUS smb_posix_open(connection_struct *conn, create_disp = FILE_OVERWRITE_IF; } else if((wire_open_mode & SMB_O_CREAT) == SMB_O_CREAT) { create_disp = FILE_OPEN_IF; + } else if (wire_open_mode == 0) { + create_disp = FILE_OPEN; } else { DEBUG(5,("smb_posix_open: invalid create mode 0x%x\n", (unsigned int)wire_open_mode )); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5021-gb652082
The branch, v3-3-test has been updated via b652082648c49b525d2b2ce619b575ee75bc242e (commit) from 8858ed261917ce6c80562f05f5407109d66bd6a8 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit b652082648c49b525d2b2ce619b575ee75bc242e Author: Jeremy Allison Date: Wed Feb 25 12:54:58 2009 -0800 Fix bug in processing of open modes in POSIX open. Was missing case of "If file exists open. If file doesn't exist error." Damn damn damn. CIFSFS client will have to have fallback cases for this error for a long time. Jeremy. --- Summary of changes: source/smbd/trans2.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c index fdca880..2fb0922 100644 --- a/source/smbd/trans2.c +++ b/source/smbd/trans2.c @@ -6382,6 +6382,8 @@ static NTSTATUS smb_posix_open(connection_struct *conn, create_disp = FILE_OVERWRITE_IF; } else if((wire_open_mode & SMB_O_CREAT) == SMB_O_CREAT) { create_disp = FILE_OPEN_IF; + } else if (wire_open_mode == 0) { + create_disp = FILE_OPEN; } else { DEBUG(5,("smb_posix_open: invalid create mode 0x%x\n", (unsigned int)wire_open_mode )); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1238-gbfc7ec9
The branch, master has been updated via bfc7ec9e4a35e8ad64205e56cd0e621b41740efb (commit) from 3d7cde5dd3603ba3a7e78e8ca9a28d5bbf816b80 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit bfc7ec9e4a35e8ad64205e56cd0e621b41740efb Author: Jeremy Allison Date: Wed Feb 25 13:00:44 2009 -0800 Make test for open modes more robust against other bits. Jeremy. --- Summary of changes: source3/smbd/trans2.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 369830b..ee1dda9 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -6423,7 +6423,7 @@ static NTSTATUS smb_posix_open(connection_struct *conn, create_disp = FILE_OVERWRITE_IF; } else if((wire_open_mode & SMB_O_CREAT) == SMB_O_CREAT) { create_disp = FILE_OPEN_IF; - } else if (wire_open_mode == 0) { + } else if ((wire_open_mode & (SMB_O_CREAT | SMB_O_EXCL | SMB_O_TRUNC)) == 0) { create_disp = FILE_OPEN; } else { DEBUG(5,("smb_posix_open: invalid create mode 0x%x\n", -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5022-g8d17883
The branch, v3-3-test has been updated via 8d178837f259757340a09a688ed194e3e4a92c36 (commit) from b652082648c49b525d2b2ce619b575ee75bc242e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 8d178837f259757340a09a688ed194e3e4a92c36 Author: Jeremy Allison Date: Wed Feb 25 13:00:21 2009 -0800 Make test for open modes more robust against other bits. Jeremy. --- Summary of changes: source/smbd/trans2.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c index 2fb0922..1b3dff2 100644 --- a/source/smbd/trans2.c +++ b/source/smbd/trans2.c @@ -6382,7 +6382,7 @@ static NTSTATUS smb_posix_open(connection_struct *conn, create_disp = FILE_OVERWRITE_IF; } else if((wire_open_mode & SMB_O_CREAT) == SMB_O_CREAT) { create_disp = FILE_OPEN_IF; - } else if (wire_open_mode == 0) { + } else if ((wire_open_mode & (SMB_O_CREAT | SMB_O_EXCL | SMB_O_TRUNC)) == 0) { create_disp = FILE_OPEN; } else { DEBUG(5,("smb_posix_open: invalid create mode 0x%x\n", -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-157-gac11d94
The branch, v3-0-test has been updated via ac11d94f36e1878f3f5d86f2e7197fd8ecdd196b (commit) from a8f10f4469b31565e33669560657c2b3df68c13b (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit ac11d94f36e1878f3f5d86f2e7197fd8ecdd196b Author: Jeremy Allison Date: Wed Feb 25 13:01:04 2009 -0800 Fix bug in processing of open modes in POSIX open. Was missing case of "If file exists open. If file doesn't exist error." Damn damn damn. CIFSFS client will have to have fallback cases for this error for a long time. Make test for open modes more robust against other bits. Jeremy. --- Summary of changes: source/smbd/trans2.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c index 904a84b..d3b4fb9 100644 --- a/source/smbd/trans2.c +++ b/source/smbd/trans2.c @@ -5463,6 +5463,8 @@ static NTSTATUS smb_posix_open(connection_struct *conn, create_disp = FILE_OVERWRITE_IF; } else if((wire_open_mode & SMB_O_CREAT) == SMB_O_CREAT) { create_disp = FILE_OPEN_IF; + } else if ((wire_open_mode & (SMB_O_CREAT | SMB_O_EXCL | SMB_O_TRUNC)) == 0) { + create_disp = FILE_OPEN; } else { DEBUG(5,("smb_posix_open: invalid create mode 0x%x\n", (unsigned int)wire_open_mode )); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1239-ga4e570e
The branch, master has been updated via a4e570e3cedf284ee83853415176e4d105cb (commit) from bfc7ec9e4a35e8ad64205e56cd0e621b41740efb (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a4e570e3cedf284ee83853415176e4d105cb Author: Günther Deschner Date: Wed Feb 25 22:10:21 2009 +0100 s3-rpcclient: add test command to call netr_LogonGetCapabilities (for bug #6100). Guenther --- Summary of changes: source3/rpcclient/cmd_netlogon.c | 44 ++ 1 files changed, 44 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c index 9955d2d..45df488 100644 --- a/source3/rpcclient/cmd_netlogon.c +++ b/source3/rpcclient/cmd_netlogon.c @@ -1107,6 +1107,49 @@ static NTSTATUS cmd_netlogon_database_redo(struct rpc_pipe_client *cli, return status; } +static NTSTATUS cmd_netlogon_capabilities(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, int argc, + const char **argv) +{ + NTSTATUS status = NT_STATUS_UNSUCCESSFUL; + struct netr_Authenticator credential; + struct netr_Authenticator return_authenticator; + union netr_Capabilities capabilities; + uint32_t level = 1; + + if (argc > 2) { + fprintf(stderr, "Usage: %s \n", argv[0]); + return NT_STATUS_OK; + } + + if (argc == 2) { + level = atoi(argv[1]); + } + +#if 0 + netlogon_creds_client_step(cli->dc, &credential); +#else + ZERO_STRUCT(credential); +#endif + + status = rpccli_netr_LogonGetCapabilities(cli, mem_ctx, + cli->desthost, + global_myname(), + &credential, + &return_authenticator, + level, + &capabilities); +#if 0 + if (!netlogon_creds_client_check(cli->dc, +&return_authenticator.cred)) { + DEBUG(0,("credentials chain check failed\n")); + return NT_STATUS_ACCESS_DENIED; + } +#endif + + return status; +} + /* List of commands exported by this module */ struct cmd_set netlogon_commands[] = { @@ -1134,6 +1177,7 @@ struct cmd_set netlogon_commands[] = { { "netrenumtrusteddomainsex", RPC_RTYPE_WERROR, NULL, cmd_netlogon_enumtrusteddomainsex, &ndr_table_netlogon.syntax_id, NULL, "Enumerate trusted domains", "" }, { "getdcsitecoverage", RPC_RTYPE_WERROR, NULL, cmd_netlogon_getdcsitecoverage, &ndr_table_netlogon.syntax_id, NULL, "Get the Site-Coverage from a DC", "" }, { "database_redo", RPC_RTYPE_NTSTATUS, cmd_netlogon_database_redo, NULL, &ndr_table_netlogon.syntax_id, NULL, "Replicate single object from a DC", "" }, + { "capabilities", RPC_RTYPE_NTSTATUS, cmd_netlogon_capabilities, NULL, &ndr_table_netlogon.syntax_id, NULL, "Return Capabilities", "" }, { NULL } }; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1240-g76ca297
The branch, master has been updated via 76ca297ecfd1086b38487ac8f53a8392a4a38ad6 (commit) from a4e570e3cedf284ee83853415176e4d105cb (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 76ca297ecfd1086b38487ac8f53a8392a4a38ad6 Author: Jeremy Allison Date: Wed Feb 25 13:46:21 2009 -0800 Fix use of streams modules with CIFSFS client. Jeremy. --- Summary of changes: source3/modules/vfs_streams_depot.c | 14 -- source3/modules/vfs_streams_xattr.c | 15 +-- 2 files changed, 25 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_streams_depot.c b/source3/modules/vfs_streams_depot.c index 9329be7..023d2b9 100644 --- a/source3/modules/vfs_streams_depot.c +++ b/source3/modules/vfs_streams_depot.c @@ -494,7 +494,13 @@ static int streams_depot_unlink(vfs_handle_struct *handle, const char *fname) * We potentially need to delete the per-inode streams directory */ - if (SMB_VFS_NEXT_STAT(handle, fname, &sbuf) == -1) { + if (lp_posix_pathnames()) { + ret = SMB_VFS_NEXT_LSTAT(handle, fname, &sbuf); + } else { + ret = SMB_VFS_NEXT_STAT(handle, fname, &sbuf); + } + + if (ret == -1) { return -1; } @@ -678,7 +684,11 @@ static NTSTATUS streams_depot_streaminfo(vfs_handle_struct *handle, if (is_ntfs_stream_name(fname)) { return NT_STATUS_INVALID_PARAMETER; } - ret = SMB_VFS_NEXT_STAT(handle, fname, &sbuf); + if (lp_posix_pathnames()) { + ret = SMB_VFS_NEXT_LSTAT(handle, fname, &sbuf); + } else { + ret = SMB_VFS_NEXT_STAT(handle, fname, &sbuf); + } } if (ret == -1) { diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c index 775..3d5478d 100644 --- a/source3/modules/vfs_streams_xattr.c +++ b/source3/modules/vfs_streams_xattr.c @@ -135,6 +135,7 @@ static bool streams_xattr_recheck(struct stream_io *sio) static int streams_xattr_fstat(vfs_handle_struct *handle, files_struct *fsp, SMB_STRUCT_STAT *sbuf) { + int ret = -1; struct stream_io *io = (struct stream_io *) VFS_FETCH_FSP_EXTENSION(handle, fsp); @@ -148,7 +149,13 @@ static int streams_xattr_fstat(vfs_handle_struct *handle, files_struct *fsp, return -1; } - if (SMB_VFS_STAT(handle->conn, io->base, sbuf) == -1) { + if (lp_posix_pathnames()) { + ret = SMB_VFS_LSTAT(handle->conn, io->base, sbuf); + } else { + ret = SMB_VFS_STAT(handle->conn, io->base, sbuf); + } + + if (ret == -1) { return -1; } @@ -719,7 +726,11 @@ static NTSTATUS streams_xattr_streaminfo(vfs_handle_struct *handle, if (is_ntfs_stream_name(fname)) { return NT_STATUS_INVALID_PARAMETER; } - ret = SMB_VFS_STAT(handle->conn, fname, &sbuf); + if (lp_posix_pathnames()) { + ret = SMB_VFS_LSTAT(handle->conn, fname, &sbuf); + } else { + ret = SMB_VFS_STAT(handle->conn, fname, &sbuf); + } } if (ret == -1) { -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5023-g0c8b8f2
The branch, v3-3-test has been updated via 0c8b8f2f3483a585d974ce803357f1d9f39e3c9f (commit) from 8d178837f259757340a09a688ed194e3e4a92c36 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 0c8b8f2f3483a585d974ce803357f1d9f39e3c9f Author: Jeremy Allison Date: Wed Feb 25 13:46:46 2009 -0800 Fix use of streams modules with CIFSFS client. Jeremy. --- Summary of changes: source/modules/vfs_streams_depot.c | 14 -- source/modules/vfs_streams_xattr.c | 15 +-- 2 files changed, 25 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source/modules/vfs_streams_depot.c b/source/modules/vfs_streams_depot.c index 8ff617c..2a5b7a9 100644 --- a/source/modules/vfs_streams_depot.c +++ b/source/modules/vfs_streams_depot.c @@ -495,7 +495,13 @@ static int streams_depot_unlink(vfs_handle_struct *handle, const char *fname) * We potentially need to delete the per-inode streams directory */ - if (SMB_VFS_NEXT_STAT(handle, fname, &sbuf) == -1) { + if (lp_posix_pathnames()) { + ret = SMB_VFS_NEXT_LSTAT(handle, fname, &sbuf); + } else { + ret = SMB_VFS_NEXT_STAT(handle, fname, &sbuf); + } + + if (ret == -1) { return -1; } @@ -679,7 +685,11 @@ static NTSTATUS streams_depot_streaminfo(vfs_handle_struct *handle, if (is_ntfs_stream_name(fname)) { return NT_STATUS_INVALID_PARAMETER; } - ret = SMB_VFS_NEXT_STAT(handle, fname, &sbuf); + if (lp_posix_pathnames()) { + ret = SMB_VFS_NEXT_LSTAT(handle, fname, &sbuf); + } else { + ret = SMB_VFS_NEXT_STAT(handle, fname, &sbuf); + } } if (ret == -1) { diff --git a/source/modules/vfs_streams_xattr.c b/source/modules/vfs_streams_xattr.c index 7124c57..2e203f3 100644 --- a/source/modules/vfs_streams_xattr.c +++ b/source/modules/vfs_streams_xattr.c @@ -135,6 +135,7 @@ static bool streams_xattr_recheck(struct stream_io *sio) static int streams_xattr_fstat(vfs_handle_struct *handle, files_struct *fsp, SMB_STRUCT_STAT *sbuf) { + int ret = -1; struct stream_io *io = (struct stream_io *) VFS_FETCH_FSP_EXTENSION(handle, fsp); @@ -148,7 +149,13 @@ static int streams_xattr_fstat(vfs_handle_struct *handle, files_struct *fsp, return -1; } - if (SMB_VFS_STAT(handle->conn, io->base, sbuf) == -1) { + if (lp_posix_pathnames()) { + ret = SMB_VFS_LSTAT(handle->conn, io->base, sbuf); + } else { + ret = SMB_VFS_STAT(handle->conn, io->base, sbuf); + } + + if (ret == -1) { return -1; } @@ -718,7 +725,11 @@ static NTSTATUS streams_xattr_streaminfo(vfs_handle_struct *handle, if (is_ntfs_stream_name(fname)) { return NT_STATUS_INVALID_PARAMETER; } - ret = SMB_VFS_STAT(handle->conn, fname, &sbuf); + if (lp_posix_pathnames()) { + ret = SMB_VFS_LSTAT(handle->conn, fname, &sbuf); + } else { + ret = SMB_VFS_STAT(handle->conn, fname, &sbuf); + } } if (ret == -1) { -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3488-g161dc96
The branch, v3-2-test has been updated via 161dc96c1147f637b5ef78bb3f543f6d5e0618c6 (commit) from 73d0c3143eedb5a9fd4d154aaf42d20ba6a19a1f (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 161dc96c1147f637b5ef78bb3f543f6d5e0618c6 Author: Jeremy Allison Date: Wed Feb 25 13:48:30 2009 -0800 Fix use of streams modules with CIFSFS client. Jeremy. --- Summary of changes: source/modules/vfs_streams_depot.c | 14 -- source/modules/vfs_streams_xattr.c | 15 +-- 2 files changed, 25 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source/modules/vfs_streams_depot.c b/source/modules/vfs_streams_depot.c index 7f46f77..a1a1fc1 100644 --- a/source/modules/vfs_streams_depot.c +++ b/source/modules/vfs_streams_depot.c @@ -495,7 +495,13 @@ static int streams_depot_unlink(vfs_handle_struct *handle, const char *fname) * We potentially need to delete the per-inode streams directory */ - if (SMB_VFS_NEXT_STAT(handle, fname, &sbuf) == -1) { + if (lp_posix_pathnames()) { + ret = SMB_VFS_NEXT_LSTAT(handle, fname, &sbuf); + } else { + ret = SMB_VFS_NEXT_STAT(handle, fname, &sbuf); + } + + if (ret == -1) { return -1; } @@ -679,7 +685,11 @@ static NTSTATUS streams_depot_streaminfo(vfs_handle_struct *handle, if (is_ntfs_stream_name(fname)) { return NT_STATUS_INVALID_PARAMETER; } - ret = SMB_VFS_NEXT_STAT(handle, fname, &sbuf); + if (lp_posix_pathnames()) { + ret = SMB_VFS_NEXT_LSTAT(handle, fname, &sbuf); + } else { + ret = SMB_VFS_NEXT_STAT(handle, fname, &sbuf); + } } if (ret == -1) { diff --git a/source/modules/vfs_streams_xattr.c b/source/modules/vfs_streams_xattr.c index 7124c57..2e203f3 100644 --- a/source/modules/vfs_streams_xattr.c +++ b/source/modules/vfs_streams_xattr.c @@ -135,6 +135,7 @@ static bool streams_xattr_recheck(struct stream_io *sio) static int streams_xattr_fstat(vfs_handle_struct *handle, files_struct *fsp, SMB_STRUCT_STAT *sbuf) { + int ret = -1; struct stream_io *io = (struct stream_io *) VFS_FETCH_FSP_EXTENSION(handle, fsp); @@ -148,7 +149,13 @@ static int streams_xattr_fstat(vfs_handle_struct *handle, files_struct *fsp, return -1; } - if (SMB_VFS_STAT(handle->conn, io->base, sbuf) == -1) { + if (lp_posix_pathnames()) { + ret = SMB_VFS_LSTAT(handle->conn, io->base, sbuf); + } else { + ret = SMB_VFS_STAT(handle->conn, io->base, sbuf); + } + + if (ret == -1) { return -1; } @@ -718,7 +725,11 @@ static NTSTATUS streams_xattr_streaminfo(vfs_handle_struct *handle, if (is_ntfs_stream_name(fname)) { return NT_STATUS_INVALID_PARAMETER; } - ret = SMB_VFS_STAT(handle->conn, fname, &sbuf); + if (lp_posix_pathnames()) { + ret = SMB_VFS_LSTAT(handle->conn, fname, &sbuf); + } else { + ret = SMB_VFS_STAT(handle->conn, fname, &sbuf); + } } if (ret == -1) { -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1244-ge17df48
The branch, master has been updated via e17df483fbedb81aededdef5fbb6ae1d034bc2dd (commit) via 95e428e2279b706ac590ffb964fda07fd1ee2200 (commit) via 7f33b947e3c770f96f46fc9466376cd3c7825cd4 (commit) via 01493737c88c0056ca3da5faf43b7bc9b9a2fbcb (commit) from 76ca297ecfd1086b38487ac8f53a8392a4a38ad6 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e17df483fbedb81aededdef5fbb6ae1d034bc2dd Author: Stefan Metzmacher Date: Thu Jan 22 10:54:12 2009 +0100 lib/tdb: if we know pwrite and pread are thread/fork safe tdb_reopen_all() should be a noop The reason for tdb_reopen_all() is that the seek pointer on fds are shared between parent and child. metze commit 95e428e2279b706ac590ffb964fda07fd1ee2200 Author: Tim Prouty Date: Tue Feb 24 16:42:18 2009 -0800 s3: Report the correct path when dumping core on FreeBSD Utilize the kern.corefile sysctl value on FreeBSD commit 7f33b947e3c770f96f46fc9466376cd3c7825cd4 Author: Tim Prouty Date: Tue Feb 24 14:45:46 2009 -0800 s3: Refactor and cleanup the error paths in dump_core_setup commit 01493737c88c0056ca3da5faf43b7bc9b9a2fbcb Author: Tim Prouty Date: Mon Feb 23 14:51:17 2009 -0800 s3 OneFS: Add .snapshot directory configuration handling --- Summary of changes: lib/tdb/common/open.c |5 + source3/lib/fault.c | 173 +-- source3/modules/onefs.h | 32 +++- source3/modules/onefs_streams.c |2 +- source3/modules/onefs_system.c | 50 +++ source3/modules/vfs_onefs.c | 144 +++- 6 files changed, 337 insertions(+), 69 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tdb/common/open.c b/lib/tdb/common/open.c index b19e4ce..e58c8ca 100644 --- a/lib/tdb/common/open.c +++ b/lib/tdb/common/open.c @@ -461,6 +461,10 @@ fail: /* reopen all tdb's */ int tdb_reopen_all(int parent_longlived) { +#if defined(LIBREPLACE_PREAD_NOT_REPLACED) && \ + defined(LIBREPLACE_PWRITE_NOT_REPLACED) + return 0; +#else struct tdb_context *tdb; for (tdb=tdbs; tdb; tdb = tdb->next) { @@ -483,6 +487,7 @@ int tdb_reopen_all(int parent_longlived) if (tdb_reopen(tdb) != 0) return -1; } +#endif return 0; } diff --git a/source3/lib/fault.c b/source3/lib/fault.c index 8c4a45b..efd1ddd 100644 --- a/source3/lib/fault.c +++ b/source3/lib/fault.c @@ -2,6 +2,7 @@ Unix SMB/CIFS implementation. Critical Fault handling Copyright (C) Andrew Tridgell 1992-1998 + Copyright (C) Tim Prouty 2009 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 @@ -87,6 +88,128 @@ void fault_setup(void (*fn)(void *)) #endif } +/** + * Build up the default corepath as "/cores/" + */ +static char *get_default_corepath(const char *logbase, const char *progname) +{ + char *tmp_corepath; + + /* Setup core dir in logbase. */ + tmp_corepath = talloc_asprintf(NULL, "%s/cores", logbase); + if (!tmp_corepath) + return NULL; + + if ((mkdir(tmp_corepath, 0700) == -1) && errno != EEXIST) + goto err_out; + + if (chmod(tmp_corepath, 0700) == -1) + goto err_out; + + talloc_free(tmp_corepath); + + /* Setup progname-specific core subdir */ + tmp_corepath = talloc_asprintf(NULL, "%s/cores/%s", logbase, progname); + if (!tmp_corepath) + return NULL; + + if (mkdir(tmp_corepath, 0700) == -1 && errno != EEXIST) + goto err_out; + + if (chown(tmp_corepath, getuid(), getgid()) == -1) + goto err_out; + + if (chmod(tmp_corepath, 0700) == -1) + goto err_out; + + return tmp_corepath; + + err_out: + talloc_free(tmp_corepath); + return NULL; +} + +/** + * Get the FreeBSD corepath. + * + * On FreeBSD the current working directory is ignored when creating a core + * file. Instead the core directory is controlled via sysctl. This consults + * the value of "kern.corefile" so the correct corepath can be printed out + * before dump_core() calls abort. + */ +#if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME)) +static char *get_freebsd_corepath(void) +{ + char *tmp_corepath = NULL; + char *end = NULL; + size_t len = 128; + int ret; + + /* Loop with increasing sizes so we don't allocate too much. */ + do { + if (len > 1024) { + goto err_out; + } + + tmp_corepath = (char *)talloc_realloc(NULL, tmp_corepath, + char, len); +
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1245-g228e751
The branch, master has been updated via 228e75112ffe4124748e80d6571ddde4df22881f (commit) from e17df483fbedb81aededdef5fbb6ae1d034bc2dd (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 228e75112ffe4124748e80d6571ddde4df22881f Author: Günther Deschner Date: Wed Feb 25 23:04:52 2009 +0100 s4-spoolss: implement dcesrv_spoolss_GetPrintProcessorDirectory. Guenther --- Summary of changes: source4/ntptr/ntptr.h |3 ++ source4/ntptr/ntptr_interface.c |9 + source4/ntptr/simple_ldb/ntptr_simple_ldb.c | 43 +++ source4/rpc_server/spoolss/dcesrv_spoolss.c | 14 - 4 files changed, 68 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/ntptr/ntptr.h b/source4/ntptr/ntptr.h index 24c467f..91817a2 100644 --- a/source4/ntptr/ntptr.h +++ b/source4/ntptr/ntptr.h @@ -74,6 +74,7 @@ struct spoolss_EnumForms; struct spoolss_EnumPorts; struct spoolss_EnumPrintProcessors; struct spoolss_XcvData; +struct spoolss_GetPrintProcessorDirectory; /* the ntptr operations structure - contains function pointers to the backend implementations of each operation */ @@ -144,6 +145,8 @@ struct ntptr_ops { /* PrintProcessor functions */ WERROR (*EnumPrintProcessors)(struct ntptr_context *ntptr, TALLOC_CTX *mem_ctx, struct spoolss_EnumPrintProcessors *r); + WERROR (*GetPrintProcessorDirectory)(struct ntptr_context *ntptr, TALLOC_CTX *mem_ctx, +struct spoolss_GetPrintProcessorDirectory *r); /* Printer functions */ WERROR (*EnumPrinters)(struct ntptr_context *ntptr, TALLOC_CTX *mem_ctx, diff --git a/source4/ntptr/ntptr_interface.c b/source4/ntptr/ntptr_interface.c index 109a9f5..b65a2e3 100644 --- a/source4/ntptr/ntptr_interface.c +++ b/source4/ntptr/ntptr_interface.c @@ -263,6 +263,15 @@ WERROR ntptr_EnumPrintProcessors(struct ntptr_context *ntptr, TALLOC_CTX *mem_ct return ntptr->ops->EnumPrintProcessors(ntptr, mem_ctx, r); } +WERROR ntptr_GetPrintProcessorDirectory(struct ntptr_context *ntptr, TALLOC_CTX *mem_ctx, + struct spoolss_GetPrintProcessorDirectory *r) +{ + if (!ntptr->ops->GetPrintProcessorDirectory) { + return WERR_NOT_SUPPORTED; + } + return ntptr->ops->GetPrintProcessorDirectory(ntptr, mem_ctx, r); +} + /* Printer functions */ WERROR ntptr_EnumPrinters(struct ntptr_context *ntptr, TALLOC_CTX *mem_ctx, diff --git a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c index c570b03..459babc 100644 --- a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c +++ b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c @@ -750,6 +750,47 @@ static WERROR sptr_GetPrinterForm(struct ntptr_GenericHandle *printer, TALLOC_CT return WERR_OK; } +static WERROR sptr_GetPrintProcessorDirectory(struct ntptr_context *ntptr, TALLOC_CTX *mem_ctx, + struct spoolss_GetPrintProcessorDirectory *r) +{ + union spoolss_PrintProcessorDirectoryInfo *info; + const char *prefix; + const char *postfix; + + /* +* NOTE: normally r->in.level is 1, but both w2k3 and nt4 sp6a +*are ignoring the r->in.level completely, so we do :-) +*/ + + /* +* TODO: check the server name is ours +* - if it's a invalid UNC then return WERR_INVALID_NAME +* - if it's the wrong host name return WERR_INVALID_PARAM +* - if it's "" then we need to return a local WINDOWS path +*/ + if (!r->in.server || !r->in.server[0]) { + prefix = "C:\\PRTPROCS"; + } else { + prefix = talloc_asprintf(mem_ctx, "%s\\prnproc$", r->in.server); + W_ERROR_HAVE_NO_MEMORY(prefix); + } + + if (r->in.environment && strcmp(SPOOLSS_ARCHITECTURE_NT_X86, r->in.environment) == 0) { + postfix = "W32X86"; + } else { + return WERR_INVALID_ENVIRONMENT; + } + + info = talloc(mem_ctx, union spoolss_PrintProcessorDirectoryInfo); + W_ERROR_HAVE_NO_MEMORY(info); + + info->info1.directory_name = talloc_asprintf(mem_ctx, "%s\\%s", prefix, postfix); + W_ERROR_HAVE_NO_MEMORY(info->info1.directory_name); + + r->out.info = info; + return WERR_OK; +} + /* initialialise the simble ldb backend, registering ourselves with the ntptr subsystem @@ -793,6 +834,8 @@ static const struct ntptr_ops ntptr_simple_ldb_ops = { /* PrintProcessor functions */ /* .EnumPrintProcessors= sptr_EnumPrintProcessors, */ + .GetPrintProcessorDirectory = sptr_GetPrintPr
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5024-g6d5bf22
The branch, v3-3-test has been updated via 6d5bf226e91eaa7405103f2c32b5d5a310fa35eb (commit) from 0c8b8f2f3483a585d974ce803357f1d9f39e3c9f (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 6d5bf226e91eaa7405103f2c32b5d5a310fa35eb Author: Jeremy Allison Date: Wed Feb 25 14:12:31 2009 -0800 Ensure ACL modules work with POSIX paths. Jeremy. --- Summary of changes: source/modules/vfs_acl_tdb.c | 89 +++- source/modules/vfs_acl_xattr.c | 12 - 2 files changed, 79 insertions(+), 22 deletions(-) Changeset truncated at 500 lines: diff --git a/source/modules/vfs_acl_tdb.c b/source/modules/vfs_acl_tdb.c index ec6fb5a..08c782d 100644 --- a/source/modules/vfs_acl_tdb.c +++ b/source/modules/vfs_acl_tdb.c @@ -182,20 +182,26 @@ static NTSTATUS get_acl_blob(TALLOC_CTX *ctx, TDB_DATA data; struct file_id id; struct db_context *db; + int ret = -1; SMB_STRUCT_STAT sbuf; SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return NT_STATUS_INTERNAL_DB_CORRUPTION); if (fsp && fsp->fh->fd != -1) { - if (SMB_VFS_FSTAT(fsp, &sbuf) == -1) { - return map_nt_error_from_unix(errno); - } + ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (SMB_VFS_STAT(handle->conn, name, &sbuf) == -1) { - return map_nt_error_from_unix(errno); + if (lp_posix_pathnames()) { + ret = SMB_VFS_LSTAT(handle->conn, name, &sbuf); + } else { + ret = SMB_VFS_STAT(handle->conn, name, &sbuf); } } + + if (ret == -1) { + return map_nt_error_from_unix(errno); + } + id = vfs_file_id_from_sbuf(handle->conn, &sbuf); push_file_id_16((char *)id_buf, &id); @@ -265,6 +271,7 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle, TDB_DATA data; struct db_context *db; struct db_record *rec; + int ret = -1; DEBUG(10,("store_acl_blob_fsp: storing blob length %u on file %s\n", (unsigned int)pblob->length, fsp->fsp_name)); @@ -273,14 +280,19 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle, return NT_STATUS_INTERNAL_DB_CORRUPTION); if (fsp->fh->fd != -1) { - if (SMB_VFS_FSTAT(fsp, &sbuf) == -1) { - return map_nt_error_from_unix(errno); - } + ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (SMB_VFS_STAT(handle->conn, fsp->fsp_name, &sbuf) == -1) { - return map_nt_error_from_unix(errno); + if (lp_posix_pathnames()) { + ret = SMB_VFS_LSTAT(handle->conn, fsp->fsp_name, &sbuf); + } else { + ret = SMB_VFS_STAT(handle->conn, fsp->fsp_name, &sbuf); } } + + if (ret == -1) { + return map_nt_error_from_unix(errno); + } + id = vfs_file_id_from_sbuf(handle->conn, &sbuf); push_file_id_16((char *)id_buf, &id); @@ -310,6 +322,7 @@ static NTSTATUS store_acl_blob_pathname(vfs_handle_struct *handle, SMB_STRUCT_STAT sbuf; struct db_context *db; struct db_record *rec; + int ret = -1; DEBUG(10,("store_acl_blob_pathname: storing blob " "length %u on file %s\n", @@ -318,7 +331,13 @@ static NTSTATUS store_acl_blob_pathname(vfs_handle_struct *handle, SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return NT_STATUS_INTERNAL_DB_CORRUPTION); - if (SMB_VFS_STAT(handle->conn, fname, &sbuf) == -1) { + if (lp_posix_pathnames()) { + ret = SMB_VFS_LSTAT(handle->conn, fname, &sbuf); + } else { + ret = SMB_VFS_STAT(handle->conn, fname, &sbuf); + } + + if (ret == -1) { return map_nt_error_from_unix(errno); } @@ -489,7 +508,11 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle, if (fsp && !fsp->is_directory && fsp->fh->fd != -1) { ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - ret = SMB_VFS_STAT(handle->conn,fname, &sbuf); + if (lp_posix_pathnames()) { + ret = SMB_VFS_LSTAT(handle->conn,fname, &sbuf); + } else { + ret = SMB_VFS_STAT(handle->conn,fname, &sbuf); + } } if (ret == -1) { return map_nt_error_from_unix(errno); @@ -578,11 +601,17 @@ static int unlink_ac
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1246-g9b8bb1a
The branch, master has been updated via 9b8bb1ad957f9c2d91e55ac6a27657cd8f6d4a14 (commit) from 228e75112ffe4124748e80d6571ddde4df22881f (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 9b8bb1ad957f9c2d91e55ac6a27657cd8f6d4a14 Author: Jeremy Allison Date: Wed Feb 25 14:12:51 2009 -0800 Ensure ACL modules work with POSIX paths. Jeremy. --- Summary of changes: source3/modules/vfs_acl_tdb.c | 89 ++- source3/modules/vfs_acl_xattr.c | 12 - 2 files changed, 79 insertions(+), 22 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c index 909de9d..5cd3e21 100644 --- a/source3/modules/vfs_acl_tdb.c +++ b/source3/modules/vfs_acl_tdb.c @@ -186,20 +186,26 @@ static NTSTATUS get_acl_blob(TALLOC_CTX *ctx, TDB_DATA data; struct file_id id; struct db_context *db; + int ret = -1; SMB_STRUCT_STAT sbuf; SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return NT_STATUS_INTERNAL_DB_CORRUPTION); if (fsp && fsp->fh->fd != -1) { - if (SMB_VFS_FSTAT(fsp, &sbuf) == -1) { - return map_nt_error_from_unix(errno); - } + ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (SMB_VFS_STAT(handle->conn, name, &sbuf) == -1) { - return map_nt_error_from_unix(errno); + if (lp_posix_pathnames()) { + ret = SMB_VFS_LSTAT(handle->conn, name, &sbuf); + } else { + ret = SMB_VFS_STAT(handle->conn, name, &sbuf); } } + + if (ret == -1) { + return map_nt_error_from_unix(errno); + } + id = vfs_file_id_from_sbuf(handle->conn, &sbuf); /* For backwards compatibility only store the dev/inode. */ @@ -270,6 +276,7 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle, TDB_DATA data; struct db_context *db; struct db_record *rec; + int ret = -1; DEBUG(10,("store_acl_blob_fsp: storing blob length %u on file %s\n", (unsigned int)pblob->length, fsp->fsp_name)); @@ -278,14 +285,19 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle, return NT_STATUS_INTERNAL_DB_CORRUPTION); if (fsp->fh->fd != -1) { - if (SMB_VFS_FSTAT(fsp, &sbuf) == -1) { - return map_nt_error_from_unix(errno); - } + ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (SMB_VFS_STAT(handle->conn, fsp->fsp_name, &sbuf) == -1) { - return map_nt_error_from_unix(errno); + if (lp_posix_pathnames()) { + ret = SMB_VFS_LSTAT(handle->conn, fsp->fsp_name, &sbuf); + } else { + ret = SMB_VFS_STAT(handle->conn, fsp->fsp_name, &sbuf); } } + + if (ret == -1) { + return map_nt_error_from_unix(errno); + } + id = vfs_file_id_from_sbuf(handle->conn, &sbuf); /* For backwards compatibility only store the dev/inode. */ @@ -316,6 +328,7 @@ static NTSTATUS store_acl_blob_pathname(vfs_handle_struct *handle, SMB_STRUCT_STAT sbuf; struct db_context *db; struct db_record *rec; + int ret = -1; DEBUG(10,("store_acl_blob_pathname: storing blob " "length %u on file %s\n", @@ -324,7 +337,13 @@ static NTSTATUS store_acl_blob_pathname(vfs_handle_struct *handle, SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return NT_STATUS_INTERNAL_DB_CORRUPTION); - if (SMB_VFS_STAT(handle->conn, fname, &sbuf) == -1) { + if (lp_posix_pathnames()) { + ret = SMB_VFS_LSTAT(handle->conn, fname, &sbuf); + } else { + ret = SMB_VFS_STAT(handle->conn, fname, &sbuf); + } + + if (ret == -1) { return map_nt_error_from_unix(errno); } @@ -494,7 +513,11 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle, if (fsp && !fsp->is_directory && fsp->fh->fd != -1) { ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - ret = SMB_VFS_STAT(handle->conn,fname, &sbuf); + if (lp_posix_pathnames()) { + ret = SMB_VFS_LSTAT(handle->conn,fname, &sbuf); + } else { + ret = SMB_VFS_STAT(handle->conn,fname, &sbuf); + } } if (ret == -1) { return map_nt_error_from_unix(errno);
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1249-g9e54f41
The branch, master has been updated via 9e54f4151cf0e5d958f1929d854d082635b11c39 (commit) via 7e01ec5560e8193c8e8853ba49c0ee625956c1fd (commit) via 8bf0c256d7f06fe7d0abf031921abd83e6956c8b (commit) from 9b8bb1ad957f9c2d91e55ac6a27657cd8f6d4a14 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 9e54f4151cf0e5d958f1929d854d082635b11c39 Author: Günther Deschner Date: Wed Feb 25 23:43:55 2009 +0100 s3-spoolss: fix _spoolss_AddJob behaviour. Guenther commit 7e01ec5560e8193c8e8853ba49c0ee625956c1fd Author: Günther Deschner Date: Wed Feb 25 23:42:03 2009 +0100 s4-spoolss: implement dcesrv_spoolss_AddJob which always is a dummy. Guenther commit 8bf0c256d7f06fe7d0abf031921abd83e6956c8b Author: Günther Deschner Date: Mon Feb 9 22:22:45 2009 +0100 s4-smbtorture: add test_AddJob test to RPC-SPOOLSS test. Guenther --- Summary of changes: source3/rpc_server/srv_spoolss_nt.c |4 +++ source4/rpc_server/spoolss/dcesrv_spoolss.c |6 - source4/torture/rpc/spoolss.c | 29 +++ 3 files changed, 38 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 2f89775..5a79dca 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -6619,6 +6619,10 @@ WERROR _spoolss_AddJob(pipes_struct *p, /* this is what a NT server returns for AddJob. AddJob must fail on * non-local printers */ + if (r->in.level != 1) { + return WERR_UNKNOWN_LEVEL; + } + return WERR_INVALID_PARAM; } diff --git a/source4/rpc_server/spoolss/dcesrv_spoolss.c b/source4/rpc_server/spoolss/dcesrv_spoolss.c index 89b93bb..f1ef2f0 100644 --- a/source4/rpc_server/spoolss/dcesrv_spoolss.c +++ b/source4/rpc_server/spoolss/dcesrv_spoolss.c @@ -546,7 +546,11 @@ static WERROR dcesrv_spoolss_EndDocPrinter(struct dcesrv_call_state *dce_call, T static WERROR dcesrv_spoolss_AddJob(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct spoolss_AddJob *r) { - DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); + if (r->in.level != 1) { + return WERR_UNKNOWN_LEVEL; + } + + return WERR_INVALID_PARAM; } diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 04c9768..9d8bc4b 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -1045,6 +1045,33 @@ static bool test_SetJob(struct torture_context *tctx, return true; } +static bool test_AddJob(struct torture_context *tctx, + struct dcerpc_pipe *p, + struct policy_handle *handle) +{ + NTSTATUS status; + struct spoolss_AddJob r; + uint32_t needed; + + r.in.level = 0; + r.in.handle = handle; + r.in.offered = 0; + r.out.needed = &needed; + + torture_comment(tctx, "Testing AddJob\n"); + + status = dcerpc_spoolss_AddJob(p, tctx, &r); + torture_assert_werr_equal(tctx, r.out.result, WERR_UNKNOWN_LEVEL, "AddJob failed"); + + r.in.level = 1; + + status = dcerpc_spoolss_AddJob(p, tctx, &r); + torture_assert_werr_equal(tctx, r.out.result, WERR_INVALID_PARAM, "AddJob failed"); + + return true; +} + + static bool test_EnumJobs(struct torture_context *tctx, struct dcerpc_pipe *p, struct policy_handle *handle) @@ -1084,6 +,7 @@ static bool test_EnumJobs(struct torture_context *tctx, info = r.out.info; for (j = 0; j < count; j++) { + test_GetJob(tctx, p, handle, info[j].info1.job_id); test_SetJob(tctx, p, handle, info[j].info1.job_id, SPOOLSS_JOB_CONTROL_PAUSE); test_SetJob(tctx, p, handle, info[j].info1.job_id, SPOOLSS_JOB_CONTROL_RESUME); @@ -1163,6 +1191,7 @@ static bool test_DoPrintTest(struct torture_context *tctx, torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EndDocPrinter failed"); torture_assert_werr_ok(tctx, e.out.result, "EndDocPrinter failed"); + ret &= test_AddJob(tctx, p, handle); ret &= test_EnumJobs(tctx, p, handle); ret &= test_SetJob(tctx, p, handle, job_id, SPOOLSS_JOB_CONTROL_DELETE); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1250-ga6d0a93
The branch, master has been updated via a6d0a93fc27729b63ae3fd4994059f3854a63845 (commit) from 9e54f4151cf0e5d958f1929d854d082635b11c39 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a6d0a93fc27729b63ae3fd4994059f3854a63845 Author: Jeremy Allison Date: Wed Feb 25 14:50:19 2009 -0800 Use fsp->posix_open in preference if we have it. Jeremy. --- Summary of changes: source3/modules/vfs_acl_tdb.c | 10 +- source3/modules/vfs_acl_xattr.c |4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c index 5cd3e21..73dbca4 100644 --- a/source3/modules/vfs_acl_tdb.c +++ b/source3/modules/vfs_acl_tdb.c @@ -195,7 +195,7 @@ static NTSTATUS get_acl_blob(TALLOC_CTX *ctx, if (fsp && fsp->fh->fd != -1) { ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (lp_posix_pathnames()) { + if (fsp->posix_open) { ret = SMB_VFS_LSTAT(handle->conn, name, &sbuf); } else { ret = SMB_VFS_STAT(handle->conn, name, &sbuf); @@ -287,7 +287,7 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle, if (fsp->fh->fd != -1) { ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (lp_posix_pathnames()) { + if (fsp->posix_open) { ret = SMB_VFS_LSTAT(handle->conn, fsp->fsp_name, &sbuf); } else { ret = SMB_VFS_STAT(handle->conn, fsp->fsp_name, &sbuf); @@ -513,7 +513,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle, if (fsp && !fsp->is_directory && fsp->fh->fd != -1) { ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (lp_posix_pathnames()) { + if (fsp->posix_open) { ret = SMB_VFS_LSTAT(handle->conn,fname, &sbuf); } else { ret = SMB_VFS_STAT(handle->conn,fname, &sbuf); @@ -763,7 +763,7 @@ static NTSTATUS fset_nt_acl_tdb(vfs_handle_struct *handle, files_struct *fsp, return NT_STATUS_OK; } if (fsp->is_directory || fsp->fh->fd == -1) { - if (lp_posix_pathnames()) { + if (fsp->posix_open) { ret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name, &sbuf); } else { ret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf); @@ -893,7 +893,7 @@ static int sys_acl_set_fd_tdb(vfs_handle_struct *handle, SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1); if (fsp->is_directory || fsp->fh->fd == -1) { - if (lp_posix_pathnames()) { + if (fsp->posix_open) { ret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name, &sbuf); } else { ret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf); diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c index f46e468..039e469 100644 --- a/source3/modules/vfs_acl_xattr.c +++ b/source3/modules/vfs_acl_xattr.c @@ -381,7 +381,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle, if (fsp && !fsp->is_directory && fsp->fh->fd != -1) { ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (lp_posix_pathnames()) { + if (fsp->posix_open) { ret = SMB_VFS_LSTAT(handle->conn,fname, &sbuf); } else { ret = SMB_VFS_STAT(handle->conn,fname, &sbuf); @@ -563,7 +563,7 @@ static NTSTATUS fset_nt_acl_xattr(vfs_handle_struct *handle, files_struct *fsp, return NT_STATUS_OK; } if (fsp->is_directory || fsp->fh->fd == -1) { - if (lp_posix_pathnames()) { + if (fsp->posix_open) { ret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name, &sbuf); } else { ret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5025-g2b5b5be
The branch, v3-3-test has been updated via 2b5b5bed41320f1890c69c714c7596e1a7a1b964 (commit) from 6d5bf226e91eaa7405103f2c32b5d5a310fa35eb (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 2b5b5bed41320f1890c69c714c7596e1a7a1b964 Author: Jeremy Allison Date: Wed Feb 25 14:50:43 2009 -0800 Use fsp->posix_open in preference if we have it. Jeremy. --- Summary of changes: source/modules/vfs_acl_tdb.c | 10 +- source/modules/vfs_acl_xattr.c |4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/source/modules/vfs_acl_tdb.c b/source/modules/vfs_acl_tdb.c index 08c782d..49a316a 100644 --- a/source/modules/vfs_acl_tdb.c +++ b/source/modules/vfs_acl_tdb.c @@ -191,7 +191,7 @@ static NTSTATUS get_acl_blob(TALLOC_CTX *ctx, if (fsp && fsp->fh->fd != -1) { ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (lp_posix_pathnames()) { + if (fsp->posix_open) { ret = SMB_VFS_LSTAT(handle->conn, name, &sbuf); } else { ret = SMB_VFS_STAT(handle->conn, name, &sbuf); @@ -282,7 +282,7 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle, if (fsp->fh->fd != -1) { ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (lp_posix_pathnames()) { + if (fsp->posix_open) { ret = SMB_VFS_LSTAT(handle->conn, fsp->fsp_name, &sbuf); } else { ret = SMB_VFS_STAT(handle->conn, fsp->fsp_name, &sbuf); @@ -508,7 +508,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle, if (fsp && !fsp->is_directory && fsp->fh->fd != -1) { ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (lp_posix_pathnames()) { + if (fsp->posix_open) { ret = SMB_VFS_LSTAT(handle->conn,fname, &sbuf); } else { ret = SMB_VFS_STAT(handle->conn,fname, &sbuf); @@ -758,7 +758,7 @@ static NTSTATUS fset_nt_acl_tdb(vfs_handle_struct *handle, files_struct *fsp, return NT_STATUS_OK; } if (fsp->is_directory || fsp->fh->fd == -1) { - if (lp_posix_pathnames()) { + if (fsp->posix_open) { ret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name, &sbuf); } else { ret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf); @@ -888,7 +888,7 @@ static int sys_acl_set_fd_tdb(vfs_handle_struct *handle, SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1); if (fsp->is_directory || fsp->fh->fd == -1) { - if (lp_posix_pathnames()) { + if (fsp->posix_open) { ret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name, &sbuf); } else { ret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf); diff --git a/source/modules/vfs_acl_xattr.c b/source/modules/vfs_acl_xattr.c index d2faf8e..b12422f 100644 --- a/source/modules/vfs_acl_xattr.c +++ b/source/modules/vfs_acl_xattr.c @@ -384,7 +384,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle, if (fsp && !fsp->is_directory && fsp->fh->fd != -1) { ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (lp_posix_pathnames()) { + if (fsp->posix_open) { ret = SMB_VFS_LSTAT(handle->conn,fname, &sbuf); } else { ret = SMB_VFS_STAT(handle->conn,fname, &sbuf); @@ -566,7 +566,7 @@ static NTSTATUS fset_nt_acl_xattr(vfs_handle_struct *handle, files_struct *fsp, return NT_STATUS_OK; } if (fsp->is_directory || fsp->fh->fd == -1) { - if (lp_posix_pathnames()) { + if (fsp->posix_open) { ret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name, &sbuf); } else { ret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5026-g032f052
The branch, v3-3-test has been updated via 032f052c9ccfb32f822352155e5f3c17a34f896a (commit) from 2b5b5bed41320f1890c69c714c7596e1a7a1b964 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 032f052c9ccfb32f822352155e5f3c17a34f896a Author: Jeremy Allison Date: Wed Feb 25 14:56:49 2009 -0800 Fix more POSIX path lstat calls. Fix bug where close can return failure if we have a pending modtime and the containing directory of the file has been renamed (there is no POSIX "update time by fd" call). This can't happen on Windows as the rename will fail if there are open files beneath it. Will add a torture test for this. Jeremy. --- Summary of changes: source/smbd/close.c | 22 +- 1 files changed, 17 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/source/smbd/close.c b/source/smbd/close.c index d586116..0075697 100644 --- a/source/smbd/close.c +++ b/source/smbd/close.c @@ -467,6 +467,7 @@ static NTSTATUS update_write_time_on_close(struct files_struct *fsp) SMB_STRUCT_STAT sbuf; struct timespec ts[2]; NTSTATUS status; + int ret = -1; ZERO_STRUCT(sbuf); ZERO_STRUCT(ts); @@ -481,15 +482,19 @@ static NTSTATUS update_write_time_on_close(struct files_struct *fsp) /* Ensure we have a valid stat struct for the source. */ if (fsp->fh->fd != -1) { - if (SMB_VFS_FSTAT(fsp, &sbuf) == -1) { - return map_nt_error_from_unix(errno); - } + ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (SMB_VFS_STAT(fsp->conn,fsp->fsp_name,&sbuf) == -1) { - return map_nt_error_from_unix(errno); + if (fsp->posix_open) { + ret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name,&sbuf); + } else { + ret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name,&sbuf); } } + if (ret == -1) { + return map_nt_error_from_unix(errno); + } + if (!VALID_STAT(sbuf)) { /* if it doesn't seem to be a real file */ return NT_STATUS_OK; @@ -575,6 +580,13 @@ static NTSTATUS close_normal_file(files_struct *fsp, enum file_close_type close_ */ saved_status4 = update_write_time_on_close(fsp); + if (NT_STATUS_EQUAL(saved_status4, NT_STATUS_OBJECT_NAME_NOT_FOUND)) { + /* Someone renamed the file or a parent directory containing +* this file. We can't do anything about this, we don't have +* an "update timestamp by fd" call in POSIX. Eat the error. */ + + saved_status4 = NT_STATUS_OK; + } if (NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(saved_status1)) { -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1251-g59a28a2
The branch, master has been updated via 59a28a22ab26bb7f2c12f9bccda9c7f585d992a7 (commit) from a6d0a93fc27729b63ae3fd4994059f3854a63845 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 59a28a22ab26bb7f2c12f9bccda9c7f585d992a7 Author: Jeremy Allison Date: Wed Feb 25 14:57:16 2009 -0800 Fix more POSIX path lstat calls. Fix bug where close can return failure if we have a pending modtime and the containing directory of the file has been renamed (there is no POSIX "update time by fd" call). This can't happen on Windows as the rename will fail if there are open files beneath it. Will add a torture test for this. Jeremy. --- Summary of changes: source3/smbd/close.c | 22 +- 1 files changed, 17 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/close.c b/source3/smbd/close.c index 78b8123..d23b509 100644 --- a/source3/smbd/close.c +++ b/source3/smbd/close.c @@ -471,6 +471,7 @@ static NTSTATUS update_write_time_on_close(struct files_struct *fsp) SMB_STRUCT_STAT sbuf; struct smb_file_time ft; NTSTATUS status; + int ret = -1; ZERO_STRUCT(sbuf); ZERO_STRUCT(ft); @@ -485,15 +486,19 @@ static NTSTATUS update_write_time_on_close(struct files_struct *fsp) /* Ensure we have a valid stat struct for the source. */ if (fsp->fh->fd != -1) { - if (SMB_VFS_FSTAT(fsp, &sbuf) == -1) { - return map_nt_error_from_unix(errno); - } + ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (SMB_VFS_STAT(fsp->conn,fsp->fsp_name,&sbuf) == -1) { - return map_nt_error_from_unix(errno); + if (fsp->posix_open) { + ret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name,&sbuf); + } else { + ret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name,&sbuf); } } + if (ret == -1) { + return map_nt_error_from_unix(errno); + } + if (!VALID_STAT(sbuf)) { /* if it doesn't seem to be a real file */ return NT_STATUS_OK; @@ -581,6 +586,13 @@ static NTSTATUS close_normal_file(struct smb_request *req, files_struct *fsp, */ saved_status4 = update_write_time_on_close(fsp); + if (NT_STATUS_EQUAL(saved_status4, NT_STATUS_OBJECT_NAME_NOT_FOUND)) { + /* Someone renamed the file or a parent directory containing +* this file. We can't do anything about this, we don't have +* an "update timestamp by fd" call in POSIX. Eat the error. */ + + saved_status4 = NT_STATUS_OK; + } if (NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(saved_status1)) { -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3489-g5fb3b5e
The branch, v3-2-test has been updated via 5fb3b5e903c08013074ba473399ddee30f6c328f (commit) from 161dc96c1147f637b5ef78bb3f543f6d5e0618c6 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 5fb3b5e903c08013074ba473399ddee30f6c328f Author: Jeremy Allison Date: Wed Feb 25 14:55:19 2009 -0800 Fix more POSIX path lstat calls. Fix bug where close can return failure if we have a pending modtime and the containing directory of the file has been renamed (there is no POSIX "update time by fd" call). This can't happen on Windows as the rename will fail if there are open files beneath it. Will add a torture test for this. Jeremy. --- Summary of changes: source/smbd/close.c | 22 +- 1 files changed, 17 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/source/smbd/close.c b/source/smbd/close.c index 9fd5693..81d25ef 100644 --- a/source/smbd/close.c +++ b/source/smbd/close.c @@ -467,6 +467,7 @@ static NTSTATUS update_write_time_on_close(struct files_struct *fsp) SMB_STRUCT_STAT sbuf; struct timespec ts[2]; NTSTATUS status; + int ret = -1; ZERO_STRUCT(sbuf); ZERO_STRUCT(ts); @@ -481,15 +482,19 @@ static NTSTATUS update_write_time_on_close(struct files_struct *fsp) /* Ensure we have a valid stat struct for the source. */ if (fsp->fh->fd != -1) { - if (SMB_VFS_FSTAT(fsp, &sbuf) == -1) { - return map_nt_error_from_unix(errno); - } + ret = SMB_VFS_FSTAT(fsp, &sbuf); } else { - if (SMB_VFS_STAT(fsp->conn,fsp->fsp_name,&sbuf) == -1) { - return map_nt_error_from_unix(errno); + if (fsp->posix_open) { + ret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name,&sbuf); + } else { + ret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name,&sbuf); } } + if (ret == -1) { + return map_nt_error_from_unix(errno); + } + if (!VALID_STAT(sbuf)) { /* if it doesn't seem to be a real file */ return NT_STATUS_OK; @@ -575,6 +580,13 @@ static NTSTATUS close_normal_file(files_struct *fsp, enum file_close_type close_ */ saved_status4 = update_write_time_on_close(fsp); + if (NT_STATUS_EQUAL(saved_status4, NT_STATUS_OBJECT_NAME_NOT_FOUND)) { + /* Someone renamed the file or a parent directory containing +* this file. We can't do anything about this, we don't have +* an "update timestamp by fd" call in POSIX. Eat the error. */ + + saved_status4 = NT_STATUS_OK; + } if (NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(saved_status1)) { -- Samba Shared Repository
Build status as of Thu Feb 26 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-02-25 00:00:17.0 + +++ /home/build/master/cache/broken_results.txt 2009-02-26 00:00:30.0 + @@ -1,4 +1,4 @@ -Build status as of Wed Feb 25 00:00:02 2009 +Build status as of Thu Feb 26 00:00:02 2009 Build counts: Tree Total Broken Panic @@ -7,16 +7,16 @@ ctdb 0 0 0 distcc 0 0 0 ldb 29 28 0 -libreplace 29 11 0 +libreplace 28 11 0 lorikeet-heimdal 26 14 0 pidl 20 3 0 ppp 12 0 0 rsync29 8 0 samba-docs 0 0 0 samba-gtk5 5 0 -samba_3_X_devel 28 28 2 -samba_3_X_test 27 25 3 -samba_4_0_test 29 26 1 +samba_3_X_devel 28 27 2 +samba_3_X_test 27 26 3 +samba_4_0_test 29 27 0 smb-build28 6 0 talloc 29 28 0 tdb 27 8 0
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha6-1252-g76a0050
The branch, v4-0-test has been updated via 76a0050e239b1fb9e2135f2e6cea80ed780a0ee0 (commit) via 59a28a22ab26bb7f2c12f9bccda9c7f585d992a7 (commit) via a6d0a93fc27729b63ae3fd4994059f3854a63845 (commit) via 9e54f4151cf0e5d958f1929d854d082635b11c39 (commit) via 7e01ec5560e8193c8e8853ba49c0ee625956c1fd (commit) via 8bf0c256d7f06fe7d0abf031921abd83e6956c8b (commit) via 9b8bb1ad957f9c2d91e55ac6a27657cd8f6d4a14 (commit) via 228e75112ffe4124748e80d6571ddde4df22881f (commit) via e17df483fbedb81aededdef5fbb6ae1d034bc2dd (commit) via 95e428e2279b706ac590ffb964fda07fd1ee2200 (commit) via 7f33b947e3c770f96f46fc9466376cd3c7825cd4 (commit) via 01493737c88c0056ca3da5faf43b7bc9b9a2fbcb (commit) via 76ca297ecfd1086b38487ac8f53a8392a4a38ad6 (commit) via a4e570e3cedf284ee83853415176e4d105cb (commit) via bfc7ec9e4a35e8ad64205e56cd0e621b41740efb (commit) via 3d7cde5dd3603ba3a7e78e8ca9a28d5bbf816b80 (commit) via d86cb9b52d8cdaa03f856665f56278836e6336d3 (commit) via 03efdcb7cb55f61d2b8cf419b25ed6d1eac1d3af (commit) via 820a1c1a17f3848fafd796a54e0b2eeb886aef2e (commit) via 6cd30a351a13822a557f20de3abe04bd8b2e3112 (commit) via 666cc916ebea618fbf7bfed99dbfff38326189fa (commit) via a045dd063d24d004f66c3b11ca11ebf665639971 (commit) via 06d2604d9d1f77dddc1408233da48f0958bb24d0 (commit) via b239a4ee76ec424f09a74ae65bbddeba71026141 (commit) via 92f05e3c96a412d50cf8733d393464acb1d702fd (commit) via 74232e323762abc8fbdc2a6a28c6e77b0020c304 (commit) via f90250b54923588d756a02e76876fc66a6c68074 (commit) via 15f108f0917eedab89199e9fbf93ed802eed7f89 (commit) via d7c7b31bbaf110446ea835b66845ab6f0ee09231 (commit) via fd3f3e68f2e6be0196473f641f8edb41e40ca761 (commit) via 59cc0c09d5413d1264758bef505856f5f56131e4 (commit) via 838b950138255beb7135a32d4429a74fec2bfe42 (commit) via f71db89256b65c3700eadaf44b2727623eb831fa (commit) via b6457c78d61992f12903ed0966d9d1608de68da8 (commit) via 2bd8cacf0e5ed6965f5791c4a86320d4978d9b15 (commit) via 543db0f94aa4cdeb6499f62aee8791cda7a670d7 (commit) via fc3ffedcfe173900d65f6fa7db3a3cf2608f9f68 (commit) via e2f37ec106fb51ec894e0d6160949545e80dfe69 (commit) via 01d1aaf63e8170936139a01814211f6567c4b125 (commit) via 80a9a41d412aa61877a7497661197fd16ddb4903 (commit) via c46fad3d1bdf1082a695d3df90e55e739e494a5c (commit) via 2390ea274bff7a8878a488db0893a393c9d1b51e (commit) via 13ac0dc4565b1cbdb977b6959562f3f8f9ac5ff8 (commit) via 5bab95b58366ff001b4967bdb0674f42dc990a77 (commit) via 06b018767b6e6f3ee0221c3aee142cb2b4836fc9 (commit) via 423c1d88fcd0f128bceaf8b0c371281aa4a41003 (commit) via be4913fbe6f6bb2fefbeeb1559692e04a15758f9 (commit) via 00ad0c4a4317db810bf2197503006ae5a6bb8bce (commit) via d1c7bbd893c27ebff28571b4ea611bd3e35148c1 (commit) via 258ae4cec596631b758fb17c170c4494e4db8a8e (commit) via a041d9061922b1a90e5b5047af77934d908afdd5 (commit) via 59e90d3715a577503434ace9e01bfe63dfcfa714 (commit) via c03f2072762d91240fe90a2f02542e521313e7ef (commit) via c7ba20b465e4c2bf893891ab7ace8172704bb27c (commit) via 109ba07b0e2ce45cc0a960bcafd0e8d28c877ae3 (commit) via f8af5130d5515e017330a2123b933109599e072c (commit) via 1a77218dca0222aafff81aae6cd17462706e226e (commit) via 6366084c4a7aa4845816cef6f1782e9d1c1f138c (commit) via 9e3178e8387cd85858a145bb4918073f91127d20 (commit) via 9d165fa5c69d3c98d1a76a155bb794a7e4c9744a (commit) via 24a63add2d92afa0084fec956df7508ea28aab89 (commit) via 4823e988b6360646931f9b6369bf7b8f512069a8 (commit) via eb5efd1978acd38cf6cc97e067b5105743ca5469 (commit) via 662f996b1554508baf7344b8618f152c179f1680 (commit) via dc0e46afb7018a1da666729c6d61e8ea85dcf07d (commit) via 2f1b12890a31baceee6a4d446b4782caefb1fcaa (commit) via c2cdb4ad5c9398ef0d3310613107999f8d33c7ce (commit) via afc7e45a4ccf8505e4c598334e339e79ba036057 (commit) via d75df717336e063f52af1415f99b6e16ccbf918c (commit) via fff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf (commit) via b9cf189404d5ef6b0a2440dc5f9670f0f6d0c131 (commit) via dcb2e7d57718ebd3db75999819ec8ef507f9dd7b (commit) via 10c047c6f4c0f6b9fdebbdf133a3bd72aa8776de (commit) from d8b70278e20b276566a3893d288101ff4826df61 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit 76a0050e239b1fb9e2135f2e6cea80ed780a0ee0 Author: Andrew Bartlett Date: Thu Feb 26 13:12:07 2009 +1100 A simple hack to avoid the segfault in #6138 Thanks to Andrew Kroeger for reporting this. This fix just f
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha6-1253-gc3632e4
The branch, v4-0-test has been updated via c3632e4efc506a401a9d75c4d75b14a1a220caa2 (commit) from 76a0050e239b1fb9e2135f2e6cea80ed780a0ee0 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit c3632e4efc506a401a9d75c4d75b14a1a220caa2 Author: Andrew Bartlett Date: Thu Feb 26 13:21:08 2009 +1100 Mark as the Samba 4.0 alpha7 release --- Summary of changes: source4/VERSION |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/VERSION b/source4/VERSION index e7d05f6..2025643 100644 --- a/source4/VERSION +++ b/source4/VERSION @@ -89,7 +89,7 @@ SAMBA_VERSION_RC_RELEASE= # e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes # # -> "3.0.0-SVN-build-199" # -SAMBA_VERSION_IS_GIT_SNAPSHOT=yes +SAMBA_VERSION_IS_GIT_SNAPSHOT=no # This is for specifying a release nickname# -- Samba Shared Repository