[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via b486fa9 Add special box donations. from 8ad2fbe Add release notes for Samba 4.0.12. http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit b486fa972a0b7939a6e2515f11e0f019e8256077 Author: Karolin Seeger ksee...@samba.org Date: Wed Nov 20 10:19:11 2013 +0100 Add special box donations. Make donations a bit more visible as requested by Volker after the SDC. Signed-off-by: Karolin Seeger ksee...@samba.org --- Summary of changes: index.html | 12 style/2010/grey/screen.css |1 + 2 files changed, 13 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/index.html b/index.html index 71f84c4..fea768c 100644 --- a/index.html +++ b/index.html @@ -64,6 +64,18 @@ /div !-- right column: specials -- div class=noPrint id=special + div class=specialBox id=specialBoxDonations + div class=specialBoxContent + h4Donations/h4 + p + Nowadays, the Samba Team + needs a + a href=http://www.samba.org/samba/donations.html;dollar/a + instead of pizza ;-) + /p + /div + div class=specialBoxBottom/div + /div div class=specialBox id=specialBoxNews div class=specialBoxContent h4Latest News/h4 diff --git a/style/2010/grey/screen.css b/style/2010/grey/screen.css index 892d0c6..73e6588 100644 --- a/style/2010/grey/screen.css +++ b/style/2010/grey/screen.css @@ -466,6 +466,7 @@ body * { padding: 0 18px 19px; } +#bd #specialBoxDonations, #bd #specialBoxNews, #bd #specialBoxBeyondSamba { margin: 10px 0 0; -- Samba Website Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via c776204 debug: remove unused sys_adminlog via 024e691 printing: use DEBUG instead of sys_adminlog via d9d8b83 printing: fix double space in debug statement via a299de8 loadparm: use lp_printername ctx param instead of tos via de42413 messaging: use local talloc ctx instead of talloc_tos via 956a455 printing: return WERROR from print_access_check from 2d91577 smbd: Fix a talloc hierarchy problem in msg_channel http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit c7762042ba43567b331fd42aec6abd77744ff486 Author: David Disseldorp dd...@samba.org Date: Wed Nov 20 00:31:27 2013 +0100 debug: remove unused sys_adminlog printing.c was the last user of this syslog wrapper. Signed-off-by: David Disseldorp dd...@samba.org Reviewed-by: Guenther Deschner g...@samba.org Autobuild-User(master): Günther Deschner g...@samba.org Autobuild-Date(master): Wed Nov 20 10:19:32 CET 2013 on sn-devel-104 commit 024e691d8568b983d09b636402bc45acb318b28d Author: David Disseldorp dd...@samba.org Date: Wed Nov 20 00:20:40 2013 +0100 printing: use DEBUG instead of sys_adminlog sys_adminlog() is another syslog wrapper. Use DEBUG(0, ...) instead, which offers the same syslog(LOG_ERR) behaviour. Signed-off-by: David Disseldorp dd...@samba.org Reviewed-by: Guenther Deschner g...@samba.org commit d9d8b837b6c57e97a9702aaa04c62077e319f415 Author: David Disseldorp dd...@samba.org Date: Sun Oct 20 21:18:23 2013 +0200 printing: fix double space in debug statement Signed-off-by: David Disseldorp dd...@samba.org Reviewed-by: Guenther Deschner g...@samba.org commit a299de85ab6f1901a61d696522522496fb154434 Author: David Disseldorp dd...@samba.org Date: Wed Oct 16 21:52:29 2013 +0200 loadparm: use lp_printername ctx param instead of tos lp_printername() takes a TALLOC_CTX argument, but proceeds to use talloc_tos() in a subsequent lp__printername call. Fix it to use the parameter - most callers use talloc_tos() as the argument, the others have a temporary context around. Signed-off-by: David Disseldorp dd...@samba.org Reviewed-by: Guenther Deschner g...@samba.org commit de424133653c00a2a95017be15a25cbb0b3c0524 Author: David Disseldorp dd...@samba.org Date: Wed Oct 16 18:31:17 2013 +0200 messaging: use local talloc ctx instead of talloc_tos messaging_tdb_send() allocates a stackframe and stores it in a local variable, subsequent allocations should use the variable instead of calling talloc_tos(). Signed-off-by: David Disseldorp dd...@samba.org Reviewed-by: Guenther Deschner g...@samba.org commit 956a4552f2c66cfe61493de772b5986d95511135 Author: David Disseldorp dd...@samba.org Date: Thu Sep 26 13:24:15 2013 +0200 printing: return WERROR from print_access_check print_access_check() currently returns a bool based on whether access is granted or denied. Errno is set on failure, but none of the callers use it. This change converts print_access_check() to return a WERROR. Signed-off-by: David Disseldorp dd...@samba.org Reviewed-by: Guenther Deschner g...@samba.org --- Summary of changes: source3/include/includes.h |3 - source3/include/nt_printing.h |6 +- source3/lib/messages_local.c|8 ++-- source3/lib/system.c| 25 - source3/param/loadparm.c|2 +- source3/printing/nt_printing.c | 31 --- source3/printing/printing.c | 74 +++ source3/rpc_server/spoolss/srv_spoolss_nt.c | 16 +++--- 8 files changed, 58 insertions(+), 107 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/includes.h b/source3/include/includes.h index 1b22a57..d18496a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -457,9 +457,6 @@ int d_printf(const char *, ...) PRINTF_ATTRIBUTE(1,2); int d_fprintf(FILE *f, const char *, ...) PRINTF_ATTRIBUTE(2,3); /* PRINTFLIKE2 */ -void sys_adminlog(int priority, const char *format_str, ...) PRINTF_ATTRIBUTE(2,3); - -/* PRINTFLIKE2 */ int fstr_sprintf(fstring s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3); int smb_xvasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0); diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h index 2a0e883..4af44d7 100644 --- a/source3/include/nt_printing.h +++ b/source3/include/nt_printing.h @@ -128,9 +128,9 @@ bool nt_printing_init(struct messaging_context *msg_ctx); const char *get_short_archi(const char *long_archi); -bool print_access_check(const struct
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via d2a11a1 Add specialBoxDonations to all other sites also. from b486fa9 Add special box donations. http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit d2a11a195f23b803a809691ee657cc5ca1acd7b9 Author: Karolin Seeger ksee...@samba.org Date: Wed Nov 20 10:44:10 2013 +0100 Add specialBoxDonations to all other sites also. Signed-off-by: Karolin Seeger ksee...@samba.org --- Summary of changes: footer.html | 13 + index.html |3 ++- 2 files changed, 15 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/footer.html b/footer.html index 91c696a..b153315 100755 --- a/footer.html +++ b/footer.html @@ -2,6 +2,19 @@ /div !-- right column: specials -- div class=noPrint id=special + div class=specialBox id=specialBoxDonations + div class=specialBoxContent + h4Donations/h4 + + p + Nowadays, the Samba Team + needs a + a href=http://www.samba.org/samba/donations.html;dollar/a + instead of pizza ;-) + /p + /div + div class=specialBoxBottom/div + /div div class=specialBox id=specialBoxBeyondSamba div class=specialBoxContent h4Beyond Samba/h4 diff --git a/index.html b/index.html index fea768c..6953f2a 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,4 @@ -!--#include virtual=/samba/header.html -- + titleSamba - opening windows to a wider world/title link rel=alternate href=http://news.samba.org/feeds/sambanews/; type=application/rss+xml title=Samba News !--#include virtual=/samba/global_menu_start.html -- @@ -67,6 +67,7 @@ div class=specialBox id=specialBoxDonations div class=specialBoxContent h4Donations/h4 + p Nowadays, the Samba Team needs a -- Samba Website Repository
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via ecb209f specialBoxDonations: Try to add missing blank line. from d2a11a1 Add specialBoxDonations to all other sites also. http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit ecb209fae88ee82cb6139eb82616306020fe585d Author: Karolin Seeger ksee...@samba.org Date: Wed Nov 20 10:56:14 2013 +0100 specialBoxDonations: Try to add missing blank line. Signed-off-by: Karolin Seeger ksee...@samba.org --- Summary of changes: footer.html |2 +- index.html |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/footer.html b/footer.html index b153315..97d8f42 100755 --- a/footer.html +++ b/footer.html @@ -5,7 +5,7 @@ div class=specialBox id=specialBoxDonations div class=specialBoxContent h4Donations/h4 - + br / p Nowadays, the Samba Team needs a diff --git a/index.html b/index.html index 6953f2a..b10e0e1 100644 --- a/index.html +++ b/index.html @@ -67,7 +67,7 @@ div class=specialBox id=specialBoxDonations div class=specialBoxContent h4Donations/h4 - + br / p Nowadays, the Samba Team needs a -- Samba Website Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 3f77bf2 testparm: Warnings should not cause failure from c776204 debug: remove unused sys_adminlog http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3f77bf2ce318b51547c36f315b34a062ba7afccf Author: Martin Schwenke mar...@meltin.net Date: Tue Nov 5 06:31:29 2013 +1100 testparm: Warnings should not cause failure Remove the return code of 1 associated with some warnings. Warnings should not cause failure. If any of these cases should cause a failure then they should be changed to errors. Signed-off-by: Martin Schwenke mar...@meltin.net Reviewed-by: Christof Schmitt c...@samba.org Reviewed-by: Volker Lendecke v...@samba.org Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Wed Nov 20 12:19:59 CET 2013 on sn-devel-104 --- Summary of changes: source3/utils/testparm.c |4 1 files changed, 0 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index 1c13b52..ce85353 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -86,7 +86,6 @@ static int do_global_checks(void) if (strequal(lp_workgroup(), lp_netbios_name())) { fprintf(stderr, WARNING: 'workgroup' and 'netbios name' must differ.\n\n); - ret = 1; } if (!directory_exist_stat(lp_lockdir(), st)) { @@ -97,7 +96,6 @@ static int do_global_checks(void) fprintf(stderr, WARNING: lock directory %s should have permissions 0755 for browsing to work\n\n, lp_lockdir()); - ret = 1; } if (!directory_exist_stat(lp_statedir(), st)) { @@ -108,7 +106,6 @@ static int do_global_checks(void) fprintf(stderr, WARNING: state directory %s should have permissions 0755 for browsing to work\n\n, lp_statedir()); - ret = 1; } if (!directory_exist_stat(lp_cachedir(), st)) { @@ -119,7 +116,6 @@ static int do_global_checks(void) fprintf(stderr, WARNING: cache directory %s should have permissions 0755 for browsing to work\n\n, lp_cachedir()); - ret = 1; } if (!directory_exist_stat(lp_piddir(), st)) { -- Samba Shared Repository
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via c0719ea Update cyber.com.au on request from David Keegel from ecb209f specialBoxDonations: Try to add missing blank line. http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit c0719eaf698efc176a649104c2b23e9ca877b741 Author: Lars Müller l...@samba.org Date: Wed Nov 20 14:44:21 2013 +0100 Update cyber.com.au on request from David Keegel --- Summary of changes: support/australia.html |8 1 files changed, 4 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/support/australia.html b/support/australia.html index 88daf93..8544a5d 100644 --- a/support/australia.html +++ b/support/australia.html @@ -6,15 +6,15 @@ !-- Added JHT 20100301 -- hr / -h3Cybersource Pty. Ltd./h3 +h3Cyber IT Solutions Pty. Ltd./h3 presmall -Cybersource Pty. Ltd. +Cyber IT Solutions Pty. Ltd. Level 1, 130-132 Stawell Street Richmond, Victoria -a href=http://cybersource.com.au;http://cybersource.com.au/a +a href=http://www.cyber.com.au/;http://www.cyber.com.au//a +61 3 9428 6922 -a href=mailto:i...@cybersource.com.au;i...@cybersource.com.au/a +a href=mailto:i...@cyber.com.au;i...@cyber.com.au/a Con Zymaris /small/pre p -- Samba Website Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2013-11-20-1453/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2013-11-20-1453/samba3.stderr http://git.samba.org/autobuild.flakey/2013-11-20-1453/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2013-11-20-1453/samba.stderr http://git.samba.org/autobuild.flakey/2013-11-20-1453/samba.stdout The top commit at the time of the failure was: commit 3f77bf2ce318b51547c36f315b34a062ba7afccf Author: Martin Schwenke mar...@meltin.net Date: Tue Nov 5 06:31:29 2013 +1100 testparm: Warnings should not cause failure Remove the return code of 1 associated with some warnings. Warnings should not cause failure. If any of these cases should cause a failure then they should be changed to errors. Signed-off-by: Martin Schwenke mar...@meltin.net Reviewed-by: Christof Schmitt c...@samba.org Reviewed-by: Volker Lendecke v...@samba.org Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Wed Nov 20 12:19:59 CET 2013 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 01cae09 handle later iniparser version assigning a zero length string value for 'key=' from 3f77bf2 testparm: Warnings should not cause failure http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 01cae099e0aab96fc3d3f21cd19b8925180f0351 Author: Noel Power noel.po...@suse.com Date: Tue Nov 5 17:24:46 2013 + handle later iniparser version assigning a zero length string value for 'key=' older iniparser versions ( like that used in upstream samba ) ignore 'key=' entries, the key is not entered into the dictionary at all. Later versions of iniparse specifically handle the following special cases * key= * key=; * key=# by assigning a value of ( a zero length string ) to the key in the dictionary. Signed-off-by: Noel Power noel.po...@suse.com Reviewed-by: Andreas Schneider a...@samba.org Reviewed-by: David Disseldorp dd...@samba.org Autobuild-User(master): David Disseldorp dd...@samba.org Autobuild-Date(master): Wed Nov 20 16:12:13 CET 2013 on sn-devel-104 --- Summary of changes: nsswitch/pam_winbind.c | 23 +++ 1 files changed, 19 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c index 9f85556..2e37662 100644 --- a/nsswitch/pam_winbind.c +++ b/nsswitch/pam_winbind.c @@ -330,6 +330,21 @@ static void _pam_log_state_datum(struct pwb_context *ctx, #define _PAM_LOG_STATE_ITEM_PASSWORD(ctx, item_type) \ _pam_log_state_datum(ctx, item_type, #item_type, \ _LOG_PASSWORD_AS_STRING) +/* + * wrapper to preserve old behaviour of iniparser which ignored + * key values that had no value assigned like + *key = + * for a key like above newer iniparser will return a zero-length + * string, previously iniparser would return NULL + */ +static char *iniparser_getstring_nonempty(dictionary *d, char *key, char *def) +{ + char *ret = iniparser_getstring(d, key, def); + if (ret strlen(ret) == 0) { + ret = NULL; + } + return ret; +} static void _pam_log_state(struct pwb_context *ctx) { @@ -418,13 +433,13 @@ static int _pam_parse(const pam_handle_t *pamh, ctrl |= WINBIND_SILENT; } - if (iniparser_getstring(d, discard_const_p(char, global:krb5_ccache_type), NULL) != NULL) { + if (iniparser_getstring_nonempty(d, discard_const_p(char, global:krb5_ccache_type), NULL) != NULL) { ctrl |= WINBIND_KRB5_CCACHE_TYPE; } - if ((iniparser_getstring(d, discard_const_p(char, global:require-membership-of), NULL) + if ((iniparser_getstring_nonempty(d, discard_const_p(char, global:require-membership-of), NULL) != NULL) || - (iniparser_getstring(d, discard_const_p(char, global:require_membership_of), NULL) + (iniparser_getstring_nonempty(d, discard_const_p(char, global:require_membership_of), NULL) != NULL)) { ctrl |= WINBIND_REQUIRED_MEMBERSHIP; } @@ -2262,7 +2277,7 @@ static const char *get_conf_item_string(struct pwb_context *ctx, goto out; } - parm_opt = iniparser_getstring(ctx-dict, key, NULL); + parm_opt = iniparser_getstring_nonempty(ctx-dict, key, NULL); TALLOC_FREE(key); _pam_log_debug(ctx, LOG_INFO, CONFIG file: %s '%s'\n, -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 979d9db replace: Fix developer build on BSD. via 3baeca4 docs: Add winbindd to destination parameter in smbcontrol manpage via c63e148 testparm: don't warn for TCP_NODELAY in socket options. from 01cae09 handle later iniparser version assigning a zero length string value for 'key=' http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 979d9dbbb709c99c77b02fbc7429a0d0472ac2f4 Author: Andreas Schneider a...@samba.org Date: Tue Nov 19 18:14:24 2013 +0100 replace: Fix developer build on BSD. This fixes bsd_attr_list() calling geteuid(). Signed-off-by: Andreas Schneider a...@samba.org Reviewed-by: Jeremy Allison j...@samba.org Autobuild-User(master): Jeremy Allison j...@samba.org Autobuild-Date(master): Thu Nov 21 03:37:59 CET 2013 on sn-devel-104 commit 3baeca4fec7c6cc94bdf51544221d280a699fdbe Author: Christof Schmitt c...@samba.org Date: Wed Nov 20 16:19:37 2013 -0700 docs: Add winbindd to destination parameter in smbcontrol manpage Signed-off-by: Christof Schmitt c...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit c63e148361cdb2cc4611c97b3fe8ccb07e2d86b2 Author: Michael Adam ob...@samba.org Date: Wed Nov 20 07:03:15 2013 +0100 testparm: don't warn for TCP_NODELAY in socket options. TCP_NODELAY is set by default, so we should not warn. Signed-off-by: Michael Adam ob...@samba.org Reviewed-by: Jeremy Allison j...@samba.org --- Summary of changes: docs-xml/manpages/smbcontrol.1.xml |4 +++- lib/replace/xattr.c|1 + source3/utils/testparm.c |6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages/smbcontrol.1.xml b/docs-xml/manpages/smbcontrol.1.xml index 234e02d..64c9d48 100644 --- a/docs-xml/manpages/smbcontrol.1.xml +++ b/docs-xml/manpages/smbcontrol.1.xml @@ -61,7 +61,9 @@ varlistentry termdestination/term - listitemparaOne of parameternmbd/parameter, parametersmbd/parameter or a process ID./para + listitemparaOne of parameternmbd/parameter, + parametersmbd/parameter, parameterwinbindd/parameter + or a process ID./para paraThe parameterall/parameter destination causes the message to broadcast to all running daemons including nmbd and diff --git a/lib/replace/xattr.c b/lib/replace/xattr.c index 459b7f3..ce52d1a 100644 --- a/lib/replace/xattr.c +++ b/lib/replace/xattr.c @@ -25,6 +25,7 @@ License along with this library; if not, see http://www.gnu.org/licenses/. */ +#define UID_WRAPPER_NOT_REPLACE #include replace.h #include system/filesys.h #include system/dir.h diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index ce85353..7e49c08 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -137,13 +137,13 @@ static int do_global_checks(void) (strstr(socket_options, SO_SNDBUF) || strstr(socket_options, SO_RCVBUF) || strstr(socket_options, SO_SNDLOWAT) || -strstr(socket_options, SO_RCVLOWAT) || -strstr(socket_options, TCP_NODELAY))) { +strstr(socket_options, SO_RCVLOWAT))) + { fprintf(stderr, WARNING: socket options = %s\n This warning is printed because you set one of the\n following options: SO_SNDBUF, SO_RCVBUF, SO_SNDLOWAT,\n - SO_RCVLOWAT, TCP_NODELAY\n + SO_RCVLOWAT\n Modern server operating systems are tuned for\n high network performance in the majority of situations;\n when you set 'socket options' you are overriding those\n -- Samba Shared Repository