[Samba] Samba4 with freeradius
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, I have been attempting to get freeradius to play nice with samba4. It seems however, that freeradius to utilise mschap expects the ntlm_auth command to support --request-nt-key as an option, yet the ntlm_auth in samba4 does not contain this flag. What do i use instead, or is this support that will be added in the future. Sincerely. William Brown pgp.mit.edu -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0.16 (Darwin) iQIcBAEBAgAGBQJNIHUJAAoJEHF16AnLoz6JOEEQAIatEGNpkMZfwCF6SPE6F+uP OR08YPC2BrKSd/K23+WuVhDnSUk94a4nkLXNncVSQSVV0MekcQB6xJ+D39W4zINa oFacpynDJkEUNZSK/2Ve80BuD6GCChQkNOpJK/TFd5PT9CqQXDhgqL+CWqa7VfM4 IFWZa/00YDDgT9c1Xm4dALGPqTq6z3pypiSI6l4N95/g7236A+f+hE3PCQHBPFLv 8UXugNsGvj5Et8B6rNSg6Qq6Yl47bjwCZ0GzfzjOG0Grr7Xv1Lyd0GxBuOqGe1IZ CUA3neg4aW7hJR5RsXWkd/m517uE893RbkYY+0U6eVEh7Rygt0rQjXKAmfS9m6RF 1VoDEpg3KQ3Opl9sbDpZeVkUfbJAeSmedfMZucWQvBENlZ4TiMgCfaXFrKhKp8KP 1qf6z6zW5O4kWE/y3ZuxKncPkuIdlVh9WL84oEJhTpbAvQqpmstTcd6U4xUT4r4s Dv1+8o8u5dafghvgkeXgNuhv6N8huinZZwHDz6fhxK68BLx3A5Kkv07c0FxiHcqu LlfSz0uB1wBKU/T+DIgfJOaQ+OQsRlOEib0n0AXlhGWBuRzGtKaDx9bwTOX8RgCE btF1GtsBWaQijU4DVjPfQ4oQOsGnJ4csC5FN9EjbQp89bhHtVOrXag20eUGY+YjQ oT5Kllx9f4V5tILfUh5O =AX9g -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Accessing files via symlink, does client see a difference?
I have an ancient device, several actually, called an Audiotron that I use Samba for to access media files. Now, I realize these are old and finicky devices. For ease of management, I keep my media files separated into 4.5GB directories (easy to burn to DVD) and then I have a script that goes into each of those directories and creates one big directory full of symlinks pointing into each individual directory. I'm sure my configuration is correct (follow symlinks = yes, wide links = yes in my services) as modern programs such as WinAmp and VLC have no problems accessing the directory full of symlinks (about 2500 links). However, the Audiotron has issues. If I try and play a file, sometimes it play, sometimes it won't. If I try and play it again immediately, sometimes it will go, sometimes I'll have to select play several times before it'll play. If I create individual services for each of my media directories and have the Audiotron catalog them individually, they all work fine. So, my question is, does the client see any difference in accessing a file via SAMBA (3.5.6) if it's a symlink vs a real file? I wouldn't think it would be able to, but the Audiotron certainly doesn't like them very well, yet Winamp has no issues. Thanks for any thoughts. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba4 with freeradius
On 02/01/2011 15:52, Indexer wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, I have been attempting to get freeradius to play nice with samba4. It seems however, that freeradius to utilise mschap expects the ntlm_auth command to support --request-nt-key as an option, yet the ntlm_auth in samba4 does not contain this flag. What do i use instead, or is this support that will be added in the future. You'd better not use the ntlm_auth of samba4 but more the one of samba3 that is to say either you manage to install both on a server or you put your freeradius on another server. Matthieu. -- Matthieu Patou Samba Teamhttp://samba.org Private repo http://git.samba.org/?p=mat/samba.git;a=summary -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] error adding a user
On Fri, Dec 31, 2010 at 04:34:05AM +0100, Marco Ciampa wrote: Sorry for (I'm shure) my stupid question (and my bad english)... If this is not the right place to post this kind of question forgive me and please point me to the right mailinglist. I've a Samba 3 that works with an openldap server as a sole domain controller. I used to use the Microsoft usermanager. After a general migration/upgrate I am not able to create new users anymore. I can do it with the smbldap-tools, manually only from the root user but if I do it through the usermanager it gives me an error. A net user add command done with the same adminitrator user give me this error: Failed to add user 'pippo' with: WERR_GENERAL_FAILURE. from the logs: [2010/12/31 04:30:44, 0] passdb/pdb_ldap.c:2197(ldapsam_add_sam_account) ldapsam_add_sam_account: User 'pippo' already in the base, with samba attributes Any hint? Need some other info? I've seen in the Internet many times asked this question so it seems a recurring problem but with generic answers (check all your conf data/permission/so on...) or no answer at all... Maybe it is a generic-catch-all error message a la Windows so it could be fired by a hundred reasons or what? Sorry I am not a Samba nor LDAP expert... you see... -- Marco Ciampa ++ | Linux User #78271 | | FSFE fellow #364 | ++ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] error adding a user
On Sun, Jan 2, 2011 at 4:44 PM, Marco Ciampa ciam...@libero.it wrote: On Fri, Dec 31, 2010 at 04:34:05AM +0100, Marco Ciampa wrote: Sorry for (I'm shure) my stupid question (and my bad english)... If this is not the right place to post this kind of question forgive me and please point me to the right mailinglist. I've a Samba 3 that works with an openldap server as a sole domain controller. I used to use the Microsoft usermanager. After a general migration/upgrate I am not able to create new users anymore. I can do it with the smbldap-tools, manually only from the root user but if I do it through the usermanager it gives me an error. A net user add command done with the same adminitrator user give me this error: Failed to add user 'pippo' with: WERR_GENERAL_FAILURE. from the logs: [2010/12/31 04:30:44, 0] passdb/pdb_ldap.c:2197(ldapsam_add_sam_account) ldapsam_add_sam_account: User 'pippo' already in the base, with samba attributes Any hint? Need some other info? I've seen in the Internet many times asked this question so it seems a recurring problem but with generic answers (check all your conf data/permission/so on...) or no answer at all... Maybe it is a generic-catch-all error message a la Windows so it could be fired by a hundred reasons or what? Sorry I am not a Samba nor LDAP expert... you see... I would just add the user in ldap directly. LAM is a good tool to do that and pretty easy to use. http://www.ldap-account-manager.org John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] error adding a user
On Sun, Jan 02, 2011 at 04:48:29PM -0500, John Drescher wrote: I would just add the user in ldap directly. LAM is a good tool to do that and pretty easy to use. http://www.ldap-account-manager.org Yes, I know, you are right but... ...but that question I mailed is because I want to understand what is going on. I do not want just to turn around the problem. I want to understand...I was asking if someone has encountered a similar problem just to have a hint on where start fiddling to understand fix the problem. Sorry for the noise...(returning to study some Samba+LDAP howtos...) -- Marco Ciampa ++ | Linux User #78271 | | FSFE fellow #364 | ++ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba4 with freeradius
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 03/01/2011, at 07:35, Matthieu Patou wrote: On 02/01/2011 15:52, Indexer wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, I have been attempting to get freeradius to play nice with samba4. It seems however, that freeradius to utilise mschap expects the ntlm_auth command to support --request-nt-key as an option, yet the ntlm_auth in samba4 does not contain this flag. What do i use instead, or is this support that will be added in the future. You'd better not use the ntlm_auth of samba4 but more the one of samba3 that is to say either you manage to install both on a server or you put your freeradius on another server. Yep, that seems to be my plan for the moment. What are the plans for this in the future to make it work? Matthieu. -- Matthieu Patou Samba Teamhttp://samba.org Private repo http://git.samba.org/?p=mat/samba.git;a=summary -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba William Brown pgp.mit.edu -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0.16 (Darwin) iQIcBAEBAgAGBQJNIP+6AAoJEHF16AnLoz6JvVgQAJ/tyNdgF65LSafJAYnds0GF 2QjlUXiXf983sIxZBCPpqHZzJbq2y7r4QZ0kKXLmGedLlb9Ex8iTc65n2zHT3zg2 yZ/gEAcSUCoDh4NcoTcHmt2NRTOI/TxwKfNqpIiEQmiHJCRiDOViDmj4aWrqGj2a zr1RdbIILtbFJqY/uU7cFnkwhuj8n8o6CQ4FmcZZmbfYMejE9ifjr2H8zwAHD5gs EEBWL7emUeg+w3KFUoBNMeN2geuWoxxecW412rp6hzCQ/8QBKk3hQ48xEP3CwMOm LlLJ/CKhB8hn5As56YLySAL4Da8fGXxBBuXx9G2r+RN3w/YIevu0LdCQGon6SfG8 PMe/UmCO+PhpwXqPaTdwyWAo7vPU6aPNZMgIXuvZP0CUrQELWNmowU9CVBcXheGI MMbH8mnSBE3cevwO3xtq1ovVx23zfdfYjArFSjZVF9buPwTFCxfkkI+JBzLrE2Jd 9eDggnEJNZmotdkGdxb2bX/L4wM0Ly9JXbXliBDkdTl8H3GNjvlqsABcSk0/D3Rz f+S2faIb7fYg796BCwmBH9tYlr7T4f7w8DSK2x2XrEsTFSlQRa0cRE7aszISmKbP yPtT9t3IRGxwaRi6Yf3i2pAT5yJby9XQs3dkxDi0k/x9gqjTYUNiq/LsnUShP/Ol D0k61ikubevj6yP4V0SD =KK/O -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] error adding a user
On Sun, Jan 2, 2011 at 5:17 PM, Marco Ciampa ciam...@libero.it wrote: On Sun, Jan 02, 2011 at 04:48:29PM -0500, John Drescher wrote: I would just add the user in ldap directly. LAM is a good tool to do that and pretty easy to use. http://www.ldap-account-manager.org Yes, I know, you are right but... ...but that question I mailed is because I want to understand what is going on. I do not want just to turn around the problem. I want to understand...I was asking if someone has encountered a similar problem just to have a hint on where start fiddling to understand fix the problem. Sorry for the noise...(returning to study some Samba+LDAP howtos...) No you are fine. You should probably post a few details of your setup. samba version, windows version, samba config. More context from the samba log you posted. Possibly an expert can help with this. I myself probably can not help much on this one. John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Need a little help with Samba 3.5.5 on FreeNAS 7.2.5543
Ok, I've worked through a few different items but am still coming up zero. The Audiotron appears to be case insensitive (or at least how it talks to Samba). I tried the file in all upper, all lower and even mixed case. I still get the same error. If I delete the file, no error, but no file either. Additionally all the MP3 files are in mixed case and it appears to recognize all of them without trouble. Filename length also appears to not be an issue. I tried 8.3 format, ie radiotr.txt/RADIOTR.TXT/RadioIO.txt and came up with the same results. It appears to see the file is present but acts like it cannot read it saying no stations found. In addition all of the MP3 files are in mixed case and have longer than 8.3 file names. On Mon, Dec 20, 2010 at 3:57 AM, Michael Wood esiot...@gmail.com wrote: On 20 December 2010 04:16, Steve B stev...@gmail.com wrote: 1. Not sure what you mean by remote the file. I can open and read the file I believe he meant remove. I think he was just wondering if you got a different error with the file missing, which would prove that Audiotron was actually accessing the file. If you got the same symptoms, then it's possible that Audiotron was not actually finding/reading the file at all. in any editor, but the Audiotron performs some sort of read function on the file that tells it there are X number of radio stations defined in the file. The file is basically an XML file. -- Michael Wood esiot...@gmail.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Need a little help with Samba 3.5.5 on FreeNAS 7.2.5543
--- Original message --- Subject: Re: [Samba] Need a little help with Samba 3.5.5 on FreeNAS 7.2.5543 From: Steve B stev...@gmail.com To: samba@lists.samba.org Date: Sunday, 02/01/2011 5:29 PM Ok, I've worked through a few different items but am still coming up zero. The Audiotron From Turtle Beach IMPORTANT NOTE: If you are using a NAS (Network Attached Storage) device please do NOT use this Firmware. The last known good version for NAS device Support was: 3.1.1. Sorry about this. http://www.turtlebeach.com/support/index.php?View=entryEntryID=114116399 Since the last update was 2004, I wonder what it's CIFS client is as well...oh well, the above might be a start. appears to be case insensitive (or at least how it talks to Samba). I tried the file in all upper, all lower and even mixed case. I still get the same error. If I delete the file, no error, but no file either. Additionally all the MP3 files are in mixed case and it appears to recognize all of them without trouble. Filename length also appears to not be an issue. I tried 8.3 format, ie radiotr.txt/RADIOTR.TXT/RadioIO.txt and came up with the same results. It appears to see the file is present but acts like it cannot read it saying no stations found. In addition all of the MP3 files are in mixed case and have longer than 8.3 file names. On Mon, Dec 20, 2010 at 3:57 AM, Michael Wood esiot...@gmail.com wrote: On 20 December 2010 04:16, Steve B stev...@gmail.com wrote: 1. Not sure what you mean by remote the file. I can open and read the file I believe he meant remove. I think he was just wondering if you got a different error with the file missing, which would prove that Audiotron was actually accessing the file. If you got the same symptoms, then it's possible that Audiotron was not actually finding/reading the file at all. in any editor, but the Audiotron performs some sort of read function on the file that tells it there are X number of radio stations defined in the file. The file is basically an XML file. -- Michael Wood esiot...@gmail.com -- 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
[Samba] Auto-Removal of Straggling File locks due to Ungraceful Client Disconnects
Hi all, This question has come up many times before in a number of guises. But I do not believe that it has ever been answered satisfactorily. This may well reflect fundamental difficulties in the CIFS protocol However, recent incarnations of Windows Server seem to handle the problem better possibly due to tweaks in the underlying TCP/IP stack vis-a-vis Linux. At the end of the day, a centralised/shared file system should be immune to client misbehaviour. While file corruption by a misbehaving client with write access is always a possibility. Surely it is reasonable that a file should not be left locked indefinitely by a client that has long since departed the scene. Suggested solutions usually revolve around: 1. Client configuration tweaks. 2. Samba's Reset on Zero VC option in smb.conf. My response to these is that: 1. A server should not have to depend on well-behaving clients to maintain basic file system integrity. 2. Reset on Zero VC only helps in the case where the disconnected client actually reconnects. But what if a client suddenly disconnects due to a crash, power outage or careless disconnect? What if the client stays disconnected indefinitely e.g. laptop has been whipped out and gone off site? In these situations, a server administrator needs to be on standby. And straggling locks can be removed manually by: 1. Identifying them using the smbstatus utility 2. Killing the relevant server process. But this can become extremely tedious in busy ad hoc networks with mobile users So can someone please advise me why it is not possible for Samba to: 1. Identify obvious long term client disconnects e.g. by polling every five minutes. 2. Automatically remove any locks still held by such clients. Hope I am making some sense here and haven't missed something obvious. TIA rvjcallanan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] web based backend
Hi Vaclav, Andrew, Matthieu, On Fri, 2010-12-31 at 01:44 +0300, Matthieu Patou wrote: On 25/12/2010 17:04, Vaclav Klecanda wrote: Hi Andrew, my original idea was rather implement a separate project, not included into samba4 source but rather above it. If there was an unified way to provision samba related things it would not be problem to build a provisioning above the samba. No matter it is web based or whatever else. But it would require that the provisioning will not change and is well documented. I like python and django, so my original idea was to use this to implement web based provisioning to samba. While end-to-end testing of AJAX applications is not as easy as, say, a command-line application, it is certainly not impossible. The previous incarnation of SWAT2 had no tests whatsoever, and it could easily have had a lot better test coverage. Its main worker functions, which didn't involve any AJAXy bits at all, should have had tests, but we didn't have the habit of unit testing our swat2 EJS code. There are several frameworks that help in doing end to end testing. I only have (mixed) experiences with Windmill, see http://www.getwindmill.com/ SWAT2 development is still active, it's ricardo (a samba's soc) who is doing stuff on it. He's doing a great job, and I think it deserves a bit more visibility. It would be nice to make it a bit more easily installable (it should be just a matter of unpacking a tar.gz in the right location, but isn't at the moment). Cheers, Jelmer signature.asc Description: This is a digitally signed message part -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Remote connection to Samba service doesn't work
Hi. I've got a nasty problem with Samba. Basically, I can't connect to my Samba service from a home laptop (running Windows 7). I guess that on this side everything is fine, I'm using my corporate Samba shares via VPN, I've been using Samba on my previous server and it was running OK. I've asked my buddy living nearby to connect and it didn't work for him, as well as for 15 other people across living my country. The weirdest thing is, that there are actually people that are able to connect. They were using both Windows XP and 7 and I can't really tell why. I see their connections in logs, but I can't really tell a difference between my and theirs setup. I've tried to use default Debian Etch 2.x Samba, 3.x backports version, compiled 3.x from sources, even reinstalled operating system on the server. I've used default config, copied one from my previous server, wrote it from stretch server times. Every single time it was possible to connect locally (smbclient -L localhost). On the client side, I've tried using default Windows 7 (and XP) smb/cifs implementation and cygwin's smbclient. My server ISP tells that they don't block anything and it's the first time someone has reported problem like this. My iptables are clean at the moment. Currently I'm using v. 3.2.5 with default config with one share and added user by smbpasswd. revik:~# smbclient localhost\\test Enter root's password: Domain=[REVIK] OS=[Unix] Server=[Samba 3.2.5] smb: \ ls . D 0 Fri Dec 31 13:57:25 2010 .. D 0 Fri Dec 31 13:57:16 2010 testfile 0 Fri Dec 31 13:57:25 2010 35201 blocks of size 8388608. 33290 blocks available I don't really can think of any single idea how to make it work or where the problem actually lies. I'd appreciate any help, thanks. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Pdbedit problem
Hi, My name is Lou and I work for Astoria Federal Savings Bank. I just installed SAMBA in our Unix environment and would like to use pdbedit to manage the password policy. Samb is working well in my Unix environment. However, I cannot get pdbedit to update the password policy. No matter what I do what pdbcommand I use, I am still having the same issue. I followed all the instructions from the google search for pdbedit, It is still not working. I am not using ldap however. Is that the reason why it is not working. Please help SAMBA version I am using is 3.4.5. Same as pdbedit. Thank you ** This e-mail and any attachments that accompany it are confidential and may be legally privileged. It is intended solely for the use of the individual(s) to whom it was intended to be addressed. Access to this e-mail by anyone else is unauthorized. If you are not the intended recipient, please immediately return the e-mail to the sender and delete the original and any copy from your computer. If the reader of this message is not the intended recipient, or an employee or agent responsible for delivering this message to its intended recipient, you are herewith notified that any dissemination, distribution, copying or retention of this communication or the information contained herein is strictly prohibited. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Testparm: rlimit_max: rlimit_max (8192) below minimum Windows limit (16384)
Jeremy Allison wrote:
On Mon, Jan 25, 2010 at 11:44:03AM +, Miguel Medalha wrote:
rlimit_max: rlimit_max (8192) below minimum Windows limit (16384)
I searched Google for some answer but I couldn't find a satisfactory
one. What should I do to solve this?
[...]
It's a warning, you can safely ignore it. Windows 7 clients need to
have exactly the same number of open handles available as Windows
servers, else it fails in some file copy situations with a out of
handles message. Samba has taken care of it for you, but it's just
letting you know your fd limit is set a bit low.
Uninformed reaction: is it useful to let the user know? Does setting
the fd limit higher result in better behavior, or does the automatic
increase have results that would be counterintuitive if not mentioned?
If the former, maybe the default rlimit_max should be increased
(on Debian squeeze it seems to be 1024 fwiw). If the latter, I think
the message should say
rlimit_max: rlimit_max (8192) increased to minimum Windows limit (16384)
to be more informative and sound less like a warning. Like this,
maybe (untested).
-- 8 --
Subject: s3-param: Make rlimit_max below minimum Windows limit notification
less scary
The fix to bug #6837 results in messages from testparm that look
like a misconfiguration even though they aren't:
rlimit_max: rlimit_max (8192) below minimum Windows limit (16384)
Apply a slight change in wording (increasing rlimit_max to minimum
Windows limit) to make it clearer that the user has done nothing
wrong. (Similarly for sysctl_max.)
Reported-by: Miguel Medalha miguelmeda...@sapo.pt
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
source3/param/loadparm.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2f68f00..bda20d8 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4898,7 +4898,7 @@ static int max_open_files(void)
#endif
if (sysctl_max MIN_OPEN_FILES_WINDOWS) {
- DEBUG(2,(max_open_files: sysctl_max (%d) below
+ DEBUG(2,(max_open_files: increasing sysctl_max (%d) to
minimum Windows limit (%d)\n,
sysctl_max,
MIN_OPEN_FILES_WINDOWS));
@@ -4906,7 +4906,7 @@ static int max_open_files(void)
}
if (rlimit_max MIN_OPEN_FILES_WINDOWS) {
- DEBUG(2,(rlimit_max: rlimit_max (%d) below
+ DEBUG(2,(rlimit_max: increasing rlimit_max (%d) to
minimum Windows limit (%d)\n,
rlimit_max,
MIN_OPEN_FILES_WINDOWS));
--
1.7.4.rc0
--
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 41179c2 Fix a valgrind error
from 9d754da Fix memory leak I introduced when refactoring unexpected
packet code. Found by Volker.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 41179c2538b38eafc52ac5355d2c4becdd9c87d4
Author: Volker Lendecke v...@samba.org
Date: Sun Jan 2 02:48:03 2011 +0100
Fix a valgrind error
Thanks to Tridge for the hint.
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Sun Jan 2 10:58:51 CET 2011 on sn-devel-104
---
Summary of changes:
libcli/nbt/nbtname.c |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/nbt/nbtname.c b/libcli/nbt/nbtname.c
index 3f0a122..fec8e8e 100644
--- a/libcli/nbt/nbtname.c
+++ b/libcli/nbt/nbtname.c
@@ -83,7 +83,9 @@ static enum ndr_err_code ndr_pull_component(struct ndr_pull
*ndr,
return ndr_pull_error(ndr, NDR_ERR_STRING,
BAD NBT NAME component);
}
- *component = (uint8_t*)talloc_strndup(ndr, (const char
*)ndr-data[1 + *offset], len);
+ *component = (uint8_t*)talloc_strndup(
+ ndr-current_mem_ctx,
+ (const char *)ndr-data[1 + *offset], len);
NDR_ERR_HAVE_NO_MEMORY(*component);
*offset += len + 1;
*max_offset = MAX(*max_offset, *offset);
@@ -127,7 +129,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_nbt_string(struct
ndr_pull *ndr, int ndr_fla
BAD NBT NAME too many components);
}
if (num_components == 0) {
- name = talloc_strdup(ndr, );
+ name = talloc_strdup(ndr-current_mem_ctx, );
NDR_ERR_HAVE_NO_MEMORY(name);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 45cb9bb s3:net: make idmap_store_secret static.
via 7f256a7 s3:net: fix the usage for net idmap secret (removing alloc)
via 11016f2 s3:net: remove alloc parameter from idmap_store_secret()
(net idmap store).
via 2d3a8b1 s3:idmap_ldap: remove special handling of alloc secret (not
used any more).
via 52b37de s3:idmap_ldap: remove unused idmap_ldap_alloc_context.
via 91e7430 s3:idmap_ldap: remove alloc context member from
ldap_idmap_context
via 5908bd6 s3:idmap_ldap: remove use of alloc context from
idmap_ldap_allocate_id().
via 510bf2d s3:idmap_ldap: remove unused
idmap_ldap_alloc_close_destructor().
via f83fa1e s3:idmap_ldap: remove unused idmap_ldap_alloc_init().
via 632e232 s3:idmap_ldap: don't call idmap_ldap_alloc_init in
idmap_ldap_init.
via 58508c9 s3:idmap_ldap: remove use of the ldap_idmap_alloc_context
from verify_idpool().
from 41179c2 Fix a valgrind error
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 45cb9bba37407ab4e76b0955e6a379efc6d562a4
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:43:34 2010 +0100
s3:net: make idmap_store_secret static.
Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Sun Jan 2 13:41:07 CET 2011 on sn-devel-104
commit 7f256a740cc43dbaed545cf0d2533cc31a25806b
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:41:28 2010 +0100
s3:net: fix the usage for net idmap secret (removing alloc)
commit 11016f2a6befc477c631c4f2ed8d9e7e4e250102
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:39:28 2010 +0100
s3:net: remove alloc parameter from idmap_store_secret() (net idmap store).
commit 2d3a8b196fe1ef47a5fb7bc5c13671125f59da91
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:32:53 2010 +0100
s3:idmap_ldap: remove special handling of alloc secret (not used any more).
commit 52b37de5d88301ce1a6d05128d9c19043f5a2b51
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:26:29 2010 +0100
s3:idmap_ldap: remove unused idmap_ldap_alloc_context.
commit 91e743081723dc78fd5e5a6e2efe9c2603bf17bf
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:26:05 2010 +0100
s3:idmap_ldap: remove alloc context member from ldap_idmap_context
commit 5908bd62b557723f36d8055506d4602cfc567684
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:24:01 2010 +0100
s3:idmap_ldap: remove use of alloc context from idmap_ldap_allocate_id().
commit 510bf2d59175cb4aabf26c0dc1afcb6873955cb4
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:07:29 2010 +0100
s3:idmap_ldap: remove unused idmap_ldap_alloc_close_destructor().
commit f83fa1ec20fd398dbbe5fab0e25f27d9697df91b
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:06:50 2010 +0100
s3:idmap_ldap: remove unused idmap_ldap_alloc_init().
commit 632e232fc482cd76553b88b84cd4479bfee0845a
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:04:20 2010 +0100
s3:idmap_ldap: don't call idmap_ldap_alloc_init in idmap_ldap_init.
Call verify_idpool() instead.
commit 58508c97260269ec47746adf81da34d9d0d8a1bb
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:19:23 2010 +0100
s3:idmap_ldap: remove use of the ldap_idmap_alloc_context from
verify_idpool().
Allocation is now subsumed in the idmap ldap config.
This is the beginning of the removal of the idmap ldap alloc parameters.
---
Summary of changes:
source3/utils/net_idmap.c | 24 +++
source3/utils/net_proto.h |3 -
source3/winbindd/idmap_ldap.c | 172 +++--
3 files changed, 38 insertions(+), 161 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index 488132b..e3640bd 100644
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -289,19 +289,16 @@ static int net_idmap_set(struct net_context *c, int argc,
const char **argv)
d_printf(%s\n, _(Not implemented yet));
return -1;
}
-bool idmap_store_secret(const char *backend, bool alloc,
- const char *domain, const char *identity,
- const char *secret)
+static bool idmap_store_secret(const char *backend,
+ const char *domain,
+ const char *identity,
+ const char *secret)
{
char *tmp;
int r;
bool ret;
- if (alloc) {
- r = asprintf(tmp, IDMAP_ALLOC_%s, backend);
- } else {
- r = asprintf(tmp, IDMAP_%s_%s, backend, domain);
- }
+ r = asprintf(tmp, IDMAP_%s_%s, backend, domain);
if (r 0) return false;
@@ -363,7 +360,7 @@ static int
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 593c004 s3: Fix a memleak in receive_getdc_response
from 45cb9bb s3:net: make idmap_store_secret static.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 593c004b74693aeddfffdf80945d37bac7276969
Author: Volker Lendecke v...@samba.org
Date: Sun Jan 2 05:57:09 2011 +0100
s3: Fix a memleak in receive_getdc_response
It's the free_packet() that was missing. On the way, I've changed the
return false; to a goto fail;, which makes the patch a bit larger.
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Sun Jan 2 14:27:56 CET 2011 on sn-devel-104
---
Summary of changes:
source3/libsmb/clidgram.c | 37 ++---
1 files changed, 22 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index 05a0edc..c9592a1 100644
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -107,7 +107,7 @@ static bool cli_prep_mailslot(bool unique, const char
*mailslot,
return true;
}
-static const char *mailslot_name(TALLOC_CTX *mem_ctx, struct in_addr dc_ip)
+static char *mailslot_name(TALLOC_CTX *mem_ctx, struct in_addr dc_ip)
{
return talloc_asprintf(mem_ctx, %s%X,
NBT_MAILSLOT_GETDC, dc_ip.s_addr);
@@ -220,11 +220,11 @@ bool receive_getdc_response(TALLOC_CTX *mem_ctx,
const char **dc_name,
struct netlogon_samlogon_response
**samlogon_response)
{
- struct packet_struct *packet;
- const char *my_mailslot = NULL;
+ struct packet_struct *packet = NULL;
+ char *my_mailslot = NULL;
struct in_addr dc_ip;
DATA_BLOB blob;
- struct netlogon_samlogon_response *r;
+ struct netlogon_samlogon_response *r = NULL;
union dgram_message_body p;
enum ndr_err_code ndr_err;
NTSTATUS status;
@@ -257,12 +257,12 @@ bool receive_getdc_response(TALLOC_CTX *mem_ctx,
if (blob.length 4) {
DEBUG(0,(invalid length: %d\n, (int)blob.length));
- return false;
+ goto fail;
}
if (RIVAL(blob.data,0) != DGRAM_SMB) {
DEBUG(0,(invalid packet\n));
- return false;
+ goto fail;
}
blob.data += 4;
@@ -272,12 +272,12 @@ bool receive_getdc_response(TALLOC_CTX *mem_ctx,
(ndr_pull_flags_fn_t)ndr_pull_dgram_smb_packet);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
DEBUG(0,(failed to parse packet\n));
- return false;
+ goto fail;
}
if (p.smb.smb_command != SMB_TRANSACTION) {
DEBUG(0,(invalid smb_command: %d\n, p.smb.smb_command));
- return false;
+ goto fail;
}
if (DEBUGLEVEL = 10) {
@@ -288,13 +288,12 @@ bool receive_getdc_response(TALLOC_CTX *mem_ctx,
r = TALLOC_ZERO_P(mem_ctx, struct netlogon_samlogon_response);
if (!r) {
- return false;
+ goto fail;
}
status = pull_netlogon_samlogon_response(blob, mem_ctx, r);
if (!NT_STATUS_IS_OK(status)) {
- TALLOC_FREE(r);
- return false;
+ goto fail;
}
map_netlogon_samlogon_response(r);
@@ -308,14 +307,12 @@ bool receive_getdc_response(TALLOC_CTX *mem_ctx,
if (!strequal(returned_domain, domain_name)) {
DEBUG(3, (GetDC: Expected domain %s, got %s\n,
domain_name, returned_domain));
- TALLOC_FREE(r);
- return false;
+ goto fail;
}
*dc_name = talloc_strdup(mem_ctx, returned_dc);
if (!*dc_name) {
- TALLOC_FREE(r);
- return false;
+ goto fail;
}
if (**dc_name == '\\') *dc_name += 1;
@@ -330,5 +327,15 @@ bool receive_getdc_response(TALLOC_CTX *mem_ctx,
DEBUG(10, (GetDC gave name %s for domain %s\n,
*dc_name, returned_domain));
+ free_packet(packet);
+ TALLOC_FREE(my_mailslot);
return True;
+
+fail:
+ TALLOC_FREE(my_mailslot);
+ TALLOC_FREE(r);
+ if (packet != NULL) {
+ free_packet(packet);
+ }
+ return false;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 9d30733 s3:net: make idmap_store_secret static.
via ed31148 s3:net: fix the usage for net idmap secret (removing alloc)
via 57beac0 s3:net: remove alloc parameter from idmap_store_secret()
(net idmap store).
via ef2cc5f s3:idmap_ldap: remove special handling of alloc secret (not
used any more).
via 2b87f84 s3:idmap_ldap: remove unused idmap_ldap_alloc_context.
via 0819160 s3:idmap_ldap: remove alloc context member from
ldap_idmap_context
via c4bb784 s3:idmap_ldap: remove use of alloc context from
idmap_ldap_allocate_id().
via 3aab070 s3:idmap_ldap: remove unused
idmap_ldap_alloc_close_destructor().
via 84a28a1 s3:idmap_ldap: remove unused idmap_ldap_alloc_init().
via c32e154 s3:idmap_ldap: don't call idmap_ldap_alloc_init in
idmap_ldap_init.
via e814929 s3:idmap_ldap: remove use of the ldap_idmap_alloc_context
from verify_idpool().
from a31f756 Fix a valgrind error
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 9d30733496f0a53d556dacff6284f4642ae00dce
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:43:34 2010 +0100
s3:net: make idmap_store_secret static.
Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Sun Jan 2 13:41:07 CET 2011 on sn-devel-104
commit ed31148c4838789a2ad30da8db2f0a82cb702143
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:41:28 2010 +0100
s3:net: fix the usage for net idmap secret (removing alloc)
commit 57beac091a4c8284c268c9c40951643718cccb3a
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:39:28 2010 +0100
s3:net: remove alloc parameter from idmap_store_secret() (net idmap store).
commit ef2cc5f9b9568b843d95b81d9f751f0d3e6a66b2
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:32:53 2010 +0100
s3:idmap_ldap: remove special handling of alloc secret (not used any more).
commit 2b87f84c26c411b69be28e109d631ccd93bbe5be
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:26:29 2010 +0100
s3:idmap_ldap: remove unused idmap_ldap_alloc_context.
commit 0819160898a64249a685c0be1944fd9e04ba875f
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:26:05 2010 +0100
s3:idmap_ldap: remove alloc context member from ldap_idmap_context
commit c4bb7843ab787469a2150f7bb66da7919dac1e90
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:24:01 2010 +0100
s3:idmap_ldap: remove use of alloc context from idmap_ldap_allocate_id().
commit 3aab0703754fdd2652da9402c7fab9b94f5aaf75
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:07:29 2010 +0100
s3:idmap_ldap: remove unused idmap_ldap_alloc_close_destructor().
commit 84a28a1893d918bb9588d9eea843156c6a956ab1
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:06:50 2010 +0100
s3:idmap_ldap: remove unused idmap_ldap_alloc_init().
commit c32e15493a27bf606c4b409bd1a4d9c41a4f0949
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:04:20 2010 +0100
s3:idmap_ldap: don't call idmap_ldap_alloc_init in idmap_ldap_init.
Call verify_idpool() instead.
commit e814929cd69bbe198fdcec47969f603a3713d145
Author: Michael Adam ob...@samba.org
Date: Wed Dec 8 00:19:23 2010 +0100
s3:idmap_ldap: remove use of the ldap_idmap_alloc_context from
verify_idpool().
Allocation is now subsumed in the idmap ldap config.
This is the beginning of the removal of the idmap ldap alloc parameters.
---
Summary of changes:
source3/utils/net_idmap.c | 24 +++
source3/utils/net_proto.h |3 -
source3/winbindd/idmap_ldap.c | 172 +++--
3 files changed, 38 insertions(+), 161 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index 488132b..e3640bd 100644
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -289,19 +289,16 @@ static int net_idmap_set(struct net_context *c, int argc,
const char **argv)
d_printf(%s\n, _(Not implemented yet));
return -1;
}
-bool idmap_store_secret(const char *backend, bool alloc,
- const char *domain, const char *identity,
- const char *secret)
+static bool idmap_store_secret(const char *backend,
+ const char *domain,
+ const char *identity,
+ const char *secret)
{
char *tmp;
int r;
bool ret;
- if (alloc) {
- r = asprintf(tmp, IDMAP_ALLOC_%s, backend);
- } else {
- r = asprintf(tmp, IDMAP_%s_%s, backend, domain);
- }
+ r = asprintf(tmp, IDMAP_%s_%s, backend, domain);
if (r 0) return false;
@@ -363,7 +360,7 @@ static
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4d5c0c3 s4: Happy New Year 2011
via 81a167b s3: Happy New Year 2011
from 593c004 s3: Fix a memleak in receive_getdc_response
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4d5c0c3ec5a0c7a95b25eed5149e8cf665f295c9
Author: Stefan Metzmacher me...@samba.org
Date: Sun Jan 2 17:55:55 2011 +0100
s4: Happy New Year 2011
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Sun Jan 2 18:42:12 CET 2011 on sn-devel-104
commit 81a167b5df47e8964fbd0f12d9ba16b41a0625a4
Author: Stefan Metzmacher me...@samba.org
Date: Sun Jan 2 17:55:05 2011 +0100
s3: Happy New Year 2011
metze
---
Summary of changes:
source3/include/smb.h |2 +-
source4/smbd/server.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 1957504..1a76691 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -27,7 +27,7 @@
#define _SMB_H
/* logged when starting the various Samba daemons */
-#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the
Samba Team 1992-2010
+#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the
Samba Team 1992-2011
#if defined(LARGE_SMB_OFF_T)
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 0b1ff06..0a4e38d 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -365,7 +365,7 @@ static int binary_smbd_main(const char *binary_name, int
argc, const char *argv[
umask(0);
DEBUG(0,(%s version %s started.\n, binary_name,
SAMBA_VERSION_STRING));
- DEBUGADD(0,(Copyright Andrew Tridgell and the Samba Team
1992-2010\n));
+ DEBUGADD(0,(Copyright Andrew Tridgell and the Samba Team
1992-2011\n));
if (sizeof(uint16_t) 2 || sizeof(uint32_t) 4 || sizeof(uint64_t)
8) {
DEBUG(0,(ERROR: Samba is not configured correctly for the word
size on your machine\n));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 22b7cb3 pyldb: Fix memory reference error.
via 9fc2e6c Use TestCase.get_credentials() where possible.
via 0346f51 pyldb: Always return -1, 0, or 1 in tp_compare functions.
via fdb0aa2 Revert broken destructor changes.
via 027e6b2 pyldb: Fix memory context, add more OOM checks.
via 50a2c83 pyldb: Some more OOM checks.
via 2533a50 Make all functions in pyldb.c private, as they can't be
used anyway.
via 8bf5356 s4-python: Add missing prototypes.
via e31224e pyldb: Use pytalloc-util.
via b63f9c1 ldb: Remove duplicate definition of check_special, use
PyObject_New.
via cbf504b s4-python: Properly call PyObject_Del from all destructors.
via b320cc7 Fix some formatting.
via 320fd69 Use fail_on_null.
from 4d5c0c3 s4: Happy New Year 2011
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 22b7cb3f2905375b5a9d88d9309062ceec658540
Author: Jelmer Vernooij jel...@samba.org
Date: Mon Jan 3 01:43:51 2011 +0100
pyldb: Fix memory reference error.
Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Mon Jan 3 02:34:05 CET 2011 on sn-devel-104
commit 9fc2e6c352726d9b14afb5defaee399d20cf9b23
Author: Jelmer Vernooij jel...@samba.org
Date: Mon Jan 3 01:13:09 2011 +0100
Use TestCase.get_credentials() where possible.
commit 0346f5163227f52d8656a923b86099770609dff4
Author: Jelmer Vernooij jel...@samba.org
Date: Sun Jan 2 22:34:26 2011 +0100
pyldb: Always return -1, 0, or 1 in tp_compare functions.
commit fdb0aa2b04a5be5f13c39fd42818f898b839ef0f
Author: Jelmer Vernooij jel...@samba.org
Date: Sat Jan 1 06:55:54 2011 +0100
Revert broken destructor changes.
commit 027e6b2b22d4938ea0581b8c80372421a31b67ff
Author: Jelmer Vernooij jel...@samba.org
Date: Thu Dec 30 20:11:59 2010 +0100
pyldb: Fix memory context, add more OOM checks.
commit 50a2c83908a29dce64e6375fd09fa5471921a175
Author: Jelmer Vernooij jel...@samba.org
Date: Thu Dec 30 19:59:01 2010 +0100
pyldb: Some more OOM checks.
commit 2533a504719246682308f30f859c7bab1ebea272
Author: Jelmer Vernooij jel...@samba.org
Date: Thu Dec 30 19:39:14 2010 +0100
Make all functions in pyldb.c private, as they can't be used anyway.
commit 8bf53569581c2e7677f7e698fe749f595117bc86
Author: Jelmer Vernooij jel...@samba.org
Date: Thu Dec 30 19:30:09 2010 +0100
s4-python: Add missing prototypes.
commit e31224e27c94b36af1d33d3b571d8320121ef22a
Author: Jelmer Vernooij jel...@samba.org
Date: Thu Dec 30 18:10:49 2010 +0100
pyldb: Use pytalloc-util.
commit b63f9c199659fafa2525ef24525b22e339f97f93
Author: Jelmer Vernooij jel...@samba.org
Date: Thu Dec 30 03:43:23 2010 +0100
ldb: Remove duplicate definition of check_special, use PyObject_New.
commit cbf504b0c5e08ccf9776f079ef2d4a0c2258241b
Author: Jelmer Vernooij jel...@samba.org
Date: Wed Dec 29 15:58:12 2010 +0100
s4-python: Properly call PyObject_Del from all destructors.
commit b320cc799096fb07870c5e5d6d69d485cb1d1ea5
Author: Jelmer Vernooij jel...@samba.org
Date: Tue Dec 28 16:30:47 2010 +0100
Fix some formatting.
commit 320fd69923cf4a647869a89453d01acf81f479e0
Author: Jelmer Vernooij jel...@samba.org
Date: Mon Dec 27 14:32:48 2010 +0100
Use fail_on_null.
---
Summary of changes:
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm|6 +-
pidl/lib/Parse/Pidl/Samba4/Python.pm|2 +-
source4/dsdb/pydsdb.c |2 +
source4/lib/ldb/pyldb.c | 121 +-
source4/lib/ldb/pyldb.h |7 +--
source4/lib/ldb/tests/python/api.py |4 +
source4/lib/ldb/wscript |2 +-
source4/libnet/py_net.c |2 +
source4/torture/drs/python/delete_object.py |2 +-
source4/torture/drs/python/fsmo.py |2 +-
source4/torture/drs/python/repl_schema.py |2 +-
source4/torture/libnet/python/samr-test.py |7 +-
12 files changed, 99 insertions(+), 60 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 732aa98..5802f9b 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -206,11 +206,11 @@ sub ParseArrayPushHeader($$)
if ((!$l-{IS_SURROUNDING}) and $l-{IS_CONFORMANT}) {
$self-pidl(NDR_CHECK(ndr_push_uint3264($ndr, NDR_SCALARS,
$size)););
}
-
+
if ($l-{IS_VARYING}) {
$self-pidl(NDR_CHECK(ndr_push_uint3264($ndr, NDR_SCALARS,
0));); # array offset
$self-pidl(NDR_CHECK(ndr_push_uint3264($ndr, NDR_SCALARS,
$length)););
- }
+ }
return
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via b5474f2 remove unnecessary use of pass. from 22b7cb3 pyldb: Fix memory reference error. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b5474f2441fc1c2853cf898bf143f1aa2eda8a03 Author: Jelmer Vernooij jel...@samba.org Date: Mon Jan 3 06:54:07 2011 +0100 remove unnecessary use of pass. Autobuild-User: Jelmer Vernooij jel...@samba.org Autobuild-Date: Mon Jan 3 08:21:12 CET 2011 on sn-devel-104 --- Summary of changes: source4/torture/drs/python/fsmo.py |8 1 files changed, 0 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/torture/drs/python/fsmo.py b/source4/torture/drs/python/fsmo.py index cdee7ab..4dc573b 100644 --- a/source4/torture/drs/python/fsmo.py +++ b/source4/torture/drs/python/fsmo.py @@ -83,7 +83,6 @@ class DrsFsmoTestCase(samba.tests.TestCase): # we will need DCs DNS names for 'net fsmo' command self.dnsname_dc1 = self.info_dc1[dnsHostName][0] self.dnsname_dc2 = self.info_dc2[dnsHostName][0] -pass def tearDown(self): super(DrsFsmoTestCase, self).tearDown() @@ -100,7 +99,6 @@ class DrsFsmoTestCase(samba.tests.TestCase): cmd_line_auth) ret = os.system(cmd_line) self.assertEquals(ret, 0, Transferring role %s to %s has failed! % (role, DC)) -pass def _wait_for_role_transfer(self, ldb_dc, role_dn, master): Wait for role transfer for certain amount of time @@ -146,25 +144,19 @@ class DrsFsmoTestCase(samba.tests.TestCase): master=self.dsServiceName_dc1) self.assertTrue(res, Transferring %s role to %s has failed, master is: %s!%(role, self.dsServiceName_dc1, master)) -pass def test_SchemaMasterTransfer(self): self._role_transfer(role=schema, role_dn=self.schema_dn) -pass def test_InfrastructureMasterTransfer(self): self._role_transfer(role=infrastructure, role_dn=self.infrastructure_dn) -pass def test_PDCMasterTransfer(self): self._role_transfer(role=pdc, role_dn=self.domain_dn) -pass def test_RIDMasterTransfer(self): self._role_transfer(role=rid, role_dn=self.rid_dn) -pass def test_NamingMasterTransfer(self): self._role_transfer(role=naming, role_dn=self.naming_dn) -pass -- Samba Shared Repository
