[Samba] ACL with ActiveDirectory@Groups
Dear All, I'm new on this group.Greetings to all. I have problem with this smb.conf share section (I'm not samba admin, but I know this configuration) smb.conf 3.5.8 ### [AD-test-acl] comment = AD-test-acl path = /fs-e/AD/group/AD-test-acl read only = No create mask = 0770 directory mask = 0770 inherit permissions = Yes inherit acls = Yes browseable = No blocking locks = No delete readonly = Yes dos filetime resolution = Yes vfs objects = zfsacl nfs4:acedup = merge nfs4:chown = yes nfs4:mode = special # the issue are: users network 1 when trying to edit a file the user cannot save the file due to incorrect permissions, however it seems that even though an error is given the file is still saved. the file however then has readonly permission set and can no longer be used. Removing the readonly permission (properties) sometimes results in either the file being no longer visible (not always) or the file being no longer readable (again not always) - seems to depend on the user? users network 2 when trying to edit a file the user cannot save the file due to incorrect permissions, however a copy of the file is saved again the copy of the file is set to readonly and removing the readonly property may result in the file becoming unusable (can no longer open from net2) or no longer visible from net2. do you have an idea to solve these problems? thanks, darkyz -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] add to the windows local group
Hello people! How could I add a samba group to the local administrators windows group when a windows machine joinds to the samba domain? As I see the Domain Admins group has added already, but I need to add one more. Sincerely, Andrey Grebennikov -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Can Samba allow both local and domain logons
Volker Lendecke volker.lende...@sernet.de writes: On Mon, Oct 03, 2011 at 09:44:04AM +1100, Leigh Wedding wrote: Hi, Is it possible to configure a Samba domain member server to allow logon for both domain users (authenticated by a domain controller), and locally defined users (defined in eg. /etc/samba/private/passdb.tdb)? Nothing to configure. It does so automatically. You have to prepend either DOMAIN\username or HOSTNAME\username when you log in, just like Windows expects it. Volker -- SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen Yes it works, thanks. I am sure I had tried that, but had obviously done something wrong. -- Leigh. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] ACL with ActiveDirectory@Groups
Greetings, MSOffice-file? --- EDV Daniel Müller Leitung EDV Tropenklinik Paul-Lechler-Krankenhaus Paul-Lechler-Str. 24 72076 Tübingen Tel.: 07071/206-463, Fax: 07071/206-499 eMail: muel...@tropenklinik.de Internet: www.tropenklinik.de --- -Ursprüngliche Nachricht- Von: samba-boun...@lists.samba.org [mailto:samba-boun...@lists.samba.org] Im Auftrag von alberto.atz...@ext.jrc.ec.europa.eu Gesendet: Freitag, 14. Oktober 2011 10:37 An: samba@lists.samba.org Betreff: [Samba] ACL with ActiveDirectory@Groups Dear All, I'm new on this group.Greetings to all. I have problem with this smb.conf share section (I'm not samba admin, but I know this configuration) smb.conf 3.5.8 ### [AD-test-acl] comment = AD-test-acl path = /fs-e/AD/group/AD-test-acl read only = No create mask = 0770 directory mask = 0770 inherit permissions = Yes inherit acls = Yes browseable = No blocking locks = No delete readonly = Yes dos filetime resolution = Yes vfs objects = zfsacl nfs4:acedup = merge nfs4:chown = yes nfs4:mode = special # the issue are: users network 1 when trying to edit a file the user cannot save the file due to incorrect permissions, however it seems that even though an error is given the file is still saved. the file however then has readonly permission set and can no longer be used. Removing the readonly permission (properties) sometimes results in either the file being no longer visible (not always) or the file being no longer readable (again not always) - seems to depend on the user? users network 2 when trying to edit a file the user cannot save the file due to incorrect permissions, however a copy of the file is saved again the copy of the file is set to readonly and removing the readonly property may result in the file becoming unusable (can no longer open from net2) or no longer visible from net2. do you have an idea to solve these problems? thanks, darkyz -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] 3.6.0 Domain trusts broken
On 11/10/11 22:16, Jeremy Allison wrote: On Tue, Oct 11, 2011 at 06:44:18PM +0100, Alex Crow wrote: Hi all, Since the winbind refactoring in Samba 3.6.0, interdomain trusts between Samba servers seem to be broken in that being able to resolve or modify file permissions on the other domain work only very intermittently (eg about once out of 10 tries). This is regardless of whether I use idmap_rid or idmap_ldap as the backend. I set up two 3.6.0 domain controllers with an XP client attached to each, and trying to add permissions from the trusted domain by choosing the domain and hitting the Add then Advanced buttons and then the Find Now mostly brings up a password prompt - any credentials entered here still cause the listing of users/groups/security principals to fail with a Login failure: unknown name or bad password dialog. However I can still log in to either domain from XP with no issues. More details please. That and debug level 10 logs attached to a bug report in the failing and succeeding case would help a lot. Thanks, Jeremy. Jeremy, Very busy lately - just saw this, thanks. I will see when I can get some logs back to you. Cheers again, Alex -- This message is intended only for the addressee and may contain confidential information. Unless you are that person, you may not disclose its contents or use it in any way and are requested to delete the message along with any attachments and notify us immediately. Transact is operated by Integrated Financial Arrangements plc Domain House, 5-7 Singer Street, London EC2A 4BQ Tel: (020) 7608 4900 Fax: (020) 7608 5300 (Registered office: as above; Registered in England and Wales under number: 3727592) Authorised and regulated by the Financial Services Authority (entered on the FSA Register; number: 190856) -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Password expires every month even though 'Password Must Change' is set to 'never' (Samba+LDAP)
Sounds like you've checked mostly all except your ldap backend... Check your LDAP DB for... (they will be in nix timestamp) sambaPasswordCanChange sambaPasswordLastSet sambaPasswordMustChange setup smbldap-tools package On 10/13/2011 11:00 PM, Jeffrey Chan wrote: I'm using OpenLDAP as backend. On Wed, Oct 12, 2011 at 11:16 PM, Aaron E.ssures...@gmail.com wrote: Just cuirous are you using pam or ldap backend? On 10/12/2011 09:22 AM, Marco Ciampa wrote: On Wed, Oct 12, 2011 at 12:15:16PM +0800, Jeffrey Chan wrote: Hi all, I've posted this a month ago but haven't gotten a reply. Can anyone please help? - Jeff On Mon, Aug 29, 2011 at 5:14 PM, Jeffrey Changoofri...@gmail.com wrote: Hi all, Since a few months ago Samba ask each of our users to change password at log on every month and I have not been able to disable it. I found this page and follow the instructions: http://playingwithsid.**blogspot.com/2010/12/change-** samba-password-expiry-setting.**htmlhttp://playingwithsid.blogspot.com/2010/12/change-samba-password-expiry-setting.html The default ‘Password Must Change’ policy was set to never and pdbedit shows ‘Password Must Change: never’ for each user, yet the passwords still get expire once a month. Can anyone please give me some pointers? - Jeff Just a hint (maybe wrong...) obey pam restrictions = No ... -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/**mailman/options/sambahttps://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Password expires every month even though 'Password Must Change' is set to 'never' (Samba+LDAP)
On Fri, Oct 14, 2011 at 12:31 AM, Jeffrey Chan goofri...@gmail.com wrote: I've commented out #defaultMaxPasswordAge months ago. I also used pdbedit and net sam policy to set Maximum Password Age to -1. When I run pdbedit -Lv on each user, it all says Password Must Change: never. Okay. Did you run 'smbldap-populate' after the change? Upen -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] add to the windows local group
2011/10/14 Андрей Гребенников grebenni...@sarenergo.ru: Hello people! How could I add a samba group to the local administrators windows group when a windows machine joinds to the samba domain? As I see the Domain Admins group has added already, but I need to add one more. it is my understanding that Windows itself adds the Domain Admins group, if it exists and is groupmaped correctly in the samba3 PDC. I'm not aware of a way to make Windows add more groups at join time, but once it's joined you can certainly push groups remotely. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] ACL with ActiveDirectory@Groups
yes On Fri, Oct 14, 2011 at 1:10 PM, Daniel Müller muel...@tropenklinik.dewrote: Greetings, MSOffice-file? --- EDV Daniel Müller Leitung EDV Tropenklinik Paul-Lechler-Krankenhaus Paul-Lechler-Str. 24 72076 Tübingen Tel.: 07071/206-463, Fax: 07071/206-499 eMail: muel...@tropenklinik.de Internet: www.tropenklinik.de --- -Ursprüngliche Nachricht- Von: samba-boun...@lists.samba.org [mailto:samba-boun...@lists.samba.org] Im Auftrag von alberto.atz...@ext.jrc.ec.europa.eu Gesendet: Freitag, 14. Oktober 2011 10:37 An: samba@lists.samba.org Betreff: [Samba] ACL with ActiveDirectory@Groups Dear All, I'm new on this group.Greetings to all. I have problem with this smb.conf share section (I'm not samba admin, but I know this configuration) smb.conf 3.5.8 ### [AD-test-acl] comment = AD-test-acl path = /fs-e/AD/group/AD-test-acl read only = No create mask = 0770 directory mask = 0770 inherit permissions = Yes inherit acls = Yes browseable = No blocking locks = No delete readonly = Yes dos filetime resolution = Yes vfs objects = zfsacl nfs4:acedup = merge nfs4:chown = yes nfs4:mode = special # the issue are: users network 1 when trying to edit a file the user cannot save the file due to incorrect permissions, however it seems that even though an error is given the file is still saved. the file however then has readonly permission set and can no longer be used. Removing the readonly permission (properties) sometimes results in either the file being no longer visible (not always) or the file being no longer readable (again not always) - seems to depend on the user? users network 2 when trying to edit a file the user cannot save the file due to incorrect permissions, however a copy of the file is saved again the copy of the file is set to readonly and removing the readonly property may result in the file becoming unusable (can no longer open from net2) or no longer visible from net2. do you have an idea to solve these problems? thanks, darkyz -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] tattooing of tdbsam backend with logon script value
On 07/08/11 00:23, Chris Smith wrote: All users whose logon script values have not been explicitly defined automagically inherit the value that logon script is set to in smb.conf. And one can change the logon script for all such users simply by changing said value in smb.conf. However, once a logon script value value has been explicitly defined for a user this inheritance ability (as the explicit definition should not be overwritten) seems forever lost. I have not found a method to undo this tattooed state to allow for the automagic inheritance of the smb.conf logon script value. Therefore said users, who have once had an explicitly defined logon script value can (seemingly) no longer returned to the state where they use whatever logon script is defined in smb.conf. Is there a way to reset said users, removing the tattooing effect? Thanks, Chris Hi Chris If this is still relavent to you, I've found a work around. The tdbtool dump of the user entry looked identical to the original after doing this. My user was logged out at the time. Note the users current settings (including SID) #pdbedit -Lvu bill Delete their account: #pdbedit -x -u bill Recreate it: #smbpasswd -a bill Change their SID to their old one: #pdbedit -r -u bill -U S-9-9-99-SCRAMBLED-SCRAMBLED-SCRAMBLED-FAKE You'd also obviously change any other cusom settings they had. This has worked for me with no noticable side effects, but it feels very hackish, maybe others have a better way. Also, a bit of background info I found while trying to fix this problem. Looking at the passdb.tdb with tbdtool, you can see that there is one extra byte (Ox01) in an entry with the logon script set to '' , compared to a 'fresh' entry (that does use the smb.conf defaultlogonscript) It would be much nicer if pdbedit had an option to reset this ... hint hint) tdbtool has a very rustic interface, a particular quirk is that you need to append '\0' to the key name to find the user entry. #tdbtool /var/lib/samba/passdb.tdb show USER_bill\0 If you could figure out how to drive tdbtool's 'store KEY DATA ' you would probably be able to modify the entry in one step, but this seems a even more hackish. Hope this helped Pat -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [SCM] Samba Shared Repository - branch master updated
Hello Andrew, On two of my machines with this patchset I have this error: samba version 4.0.0alpha18-DEVELOPERBUILD started. Copyright Andrew Tridgell and the Samba Team 1992-2011 Called with maxruntime 7500 - current ts 1318577424 samba: using 'standard' process model Failed to start service 'rpc' - NT_STATUS_INVALID_SYSTEM_SERVICE Starting Services failed - NT_STATUS_INVALID_SYSTEM_SERVICE ./bin/samba failed with status 1! Lookup failed - NT_STATUS_IO_TIMEOUT Lookup failed - NT_STATUS_HOST_UNREACHABLE Lookup failed - NT_STATUS_IO_TIMEOUT Lookup failed - NT_STATUS_HOST_UNREACHABLE Lookup failed - NT_STATUS_IO_TIMEOUT Lookup failed - NT_STATUS_HOST_UNREACHABLE Lookup failed - NT_STATUS_IO_TIMEOUT Lookup failed - NT_STATUS_HOST_UNREACHABLE Lookup failed - NT_STATUS_IO_TIMEOUT Lookup failed - NT_STATUS_HOST_UNREACHABLE Lookup failed - NT_STATUS_IO_TIMEOUT Lookup failed - NT_STATUS_HOST_UNREACHABLE SAMBA LOG of: LOCALDC samba version 4.0.0alpha18-DEVELOPERBUILD started. Copyright Andrew Tridgell and the Samba Team 1992-2011 Called with maxruntime 7500 - current ts 1318577424 samba: using 'standard' process model Failed to start service 'rpc' - NT_STATUS_INVALID_SYSTEM_SERVICE Starting Services failed - NT_STATUS_INVALID_SYSTEM_SERVICE ./bin/samba failed with status 1! I bissect and found that it's the first patch b21b012756dbb9e7022280b34d7103a5dcbea6d6 that is causing the error. Can you have a look ? On 11/10/2011 06:14, Andrew Bartlett wrote: The branch, master has been updated via 4549862 gensec: trim header includes back to what is actually required via 534355f auth/credentials Declare remaining functions are public interfaces and put into credentials.h via fe02752 auth: move gensec_start.c to the top level via 561d834 auth: move credentials layer to the top level via 1255383 s4-s3-upgrade: Allow import (just without a uid mapping) where getpwnam fails via c9bb497 lib/param Avoid dyn_ defines that are not provided by the autoconf build via 1e5af9e lib/param Use strcasecmp_m rather than strcasecmp as this is banned in the s3 includes.h via 8f2741b lib/param Use talloc_strdup rather than strdup as strdup is banned in the s3 includes.h via 1b81af0 lib/param Avoid the name string_set as this is already used in the s3 param code via 15c97a8 lib/param Avoid the use of the name service_ok() which is used in the s3 param code via d0ecd1a lib/param: Remove unused #include of lib/socket/socket.h via 26de383 libcli/smb Move CSC_POLICY_* definition to smb_constants.h via b21b012 lib/param move source4 param code to the top level from 6bed577 pac: Fix wrong memory allocation check http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 454986298aa5696b0b029e2feba0109617aaf968 Author: Andrew Bartlettabart...@samba.org Date: Sun Oct 9 23:28:15 2011 +1100 gensec: trim header includes back to what is actually required Autobuild-User: Andrew Bartlettabart...@samba.org Autobuild-Date: Tue Oct 11 06:13:08 CEST 2011 on sn-devel-104 commit 534355fecf5a14a36ec5a3d643bcf2140df2da4e Author: Andrew Bartlettabart...@samba.org Date: Sun Oct 9 23:27:44 2011 +1100 auth/credentials Declare remaining functions are public interfaces and put into credentials.h This is in preperation for this file being used by s3, and recognises that these are all reasonable, public interfaces but were not declared as such in the past. Andrew Bartlett commit fe02752ed6493efb7af28faa3d64d9fd7895d6f1 Author: Andrew Bartlettabart...@samba.org Date: Fri Oct 7 17:24:12 2011 +1100 auth: move gensec_start.c to the top level This does not change who uses gensec for now, but makes it possible to write new gensec modules outside source4/ Andrew Bartlett commit 561d834123a2a8a96954f7cca556f8838ab38b72 Author: Andrew Bartlettabart...@samba.org Date: Fri Oct 7 17:20:33 2011 +1100 auth: move credentials layer to the top level This will allow gensec_start.c to move to the top level. This does not change what code uses the cli_credentials code, but allows the gensec code to be more broadly. Andrew Bartlett commit 1255383140a9b3fbd957c1f7ce47e89c17cc4eda Author: Andrew Bartlettabart...@samba.org Date: Mon Oct 10 13:09:30 2011 +1100 s4-s3-upgrade: Allow import (just without a uid mapping) where getpwnam fails This allows the tests to pass on systems without a jelmer user :-) Andrew Bartlett commit c9bb497f3f7fae8aa6ec4a4a45a2ac4047b640a5 Author: Andrew Bartlettabart...@samba.org Date: Sun Oct 9 23:25:11 2011 +1100 lib/param Avoid dyn_ defines that are not provided by the autoconf build The autoconf build will never use these parameters or load the smb.conf with these defaults, so the defaults are not
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/2011-10-14-1248/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-10-14-1248/samba3.stderr http://git.samba.org/autobuild.flakey/2011-10-14-1248/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-10-14-1248/samba4.stderr http://git.samba.org/autobuild.flakey/2011-10-14-1248/samba4.stdout The top commit at the time of the failure was: commit 7a0b5d6fc51d5d212529e82e5ed8e21516bfbe27 Author: Frank Lahm frankl...@googlemail.com Date: Thu Oct 13 15:41:53 2011 -0700 Add support for VFS op streaminfo chaining in all relevant VFS modules. Autobuild-User: Jeremy Allison j...@samba.org Autobuild-Date: Fri Oct 14 03:26:06 CEST 2011 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 69da026 s3-waf: install passdb headers.
via 1113725 s3-passdb: remove libwbclient header dependency for
passdb/lookup_sid.h.
via 876f48f s3-passdb: remove fstring from
pdb_set_user_sid_from_string().
via d47c254 s3-passdb: add define guards for machine_sid.h.
via 2a5afff s3-passdb: add {LM|NT}_HASH_LEN defines in passdb.h.
via d6a1867 s3-passdb: use uintX_t at least in headers.
via d981ceb s3-passdb: move passdb prototypes into passdb.h
via c6964c6 s3-passdb: move group mapping headers into passdb.h
via 06aec03 s3-auth: token_util needs system/passwd.h.
via 46e7ab3 s3: remove some dead prototypes.
from 7a0b5d6 Add support for VFS op streaminfo chaining in all relevant
VFS modules.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 69da026fd2208147d63ab120f0037ba846d6
Author: Günther Deschner g...@samba.org
Date: Tue Sep 27 18:23:39 2011 +0200
s3-waf: install passdb headers.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Fri Oct 14 13:37:38 CEST 2011 on sn-devel-104
commit 111372541f63cf171d05107c95f7d6d71463ba6a
Author: Günther Deschner g...@samba.org
Date: Thu Oct 13 14:56:37 2011 +0200
s3-passdb: remove libwbclient header dependency for passdb/lookup_sid.h.
Guenther
commit 876f48ffb134f844de9846086fad66be15af98fb
Author: Günther Deschner g...@samba.org
Date: Thu Oct 13 14:55:32 2011 +0200
s3-passdb: remove fstring from pdb_set_user_sid_from_string().
Guenther
commit d47c25401a9a553f39be9adf079dc7c462244d81
Author: Günther Deschner g...@samba.org
Date: Thu Oct 13 14:54:51 2011 +0200
s3-passdb: add define guards for machine_sid.h.
Guenther
commit 2a5aff2beca0958b10cfd652f63825104c8a
Author: Günther Deschner g...@samba.org
Date: Wed Oct 12 15:51:19 2011 +0200
s3-passdb: add {LM|NT}_HASH_LEN defines in passdb.h.
Guenther
commit d6a1867349da01615e23a3715938193053838ce8
Author: Günther Deschner g...@samba.org
Date: Wed Oct 12 15:50:44 2011 +0200
s3-passdb: use uintX_t at least in headers.
Guenther
commit d981ceb464fac1504ed53a74e02be966c41a25d8
Author: Günther Deschner g...@samba.org
Date: Tue Sep 27 17:53:09 2011 +0200
s3-passdb: move passdb prototypes into passdb.h
Guenther
commit c6964c6b3eb326d8f72e5d3ccecb87ad142ac9f6
Author: Günther Deschner g...@samba.org
Date: Tue Sep 27 17:50:51 2011 +0200
s3-passdb: move group mapping headers into passdb.h
Guenther
commit 06aec034aeba625b0dddbe490af51cb8efd6568c
Author: Günther Deschner g...@samba.org
Date: Thu Oct 13 14:56:03 2011 +0200
s3-auth: token_util needs system/passwd.h.
Guenther
commit 46e7ab37bff3984757bed63e97152a76b81e7ed9
Author: Günther Deschner g...@samba.org
Date: Thu Oct 13 14:37:47 2011 +0200
s3: remove some dead prototypes.
Guenther
---
Summary of changes:
source3/auth/token_util.c|1 +
source3/groupdb/proto.h | 98 ---
source3/include/includes.h |1 -
source3/include/mapping.h| 33
source3/include/passdb.h | 382 +-
source3/passdb/lookup_sid.h |6 +-
source3/passdb/machine_sid.h |5 +
source3/passdb/pdb_get_set.c |2 +-
source3/passdb/proto.h | 325 ---
source3/smbd/proto.h |2 -
source3/wscript_build|6 +
11 files changed, 397 insertions(+), 464 deletions(-)
delete mode 100644 source3/groupdb/proto.h
delete mode 100644 source3/include/mapping.h
delete mode 100644 source3/passdb/proto.h
Changeset truncated at 500 lines:
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 0d47a3f..87f57b6 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -25,6 +25,7 @@
/* functions moved from auth/auth_util.c to minimize linker deps */
#include includes.h
+#include system/passwd.h
#include auth.h
#include secrets.h
#include memcache.h
diff --git a/source3/groupdb/proto.h b/source3/groupdb/proto.h
deleted file mode 100644
index 75d5c39..000
--- a/source3/groupdb/proto.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * Group Mapping Database
- *
- * Copyright (C) Andrew Tridgell 1992-2006
- * Copyright (C) Jean François Micouleau 1998-2001
- * Copyright (C) Gerald Carter2006
- * Copyright (C) Volker Lendecke 2006
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
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/2011-10-14-1448/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-10-14-1448/samba3.stderr http://git.samba.org/autobuild.flakey/2011-10-14-1448/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-10-14-1448/samba4.stderr http://git.samba.org/autobuild.flakey/2011-10-14-1448/samba4.stdout The top commit at the time of the failure was: commit 69da026fd2208147d63ab120f0037ba846d6 Author: Günther Deschner g...@samba.org Date: Tue Sep 27 18:23:39 2011 +0200 s3-waf: install passdb headers. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Fri Oct 14 13:37:38 CEST 2011 on sn-devel-104
[SCM] SAMBA-CTDB repository - branch v3-6-ctdb updated - 193ba564dcf84b992b26fbeb71d90103aeac99bd
The branch, v3-6-ctdb has been updated discards 02eb2b0960df4513ac16443a7421431b4b61a67a (commit) discards d4bd8d0a661623d68225fb9fa5b40f49ae6e2ddb (commit) discards 6e0413f9c5edec5ed3520809e9d941f881c677a3 (commit) discards 07dc608db2ebad9b4cc64e94eedcad7d448ca6fb (commit) discards 6e6676e1f7f3ebd1d96f45acf91febaa38fe6e43 (commit) discards 29e1feb2e0d50b8b18d11b86c3f64f249234fc9f (commit) discards 9333ccfae5da88f0ff36225ec40dc3f086cb67a6 (commit) discards a538de1136c68afda406a06c1304da0ccd479dba (commit) discards 84284105c61fa77b8016a8ee864a3db144bb991b (commit) discards f000308eafa8025318fca70aff6ab275f12dbbe3 (commit) discards 6c2b4120433d46c4144dab08472d2cdc6d86cf22 (commit) discards 4113c3d38bdb18ca546b73678130b75222d229c8 (commit) discards 0b99d88e9b8cc33c566b17d29a2fb807c40cbc0c (commit) discards d6c49c82b28a228490d97be01b9a5e70172a017c (commit) discards 2ee3757cf0eb91912469a18880122cfe47706751 (commit) discards 39e76429df3f5c9518bd7798b2950ea06e72cc41 (commit) discards a10b4ba989e53d4033acf327a4ebaf7293aa3a74 (commit) discards efe7dc857c0f13977dd6e517b9be9c0b011bffba (commit) discards 085371ba5224dda82bd19f36095f946d2102edd5 (commit) discards a7e2caa2caec1a23effb9e0f9b421e1728990a63 (commit) discards b47932ed286860ee4d8b74e091e018e805a77291 (commit) discards feac0b2092780be4a9b74c57bc4355b578201965 (commit) discards 5afce84bb0c29778c4d6708d04aeb4fc0b179982 (commit) discards 648da290cd2a8d0aac0834ecff3127947318dec2 (commit) discards 9550bb3ebcc5c4023fe8ba0b4aa34d6022d67b15 (commit) discards 123152674072979a52a8f2dd6a85407bc90cc621 (commit) discards 7875217825eb1967a60ccbba24fdbc6fea8530d5 (commit) discards 762079250503e6eb02f876be65df6ff8ad8c4f19 (commit) discards b05728d3f48eb95eae1ce84727df5d63d87f3d75 (commit) discards bda838b736da7398aef647173a2a11c7c8278ed6 (commit) discards 7d0751acbe98956396a636b164d831304994643d (commit) discards db02cd58223bd1647be48bc2483e0516050f6073 (commit) via 193ba564dcf84b992b26fbeb71d90103aeac99bd (commit) via 9ad2fab0747439549cabfc350ec83f031839b186 (commit) via 8c20d28353181dafd706de83e873f4e18ab93d58 (commit) via 33500ec7a1861befcdcf682c344a85751e5c7dd5 (commit) via 9d66e568997301729dd447b3d49cc799fcedebf5 (commit) via 2b0775f03461e5e6847fbd9663cc4a1c7da4c0c3 (commit) via f068c74707558022a5355ae26c8b9e15f2c03af5 (commit) via ba1d0f4794baf6481b7b10ff73af8898a9c408e6 (commit) via 9a6743a723771fa02856bfa73a95777b29d89722 (commit) via 7dda5f91edced0f1455fbeb0fd1bef8724a8aeef (commit) via c5bdedfbe31b3471e5842f14e5957579d66c7e04 (commit) via 86cf9d715d0c1a8b22384cddd5958cd7126259d4 (commit) via 2efe6f34824775c639e13da05cc9669e2f3fe341 (commit) via abf869bf0b94f1db8bb55df738fb507da4130613 (commit) via b9344f5b5bce1bd1991964712ae964beffe7be34 (commit) via 998efcfcfda91eee1ba5525ae431307dc6abd589 (commit) via 2fd0bbedcdb933ab37b96a6eefbdc73eb7f66eaa (commit) via d4dafd5b2f39951a419e3d23afd9060f5f2ad57b (commit) via 6fb16c964c3049bfb075567da88d4682b75de05d (commit) via 5d6f8d75c355201f3c3e9ceaac2a98876e5a6c78 (commit) via 54a99fd543e1fc0c90d303cc9d54556b8185cdf6 (commit) via ae9f3f3d41f25618e2e1f0b206c4c4032bdf1509 (commit) via b33324e39d4d76a473b65d9c9c2715da028fa96f (commit) via 042c1b4235343ba71be71c7dc890737d334ba68d (commit) via 67d7021d958338c434678fe68fdbce0b70c133a7 (commit) via cef0d19fc5f93879d81eb93cd91c99b547dd51d0 (commit) via cb4b54222558c692db3b842b5c29a6660a5fc478 (commit) via 9819af1160d5d3417558bfb3f02f0eca1ac59a5a (commit) via a79eb8ecbdf2549633b44b48479c7227dc2e99ac (commit) via 8451ba780e29ff2f120b7627b1620b57cb07d409 (commit) via fc02a38a8603c3625294c723dbeab01358be1f81 (commit) via 22eb4521f9ccb1af593b10d94154b039dee94e33 (commit) via a66b2044c5c4135532bce3c5e9db31e2cdab3ae1 (commit) via ae4c59c273d42ff53bc53e5192480aece471f6f0 (commit) via 773f54d4a0aef688f7f9b59b8b2186d150af70c1 (commit) via 0fa9d32ebafcd305053410be0583e0e17b17585d (commit) via 301c213266fbfb2e548aa4ea962059475cb9d214 (commit) from 02eb2b0960df4513ac16443a7421431b4b61a67a (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-6-ctdb - Log - commit 193ba564dcf84b992b26fbeb71d90103aeac99bd Author: Michael Adam ob...@samba.org Date: Thu Oct 13 17:18:21 2011 +0200 v3-6-ctdb:VERSION: bump the ctdb vendor patch level to 28 commit 9ad2fab0747439549cabfc350ec83f031839b186 Author: Christian Ambach a...@samba.org Date: Tue Oct 4 15:23:07 2011 +0200 v3-6-ctdb:VERSION: bump ctdb vendor patch level to 27 commit 8c20d28353181dafd706de83e873f4e18ab93d58 Author: Michael Adam ob...@samba.org Date: Fri
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b15d325 s3:net registry: fix segfault when net registry is called
without subcommands...
via 0ef506d libreplace: add a missing eval to the
AC_VERIFY_C_PROTOTYPE macro
via df9c4b0 s3-utils: add capabilities to dbwrap_tool
from 69da026 s3-waf: install passdb headers.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b15d3251ac32a51492120db09d6b7d6fdbca70b0
Author: Michael Adam ob...@samba.org
Date: Fri Oct 14 16:19:03 2011 +0200
s3:net registry: fix segfault when net registry is called without
subcommands...
Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Fri Oct 14 17:51:53 CEST 2011 on sn-devel-104
commit 0ef506d4f31d206c300e4f3f326edac2b60bdc15
Author: Michael Adam ob...@samba.org
Date: Fri Oct 14 14:05:09 2011 +0200
libreplace: add a missing eval to the AC_VERIFY_C_PROTOTYPE macro
Without this eval, upon test success the corresponding actions
(like defining corresponding variables) are not taken.
Found by Timur I. Bakeyev, and based on his patch for 3.5.
commit df9c4b070288eaa36d775b5a3574440b20168307
Author: Björn Baumbach b...@sernet.de
Date: Fri Oct 14 12:22:16 2011 +0200
s3-utils: add capabilities to dbwrap_tool
Make it possible to work with strings in addition to int32 and uint32.
Signed-off-by: Michael Adam ob...@samba.org
---
Summary of changes:
lib/replace/libreplace_macros.m4 |2 +-
source3/utils/dbwrap_tool.c | 55 ++---
source3/utils/net_registry.c |1 +
3 files changed, 40 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/libreplace_macros.m4 b/lib/replace/libreplace_macros.m4
index 46aedd3..42b8847 100644
--- a/lib/replace/libreplace_macros.m4
+++ b/lib/replace/libreplace_macros.m4
@@ -298,7 +298,7 @@ AC_DEFUN(AC_VERIFY_C_PROTOTYPE,
eval AS_TR_SH([ac_cv_c_prototype_$1])=no
])
)
-AS_IF([test $AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4])
+AS_IF([eval test $AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4])
])
AC_DEFUN(LIBREPLACE_PROVIDE_HEADER,
diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c
index fd599dd..5d30c93 100644
--- a/source3/utils/dbwrap_tool.c
+++ b/source3/utils/dbwrap_tool.c
@@ -4,6 +4,7 @@
low level TDB/CTDB tool using the dbwrap interface
Copyright (C) 2009 Michael Adam ob...@samba.org
+ Copyright (C) 2011 Bjoern Baumbach b...@sernet.de
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
@@ -25,14 +26,15 @@
#include dbwrap/dbwrap.h
#include dbwrap/dbwrap_open.h
#include messages.h
+#include util_tdb.h
typedef enum { OP_FETCH, OP_STORE, OP_DELETE, OP_ERASE, OP_LISTKEYS }
dbwrap_op;
-typedef enum { TYPE_INT32, TYPE_UINT32 } dbwrap_type;
+typedef enum { TYPE_INT32, TYPE_UINT32, TYPE_STRING } dbwrap_type;
static int dbwrap_tool_fetch_int32(struct db_context *db,
const char *keyname,
- void *data)
+ const char *data)
{
int32_t value;
NTSTATUS status;
@@ -50,7 +52,7 @@ static int dbwrap_tool_fetch_int32(struct db_context *db,
static int dbwrap_tool_fetch_uint32(struct db_context *db,
const char *keyname,
- void *data)
+ const char *data)
{
uint32_t value;
NTSTATUS ret;
@@ -68,10 +70,10 @@ static int dbwrap_tool_fetch_uint32(struct db_context *db,
static int dbwrap_tool_store_int32(struct db_context *db,
const char *keyname,
- void *data)
+ const char *data)
{
NTSTATUS status;
- int32_t value = *((int32_t *)data);
+ int32_t value = (int32_t)strtol(data, NULL, 10);
status = dbwrap_trans_store_int32(db, keyname, value);
@@ -86,10 +88,10 @@ static int dbwrap_tool_store_int32(struct db_context *db,
static int dbwrap_tool_store_uint32(struct db_context *db,
const char *keyname,
- void *data)
+ const char *data)
{
NTSTATUS status;
- uint32_t value = *((uint32_t *)data);
+ uint32_t value = (uint32_t)strtol(data, NULL, 10);
status = dbwrap_trans_store_uint32(db, keyname, value);
@@ -103,9 +105,28 @@ static int dbwrap_tool_store_uint32(struct db_context *db,
return 0;
}
+static int dbwrap_tool_store_string(struct db_context *db,
+ const char *keyname,
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via af82bf2 s3-net: Fix uninitialized variable in
rpc_conf_import_internal().
via d810ada Fix sys_fseek wrapper
via 6af702b build: added autoconf --disable-silent-rules option
from b15d325 s3:net registry: fix segfault when net registry is called
without subcommands...
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit af82bf2ac574b17cd2f7442f13928848d7d5a1e3
Author: Günther Deschner g...@samba.org
Date: Fri Oct 14 16:51:07 2011 +0200
s3-net: Fix uninitialized variable in rpc_conf_import_internal().
Michael, please check.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Fri Oct 14 19:25:47 CEST 2011 on sn-devel-104
commit d810ada39c584fd2a543f41fb3a121520ab0764e
Author: Brad Smith b...@comstyle.com
Date: Wed Oct 12 04:23:58 2011 -0400
Fix sys_fseek wrapper
Signed-off-by: Günther Deschner g...@samba.org
commit 6af702bdc9ea36a1f33232a818a819afde9bc4d2
Author: Sumit Bose sb...@redhat.com
Date: Thu Oct 6 10:32:58 2011 +0200
build: added autoconf --disable-silent-rules option
Signed-off-by: Günther Deschner g...@samba.org
---
Summary of changes:
buildtools/wafsamba/wscript |3 +++
source3/configure.in |2 +-
source3/lib/system.c |2 ++
source3/utils/net_rpc_conf.c |2 +-
source3/wscript |4 ++--
5 files changed, 9 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 1a7f3eb..5c5e249 100755
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -162,6 +162,9 @@ def set_options(opt):
opt.add_option('--disable-dependency-tracking',
help=SUPPRESS_HELP,
action='store_true',
dest='AUTOCONF_DISABLE_DEPENDENCY_TRACKING', default=False)
+opt.add_option('--disable-silent-rules',
+ help=SUPPRESS_HELP,
+ action='store_true', dest='AUTOCONF_DISABLE_SILENT_RULES',
default=False)
gr = opt.option_group('dist options')
gr.add_option('--sign-release',
diff --git a/source3/configure.in b/source3/configure.in
index 7405cfd..7780603 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1085,7 +1085,7 @@ AC_CHECK_FUNCS(getgrset)
AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups sysconf stat64 fstat64)
AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt lseek64 ftruncate64
posix_fallocate posix_fallocate64)
AC_CHECK_FUNCS(fallocate fallocate64)
-AC_CHECK_FUNCS(fseek64 fseeko64 ftell64 ftello64 setluid getpwanam)
+AC_CHECK_FUNCS(fseeko fseek64 fseeko64 ftell64 ftello64 setluid getpwanam)
AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64)
AC_CHECK_FUNCS(fdopendir fdopendir64)
AC_CHECK_FUNCS(getpwent_r)
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 0aefd6d..45fe77e 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -734,6 +734,8 @@ int sys_fseek(FILE *fp, SMB_OFF_T offset, int whence)
return fseek64(fp, offset, whence);
#elif defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) defined(LARGE_SMB_OFF_T)
defined(HAVE_FSEEKO64)
return fseeko64(fp, offset, whence);
+#elif defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) defined(LARGE_SMB_OFF_T)
defined(HAVE_FSEEKO)
+ return fseeko(fp, offset, whence);
#else
return fseek(fp, offset, whence);
#endif
diff --git a/source3/utils/net_rpc_conf.c b/source3/utils/net_rpc_conf.c
index 3dec375..68d5df2 100644
--- a/source3/utils/net_rpc_conf.c
+++ b/source3/utils/net_rpc_conf.c
@@ -1146,7 +1146,7 @@ static NTSTATUS rpc_conf_import_internal(struct
net_context *c,
struct smbconf_service *service = NULL;
struct smbconf_service **services = NULL;
uint32_t num_shares, i;
- sbcErr err;
+ sbcErr err = SBC_ERR_UNKNOWN_FAILURE;
WERROR werr = WERR_OK;
NTSTATUS status = NT_STATUS_OK;
diff --git a/source3/wscript b/source3/wscript
index 82434a5..6717852 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -82,7 +82,7 @@ def configure(conf):
conf.CHECK_FUNCS('initgroups select poll rdchk getgrnam getgrent pathconf')
conf.CHECK_FUNCS('setpriv setgidx setuidx setgroups sysconf stat64
fstat64')
conf.CHECK_FUNCS('lstat64 fopen64 atexit grantpt lseek64 ftruncate64
fallocate fallocate64 posix_fallocate posix_fallocate64')
-conf.CHECK_FUNCS('fseek64 fseeko64 ftell64 ftello64 setluid')
+conf.CHECK_FUNCS('fseeko fseek64 fseeko64 ftell64 ftello64 setluid')
conf.CHECK_FUNCS('getpwnam', headers='sys/types.h pwd.h')
conf.CHECK_FUNCS('opendir64 readdir64 seekdir64 telldir64 rewinddir64
closedir64')
conf.CHECK_FUNCS('fdopendir fdopendir64')
@@ -234,7 +234,7 @@ extattr_get_link
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 15b8efe s3:dbwrap_ctdb: return the number of records in
db_ctdb_traverse() for persistent dbs
from af82bf2 s3-net: Fix uninitialized variable in
rpc_conf_import_internal().
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 15b8efeae3b0133ae60a8ce582e4ca4d4dbe6bb1
Author: Stefan Metzmacher me...@samba.org
Date: Fri Oct 14 16:11:06 2011 +0200
s3:dbwrap_ctdb: return the number of records in db_ctdb_traverse() for
persistent dbs
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Fri Oct 14 20:59:37 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/lib/dbwrap/dbwrap_ctdb.c | 18 +++---
1 files changed, 15 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index e0f98cc..38a3395 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -1297,12 +1297,21 @@ static int db_ctdb_traverse(struct db_context *db,
return ret;
}
if (ctx-transaction ctx-transaction-m_write) {
- /* we now have to handle keys not yet present at
transaction start */
+ /*
+* we now have to handle keys not yet
+* present at transaction start
+*/
struct db_context *newkeys = db_open_rbt(talloc_tos());
struct ctdb_marshall_buffer *mbuf =
ctx-transaction-m_write;
struct ctdb_rec_data *rec=NULL;
NTSTATUS status;
int i;
+ int count = 0;
+
+ if (newkeys == NULL) {
+ return -1;
+ }
+
for (i=0; imbuf-count; i++) {
TDB_DATA key;
rec =db_ctdb_marshall_loop_next(mbuf, rec,
@@ -1317,9 +1326,12 @@ static int db_ctdb_traverse(struct db_context *db,
status = dbwrap_traverse(newkeys,
traverse_persistent_callback_dbwrap,
state,
-NULL);
- ret = NT_STATUS_IS_OK(status) ? 0 : -1;
+count);
talloc_free(newkeys);
+ if (!NT_STATUS_IS_OK(status)) {
+ return -1;
+ }
+ ret += count;
}
return ret;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e02f951 Removed unused variable.
via 7c66373 Remove unused function.
via 7f65594 Fix printf warning.
via f4a41ce Fix const warnings.
via 744dd6b Fix const warnings.
via abe5afc Fix bug with Samba not recognising an 6to4 IPv6 interface.
via acc2870 Fix const warning.
from 15b8efe s3:dbwrap_ctdb: return the number of records in
db_ctdb_traverse() for persistent dbs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e02f9510d039242ac012658aa67e235c68d45fe1
Author: Jeremy Allison j...@samba.org
Date: Fri Oct 14 14:02:39 2011 -0700
Removed unused variable.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Sat Oct 15 00:38:28 CEST 2011 on sn-devel-104
commit 7c663731bad107277a2b13616e70eea8cc681d1c
Author: Jeremy Allison j...@samba.org
Date: Fri Oct 14 14:01:24 2011 -0700
Remove unused function.
commit 7f655945e4c223c45d6b87c7d5d65e54e7fe84de
Author: Jeremy Allison j...@samba.org
Date: Fri Oct 14 13:53:53 2011 -0700
Fix printf warning.
commit f4a41ce5a6f050fd4b46da8d85b4125791d26560
Author: Jeremy Allison j...@samba.org
Date: Fri Oct 14 13:51:26 2011 -0700
Fix const warnings.
commit 744dd6bcbe7e078daac150d9e7be60c89985b510
Author: Jeremy Allison j...@samba.org
Date: Fri Oct 14 13:48:53 2011 -0700
Fix const warnings.
commit abe5afc580dcaaab70f136904d98fa83bfae7b6e
Author: Matthieu Patou m...@samba.org
Date: Fri Oct 14 13:45:48 2011 -0700
Fix bug with Samba not recognising an 6to4 IPv6 interface.
The 6to4 interface has the flags IFF_POINTTOPOINT interface but no
ifa_dstaddr as it's not at the IPv6 level a point to point interface
(at least from my understanding), as we don't have a IFF_BROADCAST
flag set (I have the impression that this flag is only set on a
interface that has also an IPv4 address) the first test is not valid
also, which result in a skipped interface.
commit acc28706b54f2c7038d0b6cee106d99f1a6797ac
Author: Jeremy Allison j...@samba.org
Date: Fri Oct 14 13:20:07 2011 -0700
Fix const warning.
---
Summary of changes:
lib/socket/interfaces.c| 19 ---
lib/util/charset/util_unistr_w.c |8
source3/libsmb/cliconnect.c|2 +-
source3/modules/vfs_scannedonly.c |1 -
source3/utils/net_registry_check.c | 18 --
source4/torture/smb2/connect.c |2 +-
6 files changed, 22 insertions(+), 28 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/socket/interfaces.c b/lib/socket/interfaces.c
index 618714d..775956b 100644
--- a/lib/socket/interfaces.c
+++ b/lib/socket/interfaces.c
@@ -77,7 +77,7 @@ static void make_bcast_or_net(struct sockaddr_storage
*pss_out,
bool make_bcast_p)
{
unsigned int i = 0, len = 0;
- char *pmask = NULL;
+ const char *pmask = NULL;
char *p = NULL;
*pss_out = *pss_in;
@@ -85,13 +85,13 @@ static void make_bcast_or_net(struct sockaddr_storage
*pss_out,
#if defined(HAVE_IPV6)
if (pss_in-ss_family == AF_INET6) {
p = (char *)((struct sockaddr_in6 *)pss_out)-sin6_addr;
- pmask = discard_const_p(char, ((struct sockaddr_in6
*)nmask)-sin6_addr);
+ pmask = (const char *)((const struct sockaddr_in6
*)nmask)-sin6_addr;
len = 16;
}
#endif
if (pss_in-ss_family == AF_INET) {
p = (char *)((struct sockaddr_in *)pss_out)-sin_addr;
- pmask = discard_const_p(char, ((struct sockaddr_in
*)nmask)-sin_addr);
+ pmask = (const char *)((const struct sockaddr_in
*)nmask)-sin_addr;
len = 4;
}
@@ -195,6 +195,19 @@ static int _get_interfaces(TALLOC_CTX *mem_ctx, struct
iface_struct **pifaces)
memcpy(ifaces[total].bcast,
ifptr-ifa_dstaddr,
copy_size);
+#if defined(HAVE_IPV6)
+ } else if (ifptr-ifa_addr-sa_family == AF_INET6) {
+ const struct sockaddr_in6 *sin6 =
+ (const struct sockaddr_in6 *)ifptr-ifa_addr;
+ const struct in6_addr *in6 =
+ (const struct in6_addr *)sin6-sin6_addr;
+
+ if (IN6_IS_ADDR_LINKLOCAL(in6) ||
IN6_IS_ADDR_V4COMPAT(in6)) {
+ continue;
+ }
+ /* IPv6 does not have broadcast it uses multicast. */
+ memset(ifaces[total].bcast, '\0', copy_size);
+#endif
} else {
continue;
}
diff --git a/lib/util/charset/util_unistr_w.c
