[Samba] R: question about groups
Thank you all very much for yoour answers I will try in a couple of hours and I will let you know the results And I will also check what does it mean that 2 leading 2770 ! Andrea -Messaggio originale- Da: TAKAHASHI Motonobu [mailto:mo...@monyo.com] Inviato: sabato 30 luglio 2011 20:27 A: d...@briannassaladdressing.com; Andrea Lanza Cc: samba@lists.samba.org Oggetto: Re: [Samba] question about groups From: Dale Schroeder d...@briannassaladdressing.com Date: Fri, 29 Jul 2011 12:30:31 -0500 Andrea, How about doing 'chmod 2770 /path/to/share' and also on all existing subfolders of /path/to/share. In the share definition, you could also add directory mask = 2770 force directory mode = 2770 Also you have to set chgrp group2 /path/to/share2, force group = group2, and force create mode set for example 660 To set those, files created under share2 always belongs to group2 and also has the 770 permission. --- TAKAHASHI Motonobu mo...@samba.gr.jp -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Why isn't Domain\User' = to User on PDC? Isn't it supposed to be?
When I access my PDC, via a unix service, from a Domain client with a domain login, the PDC attempts to validate Domain\User against the the authentication DB, but on a mounted file system, a user on the PDC = 'domain\user' ... (which is what I thought it should be). But if I use 'ssh Pdc', it authenticates as user 'Domain\User' Now I hacked around this for myself, by adding an entry to the /etc/passwd that dups my PDC usr, except prefixes it with the Domain name. in /etc/passwd: linda:x:1001:201:linda@localhost:/home/me:/bin/bash Domain\linda:x:1001:201:linda@Domain:/home/me:/bin/bash --- But that just seems 'wrong' Shouldn't pam_winbind, in the pam stack be 'Domain' PDC aware? Or would that just be an RFE?? How do others deal with the above issues? Or is something 'handling' them (i.e. doing the mapping?) Note, that wbinfo -u and wbinfo --domain=DOMAIN -u return identical lists. so why isn't pam_winbind treating DOMAIN\USER as USER? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] dbench strange results
Hi I'm building new samba server (on Debian 6.0, software RAID10 2TB, Xeon CPU). Generally everything is working fine, so I have decided to run some stress tests. My choice was dbench. Old server is Debian 4.0 (samba 3.0.24, Athlon 3000+, one ATA 160GB disk). So run dbench 16 on both old and new server The results are strange old serwer: about 300MB/sek (dbench 3.0) and below are first seconds of dbench output 16 1766 398.71 MB/sec warmup 1 sec 16 4852 334.46 MB/sec warmup 2 sec 16 7956 317.26 MB/sec warmup 3 sec 16 7 309.62 MB/sec warmup 4 sec 16 14357 298.27 MB/sec warmup 5 sec 16 17579 295.52 MB/sec warmup 6 sec 16 20912 294.48 MB/sec warmup 7 sec 16 24167 292.58 MB/sec warmup 8 sec .. new server: about 80MB/sek (dbench 4.0) and below are first seconds of dbench output 16 859 347.35 MB/sec warmup 1 sec latency 420.932 ms 16 1535 203.14 MB/sec warmup 2 sec latency 625.747 ms 16 2905 175.82 MB/sec warmup 3 sec latency 466.965 ms 16 3705 147.27 MB/sec warmup 4 sec latency 511.865 ms 16 5111 142.35 MB/sec warmup 5 sec latency 543.783 ms 16 5961 130.80 MB/sec warmup 6 sec latency 830.662 ms 16 7413 130.37 MB/sec warmup 7 sec latency 875.614 ms 16 8235 122.21 MB/sec warmup 8 sec latency 450.523 ms 16 8448 110.87 MB/sec warmup 9 sec latency 743.648 ms 16 9725 110.55 MB/sec warmup 10 sec latency 841.132 ms 16 10901 110.39 MB/sec warmup 11 sec latency 291.013 ms 16 12014 109.05 MB/sec warmup 12 sec latency 537.937 ms .. Please nore that on old server MB/sec are rather constant (about 300MB/s ) but on new one are dropping rapidly (at the end to about 80MB/s). So what is going on? the new server is really fast (tested with iozone). Regards P. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Lighttpd + Samba for read/write?
Hello On a Ubuntu host, I'd like to be able to read/write files in Lighttpd's /var/www from XP. By default, /var/www is owned by root.root, while Samba tutorials I read usually prefer to use nobody.nogroup. How should I configure things so that Lighttpd and Samba work well together in read/write mode? Thank you. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Lighttpd + Samba for read/write?
On 8/1/2011 7:41 AM, Gilles wrote: Hello On a Ubuntu host, I'd like to be able to read/write files in Lighttpd's /var/www from XP. I have Debian+Lighty+XP. By default, /var/www is owned by root.root, while Samba tutorials I read usually prefer to use nobody.nogroup. You sure about that? On Debian the owner of /var/www is www-data. Ubuntu is derived directly from Debian. I'd be surprised if it's that different. How should I configure things so that Lighttpd and Samba work well together in read/write mode? Thank you. May not be the perfect way to do it, but this has been working for me for quite some time: [www] path=/var/www browseable=yes writeable=yes fstype = Samba nt acl support = no valid users = stan admin users = root This is with a workgroup setup, not domain. Works fine. -- Stan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Lighttpd + Samba for read/write?
On Mon, 01 Aug 2011 08:03:11 -0500, Stan Hoeppner s...@hardwarefreak.com wrote: By default, /var/www is owned by root.root, while Samba tutorials I read usually prefer to use nobody.nogroup. You sure about that? On Debian the owner of /var/www is www-data. Ubuntu is derived directly from Debian. I'd be surprised if it's that different. Yes, it is (installed through apt-get): # ll /var/ drwxr-xr-x 2 root root 4096 2011-08-01 14:35 www/ May not be the perfect way to do it, but this has been working for me for quite some time: Thanks for the tip. I'm just concerned about who should own /var/www, and what access rights to give to /var/www so that Lighttpd and Samba work OK together. Also, I just install the following packages without knowing whether all of them are really needed: apt-get install samba samba-client samba-common samba-common-bin apt-get install smbfs winbind -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Problem using smbusers with samba 3.5.8.1 on AIX 5.2 TL11SP1 system
Hello. Thank you very much for this information. It solved the problem. :-) -Message d'origine- De : TAKAHASHI Motonobu [mailto:mo...@monyo.com] Envoyé : samedi 9 juillet 2011 07:22 À : GALVAN, Jean-Pierre Cc : youngjoh...@163.com; samba@lists.samba.org Objet : Re: [Samba] Problem using smbusers with samba 3.5.8.1 on AIX 5.2 TL11SP1 system -Message d'origine- De : youngjohn04 [mailto:youngjoh...@163.com] Envoyé : mercredi 6 juillet 2011 23:11 Did you specify username map = option in your smb.conf file? From: GALVAN, Jean-Pierre jean-pierre.gal...@sage.com Date: Thu, 7 Jul 2011 12:08:51 + Yes I did. Here's my smb.conf file (I removed the shared objetcs) : (snip) And here's my smbusers file : root = jpgalvan You have to specify workgroup\jpgalvan style in smbusers file instead of jpgalvan. * After Samba 3.0.8, workgroup\username style was recommended and after Samba 3.0.23b, workgroup\username style was required. Also you have to create smbuser for root. Please set log level = 3 (or above) and search check_ntlm_password in your log file if you do not work yet. --- TAKAHASHI Motonobu mo...@samba.gr.jp -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Lighttpd + Samba for read/write?
2011/8/1 Gilles gilles.gana...@free.fr: On Mon, 01 Aug 2011 08:03:11 -0500, Stan Hoeppner s...@hardwarefreak.com wrote: By default, /var/www is owned by root.root, while Samba tutorials I read usually prefer to use nobody.nogroup. You sure about that? On Debian the owner of /var/www is www-data. Ubuntu is derived directly from Debian. I'd be surprised if it's that different. Yes, it is (installed through apt-get): I think most of the tutorials advise you to change from the default root:root to www-data:www-data on this folder because this way you have a user dedicated to the web server. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] _netr_ServerAuthenticate3: netlogon_creds_server_check failed. Rejecting auth request
Sure enough, now that machines' passwords are passing the thirty day range, they are refusing to log on siting No logon server available. This is despite having evidence of their machine account passwords changning in LDAP (sambaPwdLastSet being updated). Some machines, oddly, will log on, but will then fail to retrieve resources from the PDC. I can confirm that these machines are no using cached credentials. Does anyone have a Samba 3.5/OpenLDAP PDC for Windows 7 clients? If so, I would like to compare your configuration/machine account ldif with my own to try and troubleshoot this. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Lighttpd + Samba for read/write?
On 8/1/2011 8:31 AM, Erwan Leroux wrote: 2011/8/1 Gilles gilles.gana...@free.fr: On Mon, 01 Aug 2011 08:03:11 -0500, Stan Hoeppner s...@hardwarefreak.com wrote: By default, /var/www is owned by root.root, while Samba tutorials I read usually prefer to use nobody.nogroup. You sure about that? On Debian the owner of /var/www is www-data. Ubuntu is derived directly from Debian. I'd be surprised if it's that different. Yes, it is (installed through apt-get): I think most of the tutorials advise you to change from the default root:root to www-data:www-data on this folder because this way you have a user dedicated to the web server. After you change ownership to www-data:www-data, use chmod to allow desired users to write the directory. Without this step only the www-data user can write. -- Stan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] _netr_ServerAuthenticate3: netlogon_creds_server_check failed. Rejecting auth request
On 19:17:01 wrote Paul Tietjens: I am getting errors in my samba logs like _netr_ServerAuthenticate3: netlogon_creds_server_check failed. Rejecting auth request from client XXX machine account XXX$ (Host log: http://pastebin.com/QXhbngN5). So far, machines do seem to join the domain (Machine account is created in LDAP, user can log in, etc), but I am concerned that when Windows 7 machines reach their 30 days they will begin issuing trust account has expired or is incorrect messages. Since we have a couple thousand machines, I wish to avoid that. I have followed the instructions at http://wiki.samba.org/index.php/Windows7 and tried a few other thnigs (but have not touch the sign/seal regkeys) and still get these errors in the logs when a machine boots and auths any user. I have updated the samba bins from debian backports to run version 3.5.8. I have made sure that our DNS server registers the machine account with hostname.DOMAIN, have tried turning off/on ntlmv2 on the server and using gpedit on the client, have made sure that time is synchronous on the server/client, have removed and re-added the machine account many times, and have tried some registry hacks like: HKLM\System\CCS\Services\TcpIp\Parameters Domain: XXX.com NV Domain: XXX.com Where should I look next? From your log: ldapsam_getsampwsid: Unable to locate SID [S-1-5-21-1048866067-1567326443-2860397223-515] count=0 [2011/07/26 12:04:02.543539, 2] passdb/pdb_ldap.c:2446(init_group_from_ldap) So find this group by hand: ldapsearch -x -LLL sambasid=S-1-5-21-1048866067-1567326443-2860397223-515 Should look like this: # ldapsearch -x -LLL sambasid=S-1-5-21-2895420538-1884802692-219078741-515 dn: cn=Domain Computers,ou=groups,dc=xx,dc=xx objectClass: top objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 515 cn: Domain Computers description: Netbios Domain Computers accounts sambaSID: S-1-5-21-2895420538-1884802692-219078741-515 sambaGroupType: 2 displayName: Domain Computers And you are using debian with winbind? check the status of winbind: smbcontrol winbind ping PONG from pid 11761 if you dont get a pong, you are not running winwindd, or you have a broken deb. cd /var/run/samba ln -s winbindd-winbindd.conf.pid winbindd.pid and winbind works :-) . If you have fixed this two possible issues and things still dont work, check your ldap acls. To do this set the loglevel of slapd to 384 (ACL + FILTER). -- Regards Harry Jede -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Lighttpd + Samba for read/write?
On Mon, 01 Aug 2011 11:22:13 -0500, Stan Hoeppner s...@hardwarefreak.com wrote: After you change ownership to www-data:www-data, use chmod to allow desired users to write the directory. Without this step only the www-data user can write. Thanks for the tip. I'll see if Lighttpd is OK with a non-root user owning its docroot direcotyr. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f72d56d s3-rpc_server: Only setup tcpip ports if epmapper is enabled. via aca4dbe s3-rpc_server: Use rpc_spoolss_mode(). via 538bd1e s3-rpc_server: Add rpc_spoolss_mode(). via b11878d s3-rpc_server: Enable endpoint mapper as daemon by default. via d189d2b s3-rpc_server: Use rpc_epmapper_mode(). via 176ce4b s3-rpc_server: Add rpc_epmapper_mode(). via 9c5f2ec s3-rpc_server: Disable listening on tcpip ports by default. via e0931a5 s3-torture: Run epmapper as daemon and the tests over ncalrpc. via 4854272 s3-epmd: Use rpc_setup_tcpip_sockets(). via 4b751b2 s3-librpc: Remove obsolete dcerpc_binding_vector_create(). via 0fef676 s3-rpc_server: Use binding vector in rpc_ep_try_register(). via 498e53c s3-rpc_server: Add RPC socket helper functions. via 02cdb65 s3-librpc: Add dcerpc_binding_vector_replace_iface(). via 9cc6f90 s3-librpc: Add dcerpc_binding_vector_dup(). via 169d0c4 s3-librpc: Add dcerpc_binding_vector_add_unix(). via eaced2e s3-librpc: Add dcerpc_binding_vector_add_port(). via c810e47 s3-librpc: Add dcerpc_binding_vector_add_np_default(). via 08523ed s3-librpc: Add dcerpc_binding_vector_new(). via d597bf4 s3-rpc_server: Rename to rpc service setup. via e25b34a s3-rpc_server: Move the endpoint registration to own file. via cca96e4 s3-rpc_server: Added common function to create tcpip socket. from 95e8f09 s3-lsa: Fix crypto prototypes. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f72d56de5092a10d78798f233e29b23d62cc425a Author: Andreas Schneider a...@samba.org Date: Mon Aug 1 11:14:12 2011 +0200 s3-rpc_server: Only setup tcpip ports if epmapper is enabled. Autobuild-User: Andreas Schneider a...@cryptomilk.org Autobuild-Date: Mon Aug 1 12:31:59 CEST 2011 on sn-devel-104 commit aca4dbe0008fe76841b0191602f5da416931fe07 Author: Andreas Schneider a...@samba.org Date: Fri Jul 29 17:46:37 2011 +0200 s3-rpc_server: Use rpc_spoolss_mode(). commit 538bd1eca6846e3c5a52d792e456f463348527bc Author: Andreas Schneider a...@samba.org Date: Fri Jul 29 17:46:21 2011 +0200 s3-rpc_server: Add rpc_spoolss_mode(). commit b11878d5a5fb6beb1a393a9ff7da5e5d7e711c6c Author: Andreas Schneider a...@samba.org Date: Fri Jul 29 17:25:39 2011 +0200 s3-rpc_server: Enable endpoint mapper as daemon by default. commit d189d2bf32c9ddb9d13a61586f17da97aea83663 Author: Andreas Schneider a...@samba.org Date: Thu Jul 14 10:40:53 2011 +0200 s3-rpc_server: Use rpc_epmapper_mode(). Remove embedded mode cause this will not work. It was only there for testing. commit 176ce4b42f6629fe33a2ff51b3c70bb74c109637 Author: Andreas Schneider a...@samba.org Date: Fri Jul 29 11:44:02 2011 +0200 s3-rpc_server: Add rpc_epmapper_mode(). commit 9c5f2ec12136eac5ede41ccef581b2bf934429ca Author: Andreas Schneider a...@samba.org Date: Thu Jul 14 10:37:49 2011 +0200 s3-rpc_server: Disable listening on tcpip ports by default. commit e0931a53c894e9d267c2d4b5d1b667209f9540ab Author: Andreas Schneider a...@samba.org Date: Mon Jul 11 17:02:36 2011 +0200 s3-torture: Run epmapper as daemon and the tests over ncalrpc. commit 48542728b11db3227fe821463f7d6b2230ae608b Author: Andreas Schneider a...@samba.org Date: Tue Jul 5 12:04:00 2011 +0200 s3-epmd: Use rpc_setup_tcpip_sockets(). commit 4b751b29e50ea87bd3f082d63014cbcbff8bc519 Author: Andreas Schneider a...@samba.org Date: Wed Jul 13 13:49:57 2011 +0200 s3-librpc: Remove obsolete dcerpc_binding_vector_create(). commit 0fef6766b9e4c8612b2ad547720ec47463917192 Author: Andreas Schneider a...@samba.org Date: Fri Jul 1 18:40:38 2011 +0200 s3-rpc_server: Use binding vector in rpc_ep_try_register(). commit 498e53c22008c918e2ae5ca8126a8b1b2e8322df Author: Andreas Schneider a...@samba.org Date: Thu Jun 30 10:46:48 2011 +0200 s3-rpc_server: Add RPC socket helper functions. commit 02cdb65fc67954e3811349021563f496fc282f7b Author: Andreas Schneider a...@samba.org Date: Fri Jul 1 14:39:58 2011 +0200 s3-librpc: Add dcerpc_binding_vector_replace_iface(). commit 9cc6f904240897c81caf78b2c228b776b553ce63 Author: Andreas Schneider a...@samba.org Date: Fri Jul 1 14:36:31 2011 +0200 s3-librpc: Add dcerpc_binding_vector_dup(). commit 169d0c431265651996f3063c3de6503f84894720 Author: Andreas Schneider a...@samba.org Date: Thu Jun 30 12:02:33 2011 +0200 s3-librpc: Add dcerpc_binding_vector_add_unix(). commit eaced2e909b58ce5b83998e6bde9750985f7a99d Author: Andreas Schneider a...@samba.org Date: Thu Jun 30 12:01:10 2011 +0200 s3-librpc: Add dcerpc_binding_vector_add_port(). commit c810e475194775c63f32c4efeb9a505d9647b2bc Author: Andreas Schneider a...@samba.org Date: Thu Jun 30 11:56:11 2011
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 2d23dff s4-upgradeprovision: try to fix the detection of @provision record from f72d56d s3-rpc_server: Only setup tcpip ports if epmapper is enabled. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2d23dff49b353265e0c0f8ba5a62b95c2313e713 Author: Matthieu Patou m...@matws.net Date: Sun Jul 31 00:46:58 2011 +0400 s4-upgradeprovision: try to fix the detection of @provision record Autobuild-User: Matthieu Patou m...@samba.org Autobuild-Date: Mon Aug 1 13:43:50 CEST 2011 on sn-devel-104 --- Summary of changes: source4/scripting/bin/upgradeprovision |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index af97964..0a3df32 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -1348,7 +1348,7 @@ def rebuild_sd(samdb, names): def hasATProvision(samdb): entry = samdb.search(expression=dn=@PROVISION, base = , -scope=SCOPE_SUBTREE, +scope=SCOPE_BASE, attrs=[dn]) if entry != None and len(entry) == 1: -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a833aaf s3:rpc_transport_tstream: call tstream_cli_np_use_trans()
before tstream_writev_queue_send()
via 98cc4c8 pidl:NDR/Server: use interface-{UUID} and {NAME} instead
of the raw {PROPERTIES}
via e7a7a24 pidl:NDR/Parser: use interface-{UUID} and {NAME} instead
of the raw {PROPERTIES}
via 7ae14ed pidl:NDR/Parser: use '0' instead of 'NULL' for an uint32_t
value
from 2d23dff s4-upgradeprovision: try to fix the detection of @provision
record
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a833aaf52c4c846f623441a2a0cff054e2de11af
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jul 28 12:54:31 2011 +0200
s3:rpc_transport_tstream: call tstream_cli_np_use_trans() before
tstream_writev_queue_send()
This will be needed when tstream_writev_queue_send() changes it's behavior
and
avoids using an immediate event when the queue is empty.
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Mon Aug 1 14:55:00 CEST 2011 on sn-devel-104
commit 98cc4c8419121246b46f5a5492dd9e4e45cf5aad
Author: Stefan Metzmacher me...@samba.org
Date: Mon Aug 1 11:32:48 2011 +0200
pidl:NDR/Server: use interface-{UUID} and {NAME} instead of the raw
{PROPERTIES}
metze
commit e7a7a2451fc4821a265ec3d1495085ea142a4554
Author: Stefan Metzmacher me...@samba.org
Date: Mon Aug 1 11:32:48 2011 +0200
pidl:NDR/Parser: use interface-{UUID} and {NAME} instead of the raw
{PROPERTIES}
metze
commit 7ae14ed6662d4d8fb0034931dcac34d3c032d5dd
Author: Stefan Metzmacher me...@samba.org
Date: Mon Aug 1 13:00:30 2011 +0200
pidl:NDR/Parser: use '0' instead of 'NULL' for an uint32_t value
metze
---
Summary of changes:
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |7 +++
pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm |4 ++--
source3/rpc_client/rpc_transport_tstream.c | 13 +
3 files changed, 14 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index e2c9012..406fc02 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1215,7 +1215,7 @@ sub ParsePtrPull($)
} elsif ($l-{POINTER_TYPE} eq ignore) {
#We want to consume the pointer bytes, but ignore the pointer
value
$self-pidl(NDR_CHECK(ndr_pull_uint3264(ndr, NDR_SCALARS,
_ptr_$e-{NAME})););
- $self-pidl(_ptr_$e-{NAME} = NULL;);
+ $self-pidl(_ptr_$e-{NAME} = 0;);
} else {
die(Unhandled pointer type $l-{POINTER_TYPE});
}
@@ -2666,10 +2666,9 @@ sub HeaderInterface($$$)
if (defined $interface-{PROPERTIES}-{uuid}) {
my $name = uc $interface-{NAME};
$self-pidl_hdr(#define NDR_$name\_UUID .
-
Parse::Pidl::Util::make_str(lc($interface-{PROPERTIES}-{uuid})));
+ Parse::Pidl::Util::make_str(lc($interface-{UUID})));
- if(!defined $interface-{PROPERTIES}-{version}) {
$interface-{PROPERTIES}-{version} = 0.0; }
- $self-pidl_hdr(#define NDR_$name\_VERSION
$interface-{PROPERTIES}-{version});
+ $self-pidl_hdr(#define NDR_$name\_VERSION
$interface-{VERSION});
$self-pidl_hdr(#define NDR_$name\_NAME
\$interface-{NAME}\);
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
b/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
index 30ad7a4..1d51fa1 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
@@ -77,8 +77,8 @@ sub Boilerplate_Iface($)
my($interface) = shift;
my $name = $interface-{NAME};
my $uname = uc $name;
- my $uuid = lc($interface-{PROPERTIES}-{uuid});
- my $if_version = $interface-{PROPERTIES}-{version};
+ my $uuid = lc($interface-{UUID});
+ my $if_version = $interface-{VERSION};
pidl
static NTSTATUS $name\__op_bind(struct dcesrv_call_state *dce_call, const
struct dcesrv_interface *iface, uint32_t if_version)
diff --git a/source3/rpc_client/rpc_transport_tstream.c
b/source3/rpc_client/rpc_transport_tstream.c
index 488c093..8a860f9 100644
--- a/source3/rpc_client/rpc_transport_tstream.c
+++ b/source3/rpc_client/rpc_transport_tstream.c
@@ -357,6 +357,7 @@ static struct tevent_req *rpc_tstream_trans_send(TALLOC_CTX
*mem_ctx,
struct tevent_req *req, *subreq;
struct rpc_tstream_trans_state *state;
struct timeval endtime;
+ bool use_trans = false;
req = tevent_req_create(mem_ctx, state,
struct rpc_tstream_trans_state);
@@ -376,6 +377,14 @@ static struct tevent_req
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 695af0f winsif.idl: fix comment about a pidl bug
via 0ea3760 pidl:NDR/Parser: allow [string,size_of()] together
via eb9aa9b eventlog6.idl: fix definition of eventlog6_StringArray
from a833aaf s3:rpc_transport_tstream: call tstream_cli_np_use_trans()
before tstream_writev_queue_send()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 695af0f6ed7ed3d266f3bc1a45a8086b31ef287a
Author: Stefan Metzmacher me...@samba.org
Date: Mon Aug 1 15:38:12 2011 +0200
winsif.idl: fix comment about a pidl bug
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Mon Aug 1 17:47:05 CEST 2011 on sn-devel-104
commit 0ea3760cae85226f6fbc59a9ca6b9eb9e2ab577b
Author: Stefan Metzmacher me...@samba.org
Date: Mon Aug 1 15:17:41 2011 +0200
pidl:NDR/Parser: allow [string,size_of()] together
metze
commit eb9aa9b9f41212849f605fb0cecef0b940e906d6
Author: Stefan Metzmacher me...@samba.org
Date: Mon Aug 1 15:18:40 2011 +0200
eventlog6.idl: fix definition of eventlog6_StringArray
This is an array of string, not an array of characters.
metze
---
Summary of changes:
librpc/idl/eventlog6.idl |2 +-
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 15 ---
source4/librpc/idl/winsif.idl|3 +--
3 files changed, 14 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/eventlog6.idl b/librpc/idl/eventlog6.idl
index 0cda95b..57216cd 100644
--- a/librpc/idl/eventlog6.idl
+++ b/librpc/idl/eventlog6.idl
@@ -64,7 +64,7 @@ interface eventlog6
typedef struct {
[range(0, MAX_RPC_STRING_ARRAY_COUNT)] uint32 count;
- [size_is(count),charset(UTF16),string] uint16 *ptr;
+ [size_is(count),charset(UTF16),string] uint16 **ptr;
} eventlog6_StringArray;
typedef struct {
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 406fc02..3d31366 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -198,6 +198,12 @@ sub ParseArrayPushHeader($$)
} else {
$size = $length = ndr_string_length($var_name,
sizeof(*$var_name));
}
+ if (defined($l-{SIZE_IS})) {
+ $size = ParseExpr($l-{SIZE_IS}, $env, $e);
+ }
+ if (defined($l-{LENGTH_IS})) {
+ $length = ParseExpr($l-{LENGTH_IS}, $env, $e);
+ }
} else {
$size = ParseExpr($l-{SIZE_IS}, $env, $e);
$length = ParseExpr($l-{LENGTH_IS}, $env, $e);
@@ -352,7 +358,7 @@ sub ParseArrayPullHeader($$)
$self-pidl(});
}
- if ($l-{IS_CONFORMANT} and not $l-{IS_ZERO_TERMINATED}) {
+ if ($l-{IS_CONFORMANT} and (defined($l-{SIZE_IS}) or not
$l-{IS_ZERO_TERMINATED})) {
$self-defer(if ($var_name) {);
$self-defer_indent;
my $size = ParseExprExt($l-{SIZE_IS}, $env, $e-{ORIGINAL},
@@ -364,7 +370,7 @@ sub ParseArrayPullHeader($$)
$self-defer(});
}
- if ($l-{IS_VARYING} and not $l-{IS_ZERO_TERMINATED}) {
+ if ($l-{IS_VARYING} and (defined($l-{LENGTH_IS}) or not
$l-{IS_ZERO_TERMINATED})) {
$self-defer(if ($var_name) {);
$self-defer_indent;
my $length = ParseExprExt($l-{LENGTH_IS}, $env,
$e-{ORIGINAL},
@@ -775,7 +781,7 @@ sub ParseElementPrint($)
$var_name = get_pointer_to($var_name);
}
- if ($l-{IS_ZERO_TERMINATED}) {
+ if ($l-{IS_ZERO_TERMINATED} and not
defined($l-{LENGTH_IS})) {
$length = ndr_string_length($var_name,
sizeof(*$var_name));
} else {
$length = ParseExprExt($l-{LENGTH_IS}, $env,
$e-{ORIGINAL},
@@ -1273,6 +1279,9 @@ sub ParseStructPushPrimitives($)
} else {
$size =
ndr_string_length($varname-$e-{NAME}, sizeof(*$varname-$e-{NAME}));
}
+ if (defined($e-{LEVELS}[0]-{SIZE_IS})) {
+ $size =
ParseExpr($e-{LEVELS}[0]-{SIZE_IS}, $env, $e-{ORIGINAL});
+ }
} else {
$size = ParseExpr($e-{LEVELS}[0]-{SIZE_IS},
$env, $e-{ORIGINAL});
}
diff --git a/source4/librpc/idl/winsif.idl b/source4/librpc/idl/winsif.idl
index
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7585057 acl: Improve error message when setting acls fails.
via cdc146d remove unnecessary dependency on 'events' from ldb modules.
via 56e86ed heimdal_build: Use krb5-config to find heimdal include
directory and library path, rather than hardcoding.
from 695af0f winsif.idl: fix comment about a pidl bug
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7585057a22beda5bac2b98c7488e994880927daf
Author: Jelmer Vernooij jel...@samba.org
Date: Sun Jul 31 20:05:23 2011 +0200
acl: Improve error message when setting acls fails.
Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Mon Aug 1 18:59:12 CEST 2011 on sn-devel-104
commit cdc146d0c4969e693dd172a0fe7b40ac95bb9e0f
Author: Jelmer Vernooij jel...@samba.org
Date: Sun Jul 31 19:42:15 2011 +0200
remove unnecessary dependency on 'events' from ldb modules.
commit 56e86ed52d5e0567b79049ec0d52b9e15b34fec7
Author: Jelmer Vernooij jel...@samba.org
Date: Sat Jul 30 17:45:04 2011 +0200
heimdal_build: Use krb5-config to find heimdal include directory and
library path, rather than hardcoding.
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/wscript_build | 70 +++---
source4/heimdal_build/wscript_configure | 21 ++-
source4/scripting/python/samba/upgradehelpers.py | 16 -
3 files changed, 66 insertions(+), 41 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build
b/source4/dsdb/samdb/ldb_modules/wscript_build
index eb9c664..56c2d12 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -29,7 +29,7 @@ bld.SAMBA_MODULE('ldb_samba_dsdb',
subsystem='ldb',
init_function='ldb_samba_dsdb_module_init',
module_init_name='ldb_init_module',
- deps='samdb talloc events ndr DSDB_MODULE_HELPERS',
+ deps='samdb talloc ndr DSDB_MODULE_HELPERS',
internal_module=False,
)
@@ -40,7 +40,7 @@ bld.SAMBA_MODULE('ldb_samba_secrets',
init_function='ldb_samba_secrets_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='samdb talloc events ndr'
+ deps='samdb talloc ndr'
)
@@ -50,7 +50,7 @@ bld.SAMBA_MODULE('ldb_objectguid',
init_function='ldb_objectguid_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='samdb talloc events ndr DSDB_MODULE_HELPERS'
+ deps='samdb talloc ndr DSDB_MODULE_HELPERS'
)
@@ -60,7 +60,7 @@ bld.SAMBA_MODULE('ldb_repl_meta_data',
init_function='ldb_repl_meta_data_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='samdb talloc events ndr NDR_DRSUAPI NDR_DRSBLOBS ndr
DSDB_MODULE_HELPERS security'
+ deps='samdb talloc ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS
security'
)
@@ -70,7 +70,7 @@ bld.SAMBA_MODULE('ldb_schema_load',
init_function='ldb_schema_load_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='samdb talloc events DSDB_MODULE_HELPERS'
+ deps='samdb talloc DSDB_MODULE_HELPERS'
)
@@ -80,7 +80,7 @@ bld.SAMBA_MODULE('ldb_schema_data',
init_function='ldb_schema_data_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='samdb talloc events DSDB_MODULE_HELPERS'
+ deps='samdb talloc DSDB_MODULE_HELPERS'
)
@@ -90,7 +90,7 @@ bld.SAMBA_MODULE('ldb_naming_fsmo',
init_function='ldb_naming_fsmo_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='samdb talloc events DSDB_MODULE_HELPERS'
+ deps='samdb talloc DSDB_MODULE_HELPERS'
)
@@ -100,7 +100,7 @@ bld.SAMBA_MODULE('ldb_pdc_fsmo',
init_function='ldb_pdc_fsmo_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='samdb talloc events DSDB_MODULE_HELPERS'
+ deps='samdb talloc DSDB_MODULE_HELPERS'
)
@@ -110,7 +110,7 @@ bld.SAMBA_MODULE('ldb_samldb',
init_function='ldb_samldb_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events samdb DSDB_MODULE_HELPERS
DSDB_MODULE_HELPER_RIDALLOC'
+ deps='talloc samdb DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_RIDALLOC'
)
@@ -120,7 +120,7 @@ bld.SAMBA_MODULE('ldb_samba3sam',
init_function='ldb_samba3sam_module_init',
module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events ldb smbpasswdparser security NDR_SECURITY'
+ deps='talloc ldb
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0c67efd Fix bug 7462 - Non-standard SA_RESETHAND is used in
...lib/tevent/tevent_signal.c
from 7585057 acl: Improve error message when setting acls fails.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0c67efdd68b9808542c090b9fd9920e4e37d85d0
Author: Jeremy Allison j...@samba.org
Date: Mon Aug 1 11:49:10 2011 -0700
Fix bug 7462 - Non-standard SA_RESETHAND is used in
...lib/tevent/tevent_signal.c
Make SA_RESETHAND conditional on its existance.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Mon Aug 1 22:03:45 CEST 2011 on sn-devel-104
---
Summary of changes:
lib/replace/system/wait.h |4
lib/tevent/testsuite.c |2 ++
lib/tevent/tevent_signal.c |4
3 files changed, 6 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/system/wait.h b/lib/replace/system/wait.h
index 41db180..f0c3bdc 100644
--- a/lib/replace/system/wait.h
+++ b/lib/replace/system/wait.h
@@ -40,10 +40,6 @@
#include setjmp.h
#endif
-#ifndef SA_RESETHAND
-#define SA_RESETHAND SA_ONESHOT
-#endif
-
#if !defined(HAVE_SIG_ATOMIC_T_TYPE)
typedef int sig_atomic_t;
#endif
diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c
index 991e161..1e2f25a 100644
--- a/lib/tevent/testsuite.c
+++ b/lib/tevent/testsuite.c
@@ -101,7 +101,9 @@ static bool test_event_context(struct torture_context *test,
#ifdef SA_RESTART
se1 = event_add_signal(ev_ctx, ev_ctx, SIGALRM, SA_RESTART,
count_handler, alarm_count);
#endif
+#ifdef SA_RESETHAND
se2 = event_add_signal(ev_ctx, ev_ctx, SIGALRM, SA_RESETHAND,
count_handler, alarm_count);
+#endif
#ifdef SA_SIGINFO
se3 = event_add_signal(ev_ctx, ev_ctx, SIGUSR1, SA_SIGINFO,
count_handler, info_count);
#endif
diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
index dbab8a8..b790859 100644
--- a/lib/tevent/tevent_signal.c
+++ b/lib/tevent/tevent_signal.c
@@ -355,16 +355,20 @@ int tevent_common_check_signal(struct tevent_context *ev)
(void*)sig_state-sig_info[i][ofs],
se-private_data);
}
+#ifdef SA_RESETHAND
if (se-sa_flags SA_RESETHAND) {
talloc_free(se);
}
+#endif
continue;
}
#endif
se-handler(ev, se, i, count, NULL, se-private_data);
+#ifdef SA_RESETHAND
if (se-sa_flags SA_RESETHAND) {
talloc_free(se);
}
+#endif
}
#ifdef SA_SIGINFO
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 6eb496c dbcheck: Cancel transaction if operation fails. from 0c67efd Fix bug 7462 - Non-standard SA_RESETHAND is used in ...lib/tevent/tevent_signal.c http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 6eb496cf45a193d0945a3b6a84af693c6f44d7b7 Author: Jelmer Vernooij jel...@samba.org Date: Mon Aug 1 20:04:02 2011 +0200 dbcheck: Cancel transaction if operation fails. Autobuild-User: Jelmer Vernooij jel...@samba.org Autobuild-Date: Tue Aug 2 01:41:07 CEST 2011 on sn-devel-104 --- Summary of changes: source4/scripting/python/samba/netcmd/dbcheck.py | 25 + 1 files changed, 15 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/netcmd/dbcheck.py b/source4/scripting/python/samba/netcmd/dbcheck.py index 3f379c0..2a175f3 100644 --- a/source4/scripting/python/samba/netcmd/dbcheck.py +++ b/source4/scripting/python/samba/netcmd/dbcheck.py @@ -96,16 +96,21 @@ class cmd_dbcheck(Command): if yes and fix: samdb.transaction_start() - -chk = dbcheck(samdb, samdb_schema=samdb_schema, verbose=verbose, fix=fix, yes=yes, quiet=quiet) - -if reindex: -print(Re-indexing...) -error_count = 0 -if chk.reindex_database(): -print(completed re-index OK) -else: -error_count = chk.check_database(DN=DN, scope=search_scope, controls=controls, attrs=attrs) +try: +chk = dbcheck(samdb, samdb_schema=samdb_schema, verbose=verbose, +fix=fix, yes=yes, quiet=quiet) + +if reindex: +print(Re-indexing...) +error_count = 0 +if chk.reindex_database(): +print(completed re-index OK) +else: +error_count = chk.check_database(DN=DN, scope=search_scope, +controls=controls, attrs=attrs) +except: +samdb.transaction_cancel() +raise if yes and fix: samdb.transaction_commit() -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 11c2d37 Fix bug #8341 - libsmbclient segfault when feed the root of
a mounted share via an uri
from 6eb496c dbcheck: Cancel transaction if operation fails.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 11c2d3717c672386538c6490a860b0cb66b8111c
Author: Alban Browaeys pra...@yahoo.com
Date: Mon Aug 1 16:40:22 2011 -0700
Fix bug #8341 - libsmbclient segfault when feed the root of a mounted share
via an uri
Fix null deref.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Tue Aug 2 02:58:26 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/libsmb/clifsinfo.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index b0a8fdd..5f8e551 100644
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -483,6 +483,7 @@ NTSTATUS cli_get_posix_fs_info(struct cli_state *cli,
uint16 setup[1];
uint8_t param[2];
uint8_t *rdata = NULL;
+ uint32_t rdata_count;
NTSTATUS status;
SSVAL(setup, 0, TRANSACT2_QFSINFO);
@@ -495,7 +496,7 @@ NTSTATUS cli_get_posix_fs_info(struct cli_state *cli,
NULL,
NULL, 0, NULL, /* rsetup */
NULL, 0, NULL, /* rparam */
- rdata, 56, NULL);
+ rdata, 56, rdata_count);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 3427029 samba-tool: Don't install -c version, which is now
deprecated.
from 11c2d37 Fix bug #8341 - libsmbclient segfault when feed the root of
a mounted share via an uri
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 342702918a8cfd5f2b6a3861edbccb72508dace7
Author: Jelmer Vernooij jel...@samba.org
Date: Tue Aug 2 03:32:54 2011 +0200
samba-tool: Don't install -c version, which is now deprecated.
Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Tue Aug 2 04:53:39 CEST 2011 on sn-devel-104
---
Summary of changes:
source4/samba_tool/wscript_build |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/samba_tool/wscript_build b/source4/samba_tool/wscript_build
index f378b51..4092b53 100644
--- a/source4/samba_tool/wscript_build
+++ b/source4/samba_tool/wscript_build
@@ -4,5 +4,6 @@ bld.SAMBA_BINARY('samba-tool-c',
source='samba_tool.c vampire.c gpo.c',
autoproto='proto.h',
deps='samba-hostconfig samba-util samba-net popt POPT_SAMBA
POPT_CREDENTIALS samba-policy auth4',
- pyembed=True
+ pyembed=True,
+ install=False
)
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via ac8096e s4:kdc: fix compiler warning via 6d1ef3f s3:libsmb/libsmb_server: make use of cli_set_timeout() via 91b0aab s3:libsmb/cli*: make use of cli_state_protocol() via 5e59a36 s3:client: make use of cli_state_protocol() via ec9b613 s3:auth_server: make use of cli_state_protocol() via da53434 s3:spoolss: make use of cli_state_protocol() via 32a4773 s3:masktest: make use of cli_state_protocol() via ed6b8de s3:net_rpc: make use of cli_state_protocol() via a60b169 s3:winbindd_cm: make use of cli_state_protocol() via 26d s3:libsmb: add cli_state_protocol() via c399ad4 s3:include: change cli-protocol to enum protocol_types via 6e8a6e0 s3:libsmb/cli*: make use of cli_state_capabilities() via ffd99c5 s3:libsmb/libsmb_*: make use of cli_state_capabilities() via a4d79a3 s3:torture: make use of cli_state_capabilities() via 3ce648a s3:winbindd_cm: make use of cli_state_capabilities() via f934aa1 s3:include: make use of cli_state_capabilities() in SERVER_HAS_UNIX_CIFS() via 24c5427 s3:libsmb: add cli_state_capabilities() via a83e769 s3:smb2cli_base: smb2cli_req_send() needs to call tevent_req_post() on error from 3427029 samba-tool: Don't install -c version, which is now deprecated. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ac8096e69d7357bac5430cde1d713a04acf58b57 Author: Stefan Metzmacher me...@samba.org Date: Tue Aug 2 03:57:50 2011 +0200 s4:kdc: fix compiler warning metze Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Tue Aug 2 06:06:15 CEST 2011 on sn-devel-104 commit 6d1ef3faeef25cea6783760f262c4639d3d54704 Author: Stefan Metzmacher me...@samba.org Date: Tue Aug 2 04:16:01 2011 +0200 s3:libsmb/libsmb_server: make use of cli_set_timeout() metze commit 91b0aab3fc5076a6399e6970cb7b2f1a442d5566 Author: Stefan Metzmacher me...@samba.org Date: Mon Aug 1 17:01:42 2011 +0200 s3:libsmb/cli*: make use of cli_state_protocol() metze commit 5e59a36beb7d200fc284d28812baa7e46adeced1 Author: Stefan Metzmacher me...@samba.org Date: Mon Aug 1 17:01:42 2011 +0200 s3:client: make use of cli_state_protocol() metze commit ec9b6134b7342576fa0e09e93e7901da6fb0aea2 Author: Stefan Metzmacher me...@samba.org Date: Mon Aug 1 17:00:24 2011 +0200 s3:auth_server: make use of cli_state_protocol() metze commit da534343914c7b7b5cf7300a3cff2614b9e613e5 Author: Stefan Metzmacher me...@samba.org Date: Mon Aug 1 16:59:54 2011 +0200 s3:spoolss: make use of cli_state_protocol() metze commit 32a47730da3e92b61b3cba4530962a801b959aca Author: Stefan Metzmacher me...@samba.org Date: Mon Aug 1 16:59:34 2011 +0200 s3:masktest: make use of cli_state_protocol() metze commit ed6b8deea79e1b3eaef12e8091ea8609e85c4c6c Author: Stefan Metzmacher me...@samba.org Date: Mon Aug 1 16:59:10 2011 +0200 s3:net_rpc: make use of cli_state_protocol() metze commit a60b1695b1d783da4b460f357772fb3cde589134 Author: Stefan Metzmacher me...@samba.org Date: Mon Aug 1 16:58:49 2011 +0200 s3:winbindd_cm: make use of cli_state_protocol() metze commit 26d0c2f07e202277571c540b5a64b7b0bb63 Author: Stefan Metzmacher me...@samba.org Date: Sat Jul 30 12:04:37 2011 +0200 s3:libsmb: add cli_state_protocol() metze commit c399ad4cdd313584fe072b84bfe87ec03182fb5c Author: Stefan Metzmacher me...@samba.org Date: Tue Aug 2 03:51:38 2011 +0200 s3:include: change cli-protocol to enum protocol_types metze commit 6e8a6e033f4040630995f0c2f1889fbc251cb7dc Author: Stefan Metzmacher me...@samba.org Date: Mon Aug 1 16:42:23 2011 +0200 s3:libsmb/cli*: make use of cli_state_capabilities() metze commit ffd99c5de56b7e9f97a56b91983c966e88749090 Author: Stefan Metzmacher me...@samba.org Date: Mon Aug 1 16:41:19 2011 +0200 s3:libsmb/libsmb_*: make use of cli_state_capabilities() metze commit a4d79a379979ea6e32ea957830d2769a280440f2 Author: Stefan Metzmacher me...@samba.org Date: Mon Aug 1 16:40:45 2011 +0200 s3:torture: make use of cli_state_capabilities() metze commit 3ce648aee4fb961d0ee23669b53524786ace8b98 Author: Stefan Metzmacher me...@samba.org Date: Mon Aug 1 16:39:55 2011 +0200 s3:winbindd_cm: make use of cli_state_capabilities() metze commit f934aa1aeac9e04eb758dad67afc4f18e605d5f3 Author: Stefan Metzmacher me...@samba.org Date: Mon Aug 1 16:39:20 2011 +0200 s3:include: make use of cli_state_capabilities() in SERVER_HAS_UNIX_CIFS() metze commit 24c5427810e76c733de8141ff3ad7c65fcb8ec91 Author: Stefan Metzmacher me...@samba.org Date: Sat Jul 30 12:04:16 2011 +0200 s3:libsmb: add cli_state_capabilities()
[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-452-ga5b8e2c
The branch, 1.2 has been updated via a5b8e2c1ec1b4fd7ef25e70a919ef4c70f3e1c75 (commit) from 7467a04eb9fa5c25fea3870d7795c9c00222a6d9 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2 - Log - commit a5b8e2c1ec1b4fd7ef25e70a919ef4c70f3e1c75 Author: Martin Schwenke mar...@meltin.net Date: Mon Aug 1 13:37:06 2011 +1000 Eventscripts - 10.interfaces should not check orphaned interfaces. If the last IP address on an interfaces is removed then that interfaces should no longer be checked by 10.interfaces. However, ctdb ifaces still lists such interfaces so they are currently checked. The problem really needs to be addressed in ctdbd but a neat quick eventscript fix will be minimally invasive... This changes the code to use ctdb -Y ip -v instead of ctdb -Y ifaces. The former includes details of all public addresses and associated interfaces, so when an address is removed there is no output for it. This avoids orphaned interfaces from being listed. The logic is also slightly improved so that $IFACES includes just a (non-uniquified) list of interfaces, allowing an existing loop to be removed. Signed-off-by: Martin Schwenke mar...@meltin.net --- Summary of changes: config/events.d/10.interface | 13 + 1 files changed, 5 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/config/events.d/10.interface b/config/events.d/10.interface index f793673..8f0c0bc 100755 --- a/config/events.d/10.interface +++ b/config/events.d/10.interface @@ -24,17 +24,14 @@ monitor_interfaces() [ $CTDB_PUBLIC_INTERFACE ] INTERFACES=$CTDB_PUBLIC_INTERFACE $INTERFACES [ $CTDB_NATGW_PUBLIC_IFACE ] INTERFACES=$CTDB_NATGW_PUBLIC_IFACE $INTERFACES - local IFACES=`ctdb ifaces -Y | grep -v '^:Name:LinkStatus:References:'` - local I - local IFACE + # For all but the 1st line, get the 2nd last field with commas + # changes to spaces. + local IFACES=`ctdb -Y ip -v | sed -e '1d' -e 's/:[^:]*:$//' -e 's/^.*://' -e 's/,/ /g'` - for I in $IFACES; do - IFACE=`echo -n $I | cut -d ':' -f2` - INTERFACES=$IFACE $INTERFACES - done + local IFACE - INTERFACES=`for IFACE in $INTERFACES ; do echo $IFACE ; done | sort | uniq` + INTERFACES=`for IFACE in $INTERFACES $IFACES ; do echo $IFACE ; done | sort | uniq` local fail=0 local ok=0 -- CTDB repository
