[Samba] how to remotely join workstations from commandline no ADS
Any help ??? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] how to remotely join workstations from commandline no ADS
On Wed, Nov 17, 2010 at 09:09:11AM +0100, Hubert Choma wrote: Any help ??? I am guessing that net dom join does not work in your case? Volker -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba 3.5.X
Hi,Can anyone hepl me, What is the prerqiiment for WSUS server, Give me link to free download WSUS setup3.0 On Wed, Nov 17, 2010 at 1:35 AM, Belter Steve Ortiz Mijangos st...@uvg.edu.gt wrote: Hello, I don't know if this was reported before, I never found anything related. A few days ago I installed a Domain Controller with samba 3.5.6, with an ldap backend. I added a Windows 2008 Server R2 to the domain but never was able to authenticate to the domain, I always got the error There are currently no logon. . After a time I decided to try samba 3.4.8, without any changes in the configuration and nowhere else, I was able to authenticate. Is there a reason for this?? Steve -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- --- Thanks Regards. Anil S Wakhare. Pune 411027,Maharashtra,India Ph:-9763328839 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] how to map shared folders when start user profile in XP
Hi No, the problem continues. I putted in smb.conf this: logon script = %u.bat logon path = \\%n\Profiles\%u logon drive = H: And inside user profile, in the root folder, i putted user.bat with instrucciones to test. If I execute manually works fine, but not works at start of sesion. Suggestions? Thanks 2010/11/16 anil aswakh...@gmail.com Hi, Your problem is sorted now? On 11/16/2010 10:18 PM, marcos gonzalez wrote: Hi I understand If I change the smb.conf to : logon script = %u.bat logon path = \\%n\Profiles\%u logon drive = H: putting the script user.bat into the root profile folder (for example /var/lib/samba/profiles/user/ ) for every user load their configuration? Thanks! 2010/11/16 Anil Wakhareaswakh...@gmail.com Hi, According to me,you can first configure the smb.conf file. Use the following domain master = yes domain logons = yes # the login script name depends on the machine name logon script = %m.bat # the login script name depends on the unix user used logon script = %u.bat logon path = \\%n\Profiles\%u ; logon drive = H: # disables profiles support by specifing an empty path logon path = \\uccagent\%u logon path = \\administrator\%u On Tue, Nov 16, 2010 at 4:04 PM, marcos gonzalez marcos.gonzalez.c...@gmail.com wrote: Hi Im searching examples to configure logon scripts for every user. If I configure netlogon how this [global] logon path = \\%N\profiles\%U logon drive = H: logon home = logon script = logon.bat [netlogon] # comment = Network Logon Service path = /var/lib/samba/netlogon # admin users = root # guest ok = yes read only = yes browseable = no Only I can use one script, but I prefer to use specific scripts for users too. I don't know If I can. Other problem is how to configure shared folders for groups of users. Thanks 2010/11/16 Anil Wakhareaswakh...@gmail.com Hi, I am not getting ur question.can u explain it briefly. On Tue, Nov 16, 2010 at 1:08 PM, marcos gonzalez marcos.gonzalez.c...@gmail.com wrote: Hi yes, Im interested in a login script, but Im a newbie with this and I don't know where I can take examples. Inside samba documentacion there are no the sufficient complex examples and in my case Im interested to made a script for every user. Suggestions? Thnaks 2010/11/15 Gaiseric Vandalgaiseric.van...@gmail.com Are you using a login script? That should take care of mapping shared folders to drive letters. You can't use login scripts to setup printers. If the printers are properly shared from a Windows server or Samba server users should be able to easily locate them in My Network Places. On 11/12/2010 06:33 AM, marcos gonzalez wrote: Hi guys I have configured samba 3.3.2 in a domain with Xp clients and I would like to config inside clients the shared folders how units when users starts, and the printers too. Im looking for this and the information is very confused, and I dont know which the fast option for users. Suggestions? Thanks -- 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 -- --- Thanks Regards. Anil S Wakhare. Pune 411027,Maharashtra,India Ph:-9763328839 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- --- Thanks Regards. Anil S Wakhare. Pune 411027,Maharashtra,India Ph:-9763328839 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] how to map shared folders when start user profile in XP
Hi, your logon script must be put in your: [global] logon script = %u.bat [netlogon] comment = Network Logon Service path = /pathtoyour/netlogon/ --- EDV Daniel Müller Leitung EDV Tropenklinik Paul-Lechler-Krankenhaus Paul-Lechler-Str. 24 72076 Tübingen Tel.: 07071/206-463, Fax: 07071/206-499 eMail: muel...@tropenklinik.de Internet: www.tropenklinik.de --- -Ursprüngliche Nachricht- Von: samba-boun...@lists.samba.org [mailto:samba-boun...@lists.samba.org] Im Auftrag von marcos gonzalez Gesendet: Mittwoch, 17. November 2010 12:41 An: anil Cc: samba@lists.samba.org Betreff: Re: [Samba] how to map shared folders when start user profile in XP Hi No, the problem continues. I putted in smb.conf this: logon script = %u.bat logon path = \\%n\Profiles\%u logon drive = H: And inside user profile, in the root folder, i putted user.bat with instrucciones to test. If I execute manually works fine, but not works at start of sesion. Suggestions? Thanks 2010/11/16 anil aswakh...@gmail.com Hi, Your problem is sorted now? On 11/16/2010 10:18 PM, marcos gonzalez wrote: Hi I understand If I change the smb.conf to : logon script = %u.bat logon path = \\%n\Profiles\%u logon drive = H: putting the script user.bat into the root profile folder (for example /var/lib/samba/profiles/user/ ) for every user load their configuration? Thanks! 2010/11/16 Anil Wakhareaswakh...@gmail.com Hi, According to me,you can first configure the smb.conf file. Use the following domain master = yes domain logons = yes # the login script name depends on the machine name logon script = %m.bat # the login script name depends on the unix user used logon script = %u.bat logon path = \\%n\Profiles\%u ; logon drive = H: # disables profiles support by specifing an empty path logon path = \\uccagent\%u logon path = \\administrator\%u On Tue, Nov 16, 2010 at 4:04 PM, marcos gonzalez marcos.gonzalez.c...@gmail.com wrote: Hi Im searching examples to configure logon scripts for every user. If I configure netlogon how this [global] logon path = \\%N\profiles\%U logon drive = H: logon home = logon script = logon.bat [netlogon] # comment = Network Logon Service path = /var/lib/samba/netlogon # admin users = root # guest ok = yes read only = yes browseable = no Only I can use one script, but I prefer to use specific scripts for users too. I don't know If I can. Other problem is how to configure shared folders for groups of users. Thanks 2010/11/16 Anil Wakhareaswakh...@gmail.com Hi, I am not getting ur question.can u explain it briefly. On Tue, Nov 16, 2010 at 1:08 PM, marcos gonzalez marcos.gonzalez.c...@gmail.com wrote: Hi yes, Im interested in a login script, but Im a newbie with this and I don't know where I can take examples. Inside samba documentacion there are no the sufficient complex examples and in my case Im interested to made a script for every user. Suggestions? Thnaks 2010/11/15 Gaiseric Vandalgaiseric.van...@gmail.com Are you using a login script? That should take care of mapping shared folders to drive letters. You can't use login scripts to setup printers. If the printers are properly shared from a Windows server or Samba server users should be able to easily locate them in My Network Places. On 11/12/2010 06:33 AM, marcos gonzalez wrote: Hi guys I have configured samba 3.3.2 in a domain with Xp clients and I would like to config inside clients the shared folders how units when users starts, and the printers too. Im looking for this and the information is very confused, and I dont know which the fast option for users. Suggestions? Thanks -- 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 -- --- Thanks Regards. Anil S Wakhare. Pune 411027,Maharashtra,India Ph:-9763328839 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- --- Thanks Regards. Anil S Wakhare. Pune 411027,Maharashtra,India Ph:-9763328839 -- 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] wbinfo problem
Hi Guys, I have configured SAMBA with Windows 2003 AD. But #wbinfo -u and #wbinfo -g does not list the users 1. Domain joined successfully. # net rpc testjoin -U Administrator Join to 'DOMAIN' is OK 2. wbinfo -a works ( User authentication ) # wbinfo -a 'DOMAIN\user' Enter DOMAIN\user's password: plaintext password authentication succeeded Enter DOMAIN\user's password: challenge/response password authentication succeeded 3. wbinfo -u and wbinfo -g does list nothing # wbinfo -u # wbinfo -g # wbinfo -r 'DOMAIN\user' Could not get groups for user DOMAIN\user SAMBA config : - [global] workgroup = DOMAIN realm = DOMAIN.BIZ security = ADS password server = EIS printcap name = cups idmap uid = 1000-2000 idmap gid = 1000-2000 winbind enum users = Yes winbind enum groups = Yes winbind use default domain = Yes winbind nss info = rfc2307 cups options = raw Versions :- # smbd -V Version 3.4.2-1.1.3.1-2229-SUSE-SL11.2 # winbindd -V Version 3.4.2-1.1.3.1-2229-SUSE-SL11.2 Share your ideas... Regards, Vivek -- Please don't print this e-mail unless you really need to. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba for z/OS 1.10
Hy Volker, thanks for your feedback. Yes sure we have a C/C++ compiler which also supports some posix standards... I'm just not a c programmer if there would be any need for correcting the source code?!? but for the build process on the mainframe, this would be no problem, as lond it is compilable... I am in contact with samba.org to get technical assistance there also, I let you know, what I will get... thx, Martin I From: Volker Lendecke volker.lende...@sernet.de To: martin.h...@helvetia.ch Cc: samba@lists.samba.org Date: 14.11.2010 00:05 Subject: Re: [Samba] Samba for z/OS 1.10 On Wed, Nov 10, 2010 at 02:54:48PM +0100, martin.h...@helvetia.ch wrote: is there any samba version available for download, which runs on IBM MVS, i.e. IBM z/OS 1.10 ...? There used to be somthing that claimed to run on MVS ages (and I mean AGES, my rough guess would be 10 years) ago. if not, is there a possibility to compile the source code myself for the target system? Sure, if you have something vaguely looking like Posix with a C compiler, then the chances are not too bad. I'd love to see Samba running on z/OS, but I fear that without access to such a box by someone knowledgeable with the Samba build process you will not get very far. I would be happy to assist you to get it up and running there. Volker -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Win7 SLOW printing
Hi, just a short question, which version of samba are you using ? I try to get 3.5.6 to run with windows 7 64 bit and this is a tidious task for me :( cheers christoph On Tue, 16 Nov 2010, Jeremy Allison wrote: On Tue, Nov 16, 2010 at 01:27:43PM -0500, Ryan Suarez wrote: Ok, it looks like this was the cause of the delay. As soon as I disable windows firewall on this client, the errors disappear and jobs start printing immediately. We have bring your own laptops (with their own image) here at the college. I suspect this is the same cause of their delays. Could someone please shed some light what samba uses this connection for? This is the insane Windows print spooler design, where the server connects back to the client to do change notify. Samba tries to do the same - look at spoolss_connect_to_client() in rpc_server/srv_spoolss_nt.c - maybe we should have an option to disable this. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba best regards ~christoph -- /* Christoph Beyer | Office: Building 2b / 23 *\ * DESY|Phone: 040-8998-2317* * - IT - | Fax: 040-8998-4060* \* 22603 Hamburg | http://www.desy.de */ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] NT_STATUS_IO_DEVICE_ERROR while accessing a mounted filesystem
hellosamba！ I mount a filesystem as directory /mnt/newfs in suse and success to access this dir or create files in this dir,so the filesystem is ok; But when I try to connect this filesystem from another suse with cmd smbclient //192.168.10.45/myshare and enter passwd, I can login,but when I try to access the dirctory,it prints errorNT_STATUS_IO_DEVICE_ERROR; I set log level=5 in smb.conf,the error place in log.smbd isreduce_name:couldn't get realpath for *,why? help please,thank you. oywoywoyw oywoyw...@163.com 2010-11-17 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] A device attached to the system is not functioning (smbd -V 3.5.x)
I've tried everything I can think of to get your suggestion to work. I can only seem to get this done after the addition of the of the workstation to the domain with pdbedit. And, at that point I still get the error. I've created 2 additional test samba servers, 1 with tdb backend and another with ldap. Same thing. Additionally, I was able to do some testing with an older Samba 3.0.33 production box and the sambaAcctFlags: [W ] are the same on that server without having to add workstation twice. Is this a minor bug? On 11/15/2010 01:17 AM, Daniel Müller wrote: I had a similar problem: Look at this sambaAcctFlags: [W ] I had one workstation with this sambaAcctFlags: [W ] All other workstations had [W]. I changed it to [W] and it did the trick. Maybe you can solve this too. Good Luck --- EDV Daniel Müller Leitung EDV Tropenklinik Paul-Lechler-Krankenhaus Paul-Lechler-Str. 24 72076 Tübingen Tel.: 07071/206-463, Fax: 07071/206-499 eMail: muel...@tropenklinik.de Internet: www.tropenklinik.de --- -Ursprüngliche Nachricht- Von: samba-boun...@lists.samba.org [mailto:samba-boun...@lists.samba.org] Im Auftrag von Todd E Thomas Gesendet: Montag, 15. November 2010 00:23 An: Samba List; Todd E Thomas Betreff: [Samba] A device attached to the system is not functioning (smbd -V 3.5.x) Howdy, I'm having one last problem with my Samba PDC with an ldap backend. When I add a machine to the domain I get the error, on my Win7 test client, that says: The following error occurred attempting to join the domain office: A device attached to the system is not functioning. Here are some particulars: # smbd -V Version 3.5.6 (configured sernet repo to install latest packages) I'm using OpenLDAP v2.4.23 # cat /etc/redhat-release CentOS release 5.5 (Final) The Win7 client is a VM in VirtualBox. It does, in fact, have a device with no driver (sound card). --- After adding the client to the domain and entering UN/PW, these are logged entries: Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14 16:37:26.344804, 2] param/loadparm.c:7859(do_section) Nov 14 16:37:26 hostname smbd[18542]: Processing section [admingear] Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14 16:37:26.345033, 2] param/loadparm.c:7859(do_section) Nov 14 16:37:26 hostname smbd[18542]: Processing section [apps] Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14 16:37:26.345199, 2] param/loadparm.c:7859(do_section) Nov 14 16:37:26 hostname smbd[18542]: Processing section [docs] Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14 16:37:26.345352, 2] param/loadparm.c:7859(do_section) Nov 14 16:37:26 hostname smbd[18542]: Processing section [homes] Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14 16:37:26.345543, 2] param/loadparm.c:7859(do_section) Nov 14 16:37:26 hostname smbd[18542]: Processing section [netlogon] Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14 16:37:26.345689, 2] param/loadparm.c:7859(do_section) Nov 14 16:37:26 hostname smbd[18542]: Processing section [printers] Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14 16:37:26.346143, 2] param/loadparm.c:7859(do_section) Nov 14 16:37:26 hostname smbd[18542]: Processing section [print$] Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14 16:37:26.431008, 1] param/loadparm.c:7605(lp_do_parameter) Nov 14 16:37:26 hostname smbd[18542]: WARNING: The printer admin option is deprecated Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14 16:37:26.498046, 2] param/loadparm.c:7859(do_section) Nov 14 16:37:26 hostname smbd[18542]: Processing section [public] Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14 16:37:26.573629, 2] printing/print_cups.c:550(cups_async_callback) Nov 14 16:37:26 hostname smbd[18542]: cups_async_callback: failed to read a new printer list Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14 16:37:26.649941, 2] printing/print_cups.c:550(cups_async_callback) Nov 14 16:37:26 hostname smbd[18542]: cups_async_callback: failed to read a new printer list Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14 16:37:26.701745, 2] lib/interface.c:340(add_interface) Nov 14 16:37:26 hostname smbd[18542]: added interface lo ip=127.0.0.1 bcast=127.255.255.255 netmask=255.0.0.0 Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14 16:37:26.768676, 2] lib/interface.c:340(add_interface) Nov 14 16:37:26 hostname smbd[18542]: added interface eth0 ip=10.0.0.4 bcast=10.0.0.255 netmask=255.255.255.0 Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14 16:37:26.838027, 2] lib/access.c:406(check_access) Nov 14 16:37:26 hostname smbd[18542]: Allowed connection from 10.0.0.203 (10.0.0.203) Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14 16:37:26.912057, 2] smbd/reply.c:554(reply_special) Nov 14 16:37:26 hostname smbd[18542]: netbios connect: name1=ZERVER 0x20 name2=7TEST1 0x0 Nov 14 16:37:26 hostname smbd[18542]: [2010/11/14
[Samba] ldap backend and usrmgr.exe
Hello all, i have made a howto on how to install samba as a PDC with an LDAP backend. The howto is here http://www.xs4all.nl/~doub/samba-ldap/index.html http://www.xs4all.nl/%7Edoub/samba-ldap/index.html It all works well, domain logons work, and adding users to the system works also from the command line. But when i want to use usrmgr , i get the famous error A device attached to the system is not functioning. I have search the whole day for a solution, but could not find a way to solve this. I am sorry if i over looked the answer. Could someone please tell me what i am missing. Thanks for your time Regards, Johan Hendriks -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Need help changing user password
Hi! I am currently using Samba4 Alpha13 but I have not been able to change a users password. I curently can add a user using ldbadd and a ldif file but I would like to know the recommended way of changing a users password. It would be nice if it could be done from the adminstrator account so that you do not need to know the original password. Thanks for the help! MS -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] ldap backend and usrmgr.exe
This is a case in your smbldap-tools: add user script= /usr/local/sbin/smbldap-useradd -m %u Put in the right arguments that fit your system. I think also your passwd change wont work this way: passwd program = /usr/bin/passwd %u passwd chat = *New*UNIX*password* %nn *ReType*new*UNIX*password* %nn * passwd This has to be: ldap passwd sync = Yes passwd program = /usr/local/sbin/smbldap-passwd -u %u --- EDV Daniel Müller Leitung EDV Tropenklinik Paul-Lechler-Krankenhaus Paul-Lechler-Str. 24 72076 Tübingen Tel.: 07071/206-463, Fax: 07071/206-499 eMail: muel...@tropenklinik.de Internet: www.tropenklinik.de --- -Ursprüngliche Nachricht- Von: samba-boun...@lists.samba.org [mailto:samba-boun...@lists.samba.org] Im Auftrag von Johan Hendriks Gesendet: Mittwoch, 17. November 2010 19:43 An: samba@lists.samba.org Betreff: [Samba] ldap backend and usrmgr.exe Hello all, i have made a howto on how to install samba as a PDC with an LDAP backend. The howto is here http://www.xs4all.nl/~doub/samba-ldap/index.html http://www.xs4all.nl/%7Edoub/samba-ldap/index.html It all works well, domain logons work, and adding users to the system works also from the command line. But when i want to use usrmgr , i get the famous error A device attached to the system is not functioning. I have search the whole day for a solution, but could not find a way to solve this. I am sorry if i over looked the answer. Could someone please tell me what i am missing. Thanks for your time Regards, Johan Hendriks -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Need help changing user password
Hi! Realy simple: LOgin as administrator to your windows client. Use the tool Active Directory Users and Groups within windows. If you do not have it. Install it from the Microsoft page. Be aware: Of Password Policy Settings!! Along with Samba4 the Password Policy you can only set from console, with 'net pwsettings ' command. net pwsettings help: usage: (show | set options) options: -h, --helpshow this help message and exit -H H LDB URL for database or target server --quiet Be quiet --complexity=COMPLEXITY The password complexity (on | off | default). Default is 'on' --history-length=HISTORY_LENGTH The password history length (integer | default). Default is 24. --min-pwd-length=MIN_PWD_LENGTH The minimum password length (integer | default). Default is 7. --min-pwd-age=MIN_PWD_AGE The minimum password age (integer in days | default). Default is 1. --max-pwd-age=MAX_PWD_AGE The maximum password age (integer in days | default). Default is 43. Samba Common Options: -s FILE, --configfile=FILE Configuration file -d DEBUGLEVEL, --debuglevel=DEBUGLEVEL debug level --option=OPTION set smb.conf option from command line --realm=REALM set the realm name Credentials Options: --simple-bind-dn=DN DN to use for a simple bind --password=PASSWORD Password -U USERNAME, --username=USERNAME Username -W WORKGROUP, --workgroup=WORKGROUP Workgroup -N, --no-pass Don't ask for a password -k KERBEROS, --kerberos=KERBEROS Use Kerberos Version Options: --version Display version number So I set my Password Policy: net pwsettings set --complexity=off net pwsettings set ---max-pwd-age=60 #---60 Days net pwsettings set min-pwd-length=5 net pwsettings show: [r...@node1 ~]# net pwsettings show Password informations for domain 'DC=tuebingen,DC=tst,DC=loc' Password complexity: off Password history length: 24 Minimum password length: 5 Minimum password age (days): 1 --- EDV Daniel Müller Leitung EDV Tropenklinik Paul-Lechler-Krankenhaus Paul-Lechler-Str. 24 72076 Tübingen Tel.: 07071/206-463, Fax: 07071/206-499 eMail: muel...@tropenklinik.de Internet: www.tropenklinik.de --- -Ursprüngliche Nachricht- Von: samba-boun...@lists.samba.org [mailto:samba-boun...@lists.samba.org] Im Auftrag von Mark Sheppard Gesendet: Mittwoch, 17. November 2010 19:24 An: samba@lists.samba.org Betreff: [Samba] Need help changing user password Hi! I am currently using Samba4 Alpha13 but I have not been able to change a users password. I curently can add a user using ldbadd and a ldif file but I would like to know the recommended way of changing a users password. It would be nice if it could be done from the adminstrator account so that you do not need to know the original password. Thanks for the help! MS -- 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] wheel problem
I have a local user acct (no LDAP or AD). I have assigned this user to the wheel group. It use to be able to access all shares on a mount. Recently I get Access Denied (Windows XP ProSP3) smb log says: smbd/vfs.c:932(check_reduced_name) smbd[16758]: check_reduced_name: couldn't get realpath for /mnt/users/backup/* The user is a local administrator on WinXP and is sending those auth credentials. The user has no trouble accessing their own share of course. Have any others run into this? Should I try something like this (this is the only thing that I can come up with in the many weeks of research) net groupmap add ntgroup=Builtin Admins unixgroup=domadm rid=544 type=d thank you in advance! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Need help changing user password
On 17 November 2010 20:23, Mark Sheppard m...@ams.org wrote: Hi! I am currently using Samba4 Alpha13 but I have not been able to change a users password. I curently can add a user using ldbadd and a ldif file but I would like to know the recommended way of changing a users password. It would be nice if it could be done from the adminstrator account so that you do not need to know the original password. Thanks for the help! Try: net setpassword --help (or samba-tool for later versions of Samba4). -- 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
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 3e055cc ldb:ldb_dn.c - ldb_dn_explode - free also the extended components on error cases from 3f43b7e tevent: Fix docstring, tevent_req_is_in_progress does not destroy private data http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3e055cc830eedaddf73456a31c5eeed2b3e9a00f Author: Matthias Dieter Wallnöfer m...@samba.org Date: Wed Nov 17 08:58:21 2010 +0100 ldb:ldb_dn.c - ldb_dn_explode - free also the extended components on error cases Autobuild-User: Matthias Dieter Wallnöfer m...@samba.org Autobuild-Date: Wed Nov 17 08:45:53 UTC 2010 on sn-devel-104 --- Summary of changes: source4/lib/ldb/common/ldb_dn.c |5 - 1 files changed, 4 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/lib/ldb/common/ldb_dn.c b/source4/lib/ldb/common/ldb_dn.c index 69018b7..a17d516 100644 --- a/source4/lib/ldb/common/ldb_dn.c +++ b/source4/lib/ldb/common/ldb_dn.c @@ -729,8 +729,11 @@ static bool ldb_dn_explode(struct ldb_dn *dn) return true; failed: + LDB_FREE(dn-components); dn-comp_num = 0; - talloc_free(dn-components); + LDB_FREE(dn-ext_components); + dn-ext_comp_num = 0; + return false; } -- Samba Shared Repository
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 49380c5 Add tests for regressed_since. from 2f13a56 Merge tests. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 49380c57cc9f0bb42aed43d8ef2be1464259ba26 Author: Jelmer Vernooij jel...@samba.org Date: Wed Nov 17 09:56:58 2010 +0100 Add tests for regressed_since. --- Summary of changes: buildfarm/data.py| 16 buildfarm/tests/test_data.py | 36 2 files changed, 48 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/data.py b/buildfarm/data.py index 5c7fe7f..ffdb9e5 100644 --- a/buildfarm/data.py +++ b/buildfarm/data.py @@ -87,17 +87,25 @@ class BuildStatus(object): def _status_tuple(self): return [sr.result for sr in self.stages] -def regressed_since(self, other): +def regressed_since(self, older): Check if this build has regressed since another build. if disk full in self.other_failures: return False -if timeout in self.other_failures and timeout in other.other_failures: +if timeout in self.other_failures and timeout in older.other_failures: # When the timeout happens exactly can differ slightly, so it's okay # if the numbers are a bit different.. return False -if panic in self.other_failures and not panic in other.other_failures: +if panic in self.other_failures and not panic in older.other_failures: return True -return cmp(self._status_tuple(), other._status_tuple()) +if len(self.stages) len(older.stages): +# Less stages completed +return True +for ((old_name, old_result), (new_name, new_result)) in zip( +older.stages, self.stages): +assert old_name == new_name +if new_result old_result: +return True +return False def __cmp__(self, other): other_extra = other.other_failures - self.other_failures diff --git a/buildfarm/tests/test_data.py b/buildfarm/tests/test_data.py index c8d50f4..4e17611 100755 --- a/buildfarm/tests/test_data.py +++ b/buildfarm/tests/test_data.py @@ -307,6 +307,42 @@ class BuildStatusTest(testtools.TestCase): self.assertEquals(cmp(d, e), -1) +class BuildStatusRegressedSinceTests(testtools.TestCase): + +def assertRegressedSince(self, expected, old_status, new_status): +(stages1, other_failures1) = old_status +(stages2, other_failures2) = new_status +a = data.BuildStatus( +[data.BuildStageResult(n, r) for (n, r) in stages1], set(other_failures1)) +b = data.BuildStatus( +[data.BuildStageResult(n, r) for (n, r) in stages2], set(other_failures2)) +self.assertEquals(expected, b.regressed_since(a)) + +def test_same(self): +self.assertRegressedSince( +False, +([(CONFIGURE, 2)], []), +([(CONFIGURE, 2)], [])) + +def test_same_panic(self): +self.assertRegressedSince( +False, +([(CONFIGURE, 2)], [panic]), +([(CONFIGURE, 2)], [panic])) + +def test_other_failures_gone(self): +self.assertRegressedSince( +True, +([(CONFIGURE, 0)], [panic]), +([(CONFIGURE, 2)], [panic])) + +def test_more_stages_completed(self): +self.assertRegressedSince( +False, +([(CONFIGURE, 0)], []), +([(CONFIGURE, 0), (BUILD, 0)], [])) + + class UploadBuildResultStoreTestBase(object): def test_build_fname(self): -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 2d03606 Simplify build status code a bit. from 49380c5 Add tests for regressed_since. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 2d03606141dcfc69cb0e406ba9117acf2cbef762 Author: Jelmer Vernooij jel...@samba.org Date: Wed Nov 17 10:05:33 2010 +0100 Simplify build status code a bit. --- Summary of changes: buildfarm/data.py| 11 +-- buildfarm/tests/test_data.py | 14 ++ 2 files changed, 15 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/data.py b/buildfarm/data.py index ffdb9e5..2ef40b0 100644 --- a/buildfarm/data.py +++ b/buildfarm/data.py @@ -53,7 +53,7 @@ class BuildStatus(object): def __init__(self, stages=None, other_failures=None): if stages is not None: -self.stages = stages +self.stages = [BuildStageResult(n, r) for (n, r) in stages] else: self.stages = [] if other_failures is not None: @@ -65,7 +65,7 @@ class BuildStatus(object): def failed(self): if self.other_failures: return True -return not all([x == 0 for x in self._status_tuple()]) +return not all([x.result == 0 for x in self.stages]) def __serialize__(self): return repr(self) @@ -77,16 +77,13 @@ class BuildStatus(object): def __str__(self): if self.other_failures: return ,.join(self.other_failures) -return /.join(map(str, self._status_tuple())) +return /.join([str(x.result) for x in self.stages]) def broken_host(self): if disk full in self.other_failures: return True return False -def _status_tuple(self): -return [sr.result for sr in self.stages] - def regressed_since(self, older): Check if this build has regressed since another build. if disk full in self.other_failures: @@ -136,6 +133,8 @@ def check_dir_exists(kind, path): def build_status_from_logs(log, err): get status of build +# FIXME: Perhaps also extract revision here? + test_failures = 0 test_successes = 0 test_seen = 0 diff --git a/buildfarm/tests/test_data.py b/buildfarm/tests/test_data.py index 4e17611..c96b266 100755 --- a/buildfarm/tests/test_data.py +++ b/buildfarm/tests/test_data.py @@ -306,16 +306,22 @@ class BuildStatusTest(testtools.TestCase): e = data.BuildStatus([(CONFIGURE, 2), (TEST, 3), (CC_CHECKER, 1)], set([super error])) self.assertEquals(cmp(d, e), -1) +def test_str(self): +a = data.BuildStatus([(CONFIGURE, 3), (BUILD, 2)]) +self.assertEquals(3/2, str(a)) + +def test_str_other_failures(self): +a = data.BuildStatus([(CONFIGURE, 3), (BUILD, 2)], set([panic])) +self.assertEquals(panic, str(a)) + class BuildStatusRegressedSinceTests(testtools.TestCase): def assertRegressedSince(self, expected, old_status, new_status): (stages1, other_failures1) = old_status (stages2, other_failures2) = new_status -a = data.BuildStatus( -[data.BuildStageResult(n, r) for (n, r) in stages1], set(other_failures1)) -b = data.BuildStatus( -[data.BuildStageResult(n, r) for (n, r) in stages2], set(other_failures2)) +a = data.BuildStatus(stages1, set(other_failures1)) +b = data.BuildStatus(stages2, set(other_failures2)) self.assertEquals(expected, b.regressed_since(a)) def test_same(self): -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via d8b9cdd Implement sql-specific get_last_builds. via ccf5ceb Add convenience function for finding all recent builds. from 2d03606 Simplify build status code a bit. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit d8b9cddfc9b7ae49554398af747927eba1cabf94 Author: Jelmer Vernooij jel...@samba.org Date: Wed Nov 17 10:18:41 2010 +0100 Implement sql-specific get_last_builds. commit ccf5ceb19c105f6c79cda2de561fd40c40eb0c49 Author: Jelmer Vernooij jel...@samba.org Date: Wed Nov 17 10:16:03 2010 +0100 Add convenience function for finding all recent builds. --- Summary of changes: buildfarm/__init__.py |5 +++ buildfarm/sqldb.py|4 ++ buildfarm/web/__init__.py | 75 - 3 files changed, 42 insertions(+), 42 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py index 41df8d1..d185ed4 100644 --- a/buildfarm/__init__.py +++ b/buildfarm/__init__.py @@ -141,6 +141,11 @@ class BuildFarm(object): if build.tree in self.trees and build.compiler in self.compilers and build.host in hostnames: yield build +def get_last_builds(self, tree=None): +for build in self.get_new_builds(): +if tree is not None and build.tree == tree: +yield build + def get_host_builds(self, host): from buildfarm import data for compiler in self.compilers: diff --git a/buildfarm/sqldb.py b/buildfarm/sqldb.py index fdee2dd..eebc7d8 100644 --- a/buildfarm/sqldb.py +++ b/buildfarm/sqldb.py @@ -246,6 +246,10 @@ class StormCachingBuildFarm(BuildFarm): return self._get_store().find(StormBuild, StormBuild.host == host).group_by(StormBuild.compiler, StormBuild.tree) +def get_last_builds(self, tree): +extra_expr = [StormBuild.tree == tree] +return self._get_store().find(StormBuild, *extra_expr) + def commit(self): self.store.commit() diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index 2db0d05..5c771c3 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -612,36 +612,31 @@ class ViewRecentBuildsPage(BuildFarmPage): assert tree in self.buildfarm.trees, not a build tree assert sort_by in cmp_funcs, not a valid sort -t = self.buildfarm.trees[tree] - -for host in self.buildfarm.hostdb.hosts(): -for compiler in self.buildfarm.compilers: -try: -build = self.buildfarm.get_build(tree, host.name.encode(utf-8), compiler) -status = build_status_html(myself, build) -except data.NoSuchBuildError: -pass -else: -age_mtime = build.age_mtime() -age_ctime = build.age_ctime() -try: -(revision, revision_time) = build.revision_details() -except data.MissingRevisionInfo: -pass -else: -all_builds.append([ -age_ctime, -host.platform.encode(utf-8), -a href='%s?function=View+Host;host=%s;tree=%s;compiler=%s#%s'%s/a -% (myself, host.name.encode(utf-8), - tree, compiler, host.name.encode(utf-8), - host.name.encode(utf-8)), -compiler, tree, status, build.status(), -revision_link(myself, revision, tree), -revision_time]) +for build in self.buildfarm.get_last_builds(tree=tree): +host = self.buildfarm.hostdb.host(build.host) +status = build_status_html(myself, build) +age_mtime = build.age_mtime() +age_ctime = build.age_ctime() +try: +(revision, revision_time) = build.revision_details() +except data.MissingRevisionInfo: +pass +else: +all_builds.append([ +age_ctime, +host.platform.encode(utf-8), +a href='%s?function=View+Host;host=%s;tree=%s;compiler=%s#%s'%s/a +% (myself, host.name.encode(utf-8), + tree, build.compiler, host.name.encode(utf-8), + host.name.encode(utf-8)), +build.compiler, tree, status, build.status(), +revision_link(myself, revision, tree), +revision_time]) all_builds.sort(cmp_funcs[sort_by]) +
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 7d445b7 Fix tree argument to storm get_last_builds. from d8b9cdd Implement sql-specific get_last_builds. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 7d445b77eb6779b807e0845b20625c5c5a32dfd2 Author: Jelmer Vernooij jel...@samba.org Date: Wed Nov 17 10:20:01 2010 +0100 Fix tree argument to storm get_last_builds. --- Summary of changes: buildfarm/sqldb.py |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/sqldb.py b/buildfarm/sqldb.py index eebc7d8..00b150f 100644 --- a/buildfarm/sqldb.py +++ b/buildfarm/sqldb.py @@ -246,8 +246,10 @@ class StormCachingBuildFarm(BuildFarm): return self._get_store().find(StormBuild, StormBuild.host == host).group_by(StormBuild.compiler, StormBuild.tree) -def get_last_builds(self, tree): -extra_expr = [StormBuild.tree == tree] +def get_last_builds(self, tree=None): +extra_expr = [] +if tree is not None: +extra_expr.append(StormBuild.tree == tree) return self._get_store().find(StormBuild, *extra_expr) def commit(self): -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 20c6f90 Fix age handling. from 7d445b7 Fix tree argument to storm get_last_builds. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 20c6f90f3c3df367d0da520e2aa54f293ee705b8 Author: Jelmer Vernooij jel...@samba.org Date: Wed Nov 17 10:26:07 2010 +0100 Fix age handling. --- Summary of changes: buildfarm/data.py| 17 - buildfarm/filecache.py |1 - buildfarm/sqldb.py |2 +- buildfarm/tests/test_data.py | 10 +- buildfarm/web/__init__.py| 14 -- 5 files changed, 10 insertions(+), 34 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/data.py b/buildfarm/data.py index 2ef40b0..3846e8b 100644 --- a/buildfarm/data.py +++ b/buildfarm/data.py @@ -233,18 +233,9 @@ class Build(object): def remove(self): self.remove_logs() -### -# the mtime age is used to determine if builds are still happening -# on a host. -# the ctime age is used to determine when the last real build happened - -def age_mtime(self): -get the age of build from mtime -st = os.stat(%s.log % self.basename) -return time.time() - st.st_mtime - -def age_ctime(self): -get the age of build from ctime +@property +def age(self): +get the age of build st = os.stat(%s.log % self.basename) return time.time() - st.st_ctime @@ -401,7 +392,7 @@ class BuildResultStore(object): continue ret.append(self.get_build(tree, host, compiler, rev)) -ret.sort(lambda a, b: cmp(a.age_mtime(), b.age_mtime())) +ret.sort(lambda a, b: cmp(a.age, b.age)) return ret diff --git a/buildfarm/filecache.py b/buildfarm/filecache.py index bd15d5f..0e0823d 100644 --- a/buildfarm/filecache.py +++ b/buildfarm/filecache.py @@ -24,7 +24,6 @@ from buildfarm import ( from buildfarm.data import ( Build, BuildResultStore, -BuildStageResult, BuildStatus, NoSuchBuildError, UploadBuildResultStore, diff --git a/buildfarm/sqldb.py b/buildfarm/sqldb.py index 00b150f..304faa1 100644 --- a/buildfarm/sqldb.py +++ b/buildfarm/sqldb.py @@ -203,7 +203,7 @@ class StormCachingBuildResultStore(BuildResultStore): new_build = StormBuild(new_basename, unicode(build.tree), unicode(build.host), unicode(build.compiler), rev) new_build.checksum = build.log_checksum() -new_build.age = build.age_mtime() +new_build.age = build.age new_build.status_str = unicode(build.status().__serialize__()) self.store.add(new_build) return new_build diff --git a/buildfarm/tests/test_data.py b/buildfarm/tests/test_data.py index c96b266..87e8dc9 100755 --- a/buildfarm/tests/test_data.py +++ b/buildfarm/tests/test_data.py @@ -52,14 +52,6 @@ class BuildResultStoreTestBase(object): build = self.x.get_build(tdb, charis, cc, 12) self.assertEquals(%s: revision 12 of tdb on charis using cc % build.__class__.__name__, repr(build)) -def test_build_age_mtime(self): -path = self.create_mock_logfile(tdb, charis, cc, 12) -# Set mtime to something in the past -os.utime(path, (time.time(), time.time() - 990)) -build = self.x.get_build(tdb, charis, cc, 12) -age = build.age_mtime() -self.assertTrue(age = 990 and age = 1000, age was %d % age) - def test_get_build_nonexistant(self): self.assertRaises(data.NoSuchBuildError, self.x.get_build, tdb, charis, cc, 12) @@ -68,7 +60,7 @@ class BuildResultStoreTestBase(object): path = self.create_mock_logfile(tdb, charis, cc, 12) # Set mtime to something in the past build = self.x.get_build(tdb, charis, cc, 12) -age = build.age_ctime() +age = build.age self.assertTrue(age = 0 and age = 10, age was %d % age) def test_read_log(self): diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index 5c771c3..7a2bf2a 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -487,7 +487,6 @@ class ViewBuildPage(BuildFarmPage): cflags = config = build = self.buildfarm.get_build(tree, host, compiler, rev) -age_mtime = build.age_mtime() try: (revision, revision_time) = build.revision_details() except data.MissingRevisionInfo: @@ -537,7 +536,7 @@ class ViewBuildPage(BuildFarmPage): yield trtdUname:/tdtd%s/td/tr\n % uname yield trtdTree:/tdtd%s/td/tr\n % self.tree_link(myself, tree) yield trtdBuild Revision:/tdtd%s/td/tr\n % revision_link(myself, revision, tree) -yield trtdBuild age:/tdtddiv class='age'%s/div/td/tr\n %
[SCM] build.samba.org - branch master updated
The branch, master has been updated
via d7832c5 Cope with unknown trees.
from 20c6f90 Fix age handling.
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -
commit d7832c54a632c0a942719f94f6cc3229a01d4dcc
Author: Jelmer Vernooij jel...@samba.org
Date: Wed Nov 17 10:30:00 2010 +0100
Cope with unknown trees.
---
Summary of changes:
buildfarm/web/__init__.py | 13 -
1 files changed, 4 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 7a2bf2a..6daec21 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -29,6 +29,7 @@
# TODO: Allow filtering of the Recent builds list to show
# e.g. only broken builds or only builds that you care about.
+from collections import defaultdict
import os
from buildfarm import (
@@ -760,15 +761,9 @@ class ViewHostPage(BuildFarmPage):
class ViewSummaryPage(BuildFarmPage):
def _get_counts(self):
-broken_count = {}
-panic_count = {}
-host_count = {}
-
-# zero broken and panic counters
-for tree in self.buildfarm.trees:
-broken_count[tree] = 0
-panic_count[tree] = 0
-host_count[tree] = 0
+broken_count = defaultdict(lambda: 0)
+panic_count = defaultdict(lambda: 0)
+host_count = defaultdict(lambda: 0)
# set up a variable to store the broken builds table's code, so we can
# output when we want
--
build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via c8204d2 Skip unknown hosts. from d7832c5 Cope with unknown trees. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit c8204d21027d97ee249acb5382ea2441769abf43 Author: Jelmer Vernooij jel...@samba.org Date: Wed Nov 17 10:37:40 2010 +0100 Skip unknown hosts. --- Summary of changes: buildfarm/sqldb.py|2 +- buildfarm/web/__init__.py |6 +- 2 files changed, 6 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/sqldb.py b/buildfarm/sqldb.py index 304faa1..b69da4d 100644 --- a/buildfarm/sqldb.py +++ b/buildfarm/sqldb.py @@ -249,7 +249,7 @@ class StormCachingBuildFarm(BuildFarm): def get_last_builds(self, tree=None): extra_expr = [] if tree is not None: -extra_expr.append(StormBuild.tree == tree) +extra_expr.append(StormBuild.tree == unicode(tree)) return self._get_store().find(StormBuild, *extra_expr) def commit(self): diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index 6daec21..58a5653 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -613,7 +613,11 @@ class ViewRecentBuildsPage(BuildFarmPage): assert sort_by in cmp_funcs, not a valid sort for build in self.buildfarm.get_last_builds(tree=tree): -host = self.buildfarm.hostdb.host(build.host) +try: +host = self.buildfarm.hostdb.host(build.host) +except hostdb.NoSuchHost: +# Skip, at least for now. +continue status = build_status_html(myself, build) try: (revision, revision_time) = build.revision_details() -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via f6fa31a Properly encode compiler name. via 5fadab2 Remove no longer used file cache. from c8204d2 Skip unknown hosts. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit f6fa31aea71a2b01e1b6fbed41c6b61b92ced648 Author: Jelmer Vernooij jel...@samba.org Date: Wed Nov 17 10:41:25 2010 +0100 Properly encode compiler name. commit 5fadab21a4d957f02d6886714d911c5c56a315f0 Author: Jelmer Vernooij jel...@samba.org Date: Wed Nov 17 10:39:30 2010 +0100 Remove no longer used file cache. --- Summary of changes: buildfarm/filecache.py| 201 - buildfarm/tests/test_filecache.py | 70 - buildfarm/web/__init__.py |2 +- 3 files changed, 1 insertions(+), 272 deletions(-) delete mode 100644 buildfarm/filecache.py delete mode 100644 buildfarm/tests/test_filecache.py Changeset truncated at 500 lines: diff --git a/buildfarm/filecache.py b/buildfarm/filecache.py deleted file mode 100644 index 0e0823d..000 --- a/buildfarm/filecache.py +++ /dev/null @@ -1,201 +0,0 @@ -#!/usr/bin/python -# Simple database query script for the buildfarm -# -# Copyright (C) Jelmer Vernooij jel...@samba.org2010 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -from buildfarm import ( -BuildFarm, -util, -) -from buildfarm.data import ( -Build, -BuildResultStore, -BuildStatus, -NoSuchBuildError, -UploadBuildResultStore, -check_dir_exists, -) - -import os - - -class CachingBuild(Build): -Build subclass that caches some of the results that are expensive -to calculate. - -def __init__(self, store, *args, **kwargs): -self._store = store -super(CachingBuild, self).__init__(*args, **kwargs) -if self.revision: -self.cache_basename = self._store.cache_fname(self.tree, self.host, self.compiler, self.revision) -else: -self.cache_basename = self._store.cache_fname(self.tree, self.host, self.compiler) - -def revision_details(self): -st1 = os.stat(%s.log % self.basename) - -try: -st2 = os.stat(%s.revision % self.cache_basename) -except OSError: -# File does not exist -st2 = None - -# the ctime/mtime asymmetry is needed so we don't get fooled by -# the mtime update from rsync -if st2 and st1.st_ctime = st2.st_mtime: -(revid, timestamp) = util.FileLoad(%s.revision % self.cache_basename).split(:, 2) -if timestamp == : -timestamp = None -if revid == : -revid = None -return (revid, timestamp) -(revid, timestamp) = super(CachingBuild, self).revision_details() -if not self._store.readonly: -util.FileSave(%s.revision % self.cache_basename, %s:%s % (revid, timestamp or )) -return (revid, timestamp) - -def err_count(self): -st1 = os.stat(%s.err % self.basename) - -try: -st2 = os.stat(%s.errcount % self.cache_basename) -except OSError: -# File does not exist -st2 = None - -if st2 and st1.st_ctime = st2.st_mtime: -return util.FileLoad(%s.errcount % self.cache_basename) - -ret = super(CachingBuild, self).err_count() - -if not self._store.readonly: -util.FileSave(%s.errcount % self.cache_basename, str(ret)) - -return ret - -def status(self): -cachefile = self.cache_basename + .status - -st1 = os.stat(%s.log % self.basename) - -try: -st2 = os.stat(cachefile) -except OSError: -# No such file -st2 = None - -if st2 and st1.st_ctime = st2.st_mtime: -return BuildStatus.__deserialize__(util.FileLoad(cachefile)) - -ret = super(CachingBuild, self).status() - -if not self._store.readonly: -util.FileSave(cachefile, ret.__serialize__()) - -return ret - - -class CachingUploadBuildResultStore(UploadBuildResultStore): - -def __init__(self, basedir,
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 6bfd1e4 Get rid of some unicode. via e4f9636 Change some fields to blobs. from f6fa31a Properly encode compiler name. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 6bfd1e462e6055a78f33c9a885cce52c9a1020ea Author: Jelmer Vernooij jel...@samba.org Date: Wed Nov 17 11:17:41 2010 +0100 Get rid of some unicode. commit e4f96367b2b828953b357827fe28fedc645f911b Author: Jelmer Vernooij jel...@samba.org Date: Wed Nov 17 10:57:57 2010 +0100 Change some fields to blobs. --- Summary of changes: admin.py | 14 +- buildfarm/__init__.py |2 - buildfarm/sqldb.py | 51 --- buildfarm/tests/test_data.py |4 +- buildfarm/tests/test_hostdb.py | 30 +++--- 5 files changed, 50 insertions(+), 51 deletions(-) Changeset truncated at 500 lines: diff --git a/admin.py b/admin.py index 79c6ce7..0fb8231 100755 --- a/admin.py +++ b/admin.py @@ -70,7 +70,7 @@ else: if op == remove: hostname = raw_input(Please enter hostname to delete: ) try: -db.deletehost(hostname.decode(utf-8)) +db.deletehost(hostname) except hostdb.NoSuchHost, e: print No such host '%s' % e.name sys.exit(1) @@ -81,7 +81,7 @@ if op == remove: elif op == modify: hostname = raw_input(Please enter hostname to modify: ) try: -host = db.host(hostname.decode(utf-8)) +host = db.host(hostname) except hostdb.NoSuchHost, e: print No such host '%s' % e.name sys.exit(1) @@ -93,12 +93,12 @@ elif op == modify: mod_op = platform if mod_op == platform: platform = raw_input(Enter new platform: ) -host.update_platform(platform.decode(utf-8)) +host.update_platform(platform) db.commit() elif mod_op == owner: owner = raw_input(Enter new owner's name: ) owner_email = raw_input(Enter new owner's e-mail address: ) -host.update_owner(owner.decode(utf-8), owner_email.decode(utf-8)) +host.update_owner(owner, owner_email.decode(utf-8)) db.commit() else: print Unknown subcommand %s % mod_op @@ -108,7 +108,7 @@ elif op == modify: elif op == add: hostname = raw_input(Machine hostname: ) try: -db.host(hostname.decode(utf-8)) +db.host(hostname) except hostdb.NoSuchHost, e: pass else: @@ -129,7 +129,7 @@ elif op == add: line = raw_input() try: -db.createhost(hostname.decode(utf-8), platform.decode(utf-8), +db.createhost(hostname, platform.decode(utf-8), owner.decode(utf-8), owner_email.decode(utf-8), password.decode(utf-8), .join(permission).decode(utf-8, replace)) @@ -192,7 +192,7 @@ Thanks, your friendly Samba build farm administrator bu...@samba.org % owne elif op == info: hostname = raw_input(Hostname: ) try: -host = db.host(hostname.decode(utf-8)) +host = db.host(hostname) except hostdb.NoSuchHost, e: print No such host '%s' % e.name sys.exit(1) diff --git a/buildfarm/__init__.py b/buildfarm/__init__.py index d185ed4..5d35f42 100644 --- a/buildfarm/__init__.py +++ b/buildfarm/__init__.py @@ -154,5 +154,3 @@ class BuildFarm(object): yield self.get_build(tree, host, compiler) except data.NoSuchBuildError: pass - - diff --git a/buildfarm/sqldb.py b/buildfarm/sqldb.py index b69da4d..11994c0 100644 --- a/buildfarm/sqldb.py +++ b/buildfarm/sqldb.py @@ -47,13 +47,13 @@ class StormBuild(Build): __storm_table__ = build id = Int(primary=True) -tree = Unicode() +tree = RawStr() revision = RawStr() -host = Unicode() -compiler = Unicode() +host = RawStr() +compiler = RawStr() checksum = RawStr() age = Int() -status_str = Unicode(name=status) +status_str = RawStr(name=status) commit_revision = RawStr() def status(self): @@ -73,7 +73,7 @@ class StormBuild(Build): class StormHost(Host): __storm_table__ = host -name = Unicode(primary=True) +name = RawStr(primary=True) owner_name = Unicode(name=owner) owner_email = Unicode() password = Unicode() @@ -111,7 +111,8 @@ class StormHostDatabase(HostDatabase): def createhost(self, name, platform=None, owner=None, owner_email=None, password=None, permission=None): See `HostDatabase.createhost`. -newhost = StormHost(unicode(name), owner=owner, owner_email=owner_email, password=password, permission=permission, platform=platform) +newhost = StormHost(name, owner=owner, owner_email=owner_email, +password=password,
[SCM] build.samba.org - branch master updated
The branch, master has been updated via d81c9cd Remove more pointless encoding. from 6bfd1e4 Get rid of some unicode. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit d81c9cd5e8fc9ebfb7c42508c8f46fd8b6910132 Author: Jelmer Vernooij jel...@samba.org Date: Wed Nov 17 11:19:32 2010 +0100 Remove more pointless encoding. --- Summary of changes: buildfarm/hostdb.py |4 ++-- buildfarm/web/__init__.py | 12 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/hostdb.py b/buildfarm/hostdb.py index ed4e753..24186c2 100644 --- a/buildfarm/hostdb.py +++ b/buildfarm/hostdb.py @@ -125,7 +125,7 @@ class HostDatabase(object): Write out the web/ for host in self.hosts(): -yield %s: %s\n % (host.name.encode(utf-8), host.platform.encode(utf-8)) +yield %s: %s\n % (host.name, host.platform.encode(utf-8)) def commit(self): pass @@ -143,7 +143,7 @@ class PlainTextHostDatabase(HostDatabase): try: for l in f: (host, platform) = l.split(:, 1) -ret[host.decode(utf-8)] = platform.strip().decode(utf-8) +ret[host] = platform.strip().decode(utf-8) finally: f.close() return cls(ret) diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index 159085f..7badf2d 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -628,9 +628,9 @@ class ViewRecentBuildsPage(BuildFarmPage): build.age, host.platform.encode(utf-8), a href='%s?function=View+Host;host=%s;tree=%s;compiler=%s#%s'%s/a -% (myself, host.name.encode(utf-8), - tree, build.compiler.encode(utf-8), host.name.encode(utf-8), - host.name.encode(utf-8)), +% (myself, host.name, + tree, build.compiler, host.name, + host.name), build.compiler, tree, status, build.status(), revision_link(myself, revision, tree), revision_time]) @@ -674,7 +674,7 @@ class ViewHostPage(BuildFarmPage): def _render_build_list_header(self, host): yield div class='host summary' yield a id='host' name='host'/ -yield h3%s - %s/h3 % (host.encode(utf-8), self.buildfarm.hostdb.host(host).platform.encode(utf-8)) +yield h3%s - %s/h3 % (host, self.buildfarm.hostdb.host(host).platform.encode(utf-8)) yield table class='real' yield theadtrthTarget/ththBuildbr/Revision/ththBuildbr /Age/ththStatusbr /config/buildbr /install/test/ththWarnings/th/tr/thead yield tbody @@ -734,7 +734,7 @@ class ViewHostPage(BuildFarmPage): Tree, Compiler, Build Age, Status, Warnings) for build in builds: yield %-12s %-10s %-10s %-10s %-10s\n % ( -build.tree.encode(utf-8), build.compiler.encode(utf-8), +build.tree, build.compiler, util.dhm_time(build.age), str(build.status()), build.err_count()) yield \n @@ -895,7 +895,7 @@ class BuildFarmApp(object): self.buildfarm = buildfarm # host.properties are unicode object and the framework expect string object -self.hosts = dict([(host.name.encode(utf-8), host) for host in self.buildfarm.hostdb.hosts()]) +self.hosts = dict([(host.name, host) for host in self.buildfarm.hostdb.hosts()]) def main_menu(self): main page -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 7645665 Add test for Kai's wrong culprit mail. via 4b037f0 Simplify menu. from d81c9cd Remove more pointless encoding. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 76456654a64f6b058a2d14d93c6474a360661f7f Author: Jelmer Vernooij jel...@samba.org Date: Wed Nov 17 11:38:27 2010 +0100 Add test for Kai's wrong culprit mail. commit 4b037f0066cafaca84d7a62ee8438eeb21281f45 Author: Jelmer Vernooij jel...@samba.org Date: Wed Nov 17 11:36:53 2010 +0100 Simplify menu. --- Summary of changes: buildfarm/tests/test_data.py |8 +++- buildfarm/web/__init__.py| 13 ++--- 2 files changed, 9 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/tests/test_data.py b/buildfarm/tests/test_data.py index 4ed8a16..cf4d906 100755 --- a/buildfarm/tests/test_data.py +++ b/buildfarm/tests/test_data.py @@ -18,7 +18,6 @@ from cStringIO import StringIO import os import testtools -import time import unittest from buildfarm import data @@ -340,6 +339,13 @@ class BuildStatusRegressedSinceTests(testtools.TestCase): ([(CONFIGURE, 0)], []), ([(CONFIGURE, 0), (BUILD, 0)], [])) +def test_less_errors(self): +self.assertRegressedSince( +False, +([(CONFIGURE, 0), (BUILD, 0), (TEST, 0), (INSTALL, 1)], []), +([(CONFIGURE, 0), (BUILD, 0), (TEST, 0), (INSTALL, 0)], [])) + + class UploadBuildResultStoreTestBase(object): diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index 7badf2d..3d091a4 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -698,12 +698,6 @@ class ViewHostPage(BuildFarmPage): yield div class='build-section' id='build-summary' yield 'h2Host summary:/h2' for host in requested_hosts: -# make sure we have some data from it -try: -self.buildfarm.hostdb.host(host) -except hostdb.NoSuchHost: -continue - builds = list(self.buildfarm.get_host_builds(host)) if len(builds) 0: yield .join(self._render_build_list_header(host)) @@ -894,18 +888,15 @@ class BuildFarmApp(object): def __init__(self, buildfarm): self.buildfarm = buildfarm -# host.properties are unicode object and the framework expect string object -self.hosts = dict([(host.name, host) for host in self.buildfarm.hostdb.hosts()]) - def main_menu(self): main page yield form method='GET'\n yield div id='build-menu'\n yield select name='host'\n -for name, host in self.hosts.iteritems(): +for host in self.buildfarm.hostdb.hosts(): yield option value='%s'%s -- %s/option\n % ( -name, host.platform.encode(utf-8), name) +host.name, host.platform.encode(utf-8), host.name) yield /select\n yield select name='tree'\n for tree, t in self.buildfarm.trees.iteritems(): -- build.samba.org
[SCM] build.samba.org - branch master updated
The branch, master has been updated via 088d389 Add id column to host. from 7645665 Add test for Kai's wrong culprit mail. http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log - commit 088d3890082900cdbef6c22b62c74ee658793a4e Author: Jelmer Vernooij jel...@samba.org Date: Wed Nov 17 11:49:13 2010 +0100 Add id column to host. --- Summary of changes: .bzrignore |1 + buildfarm/sqldb.py |5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/.bzrignore b/.bzrignore index 222c794..a34bfd1 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,2 +1,3 @@ hostdb.sqlite _trial_temp +db diff --git a/buildfarm/sqldb.py b/buildfarm/sqldb.py index 11994c0..4542c8a 100644 --- a/buildfarm/sqldb.py +++ b/buildfarm/sqldb.py @@ -73,7 +73,8 @@ class StormBuild(Build): class StormHost(Host): __storm_table__ = host -name = RawStr(primary=True) +id = Int(primary=True) +name = RawStr() owner_name = Unicode(name=owner) owner_email = Unicode() password = Unicode() @@ -258,7 +259,7 @@ class StormCachingBuildFarm(BuildFarm): def setup_schema(db): -db.execute(CREATE TABLE IF NOT EXISTS host (name blob, owner text, owner_email text, password text, ssh_access int, fqdn text, platform text, permission text, last_dead_mail int, join_time int);, noresult=True) +db.execute(CREATE TABLE IF NOT EXISTS host (id integer primary key autoincrement, name blob, owner text, owner_email text, password text, ssh_access int, fqdn text, platform text, permission text, last_dead_mail int, join_time int);, noresult=True) db.execute(CREATE UNIQUE INDEX IF NOT EXISTS unique_hostname ON host (name);, noresult=True) db.execute(CREATE TABLE IF NOT EXISTS build (id integer primary key autoincrement, tree blob, revision blob, host blob, compiler blob, checksum blob, age int, status blob, commit_revision blob);, noresult=True) db.execute(CREATE UNIQUE INDEX IF NOT EXISTS unique_checksum ON build (checksum);, noresult=True) -- build.samba.org
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d1c1aae s3: Remove a reference to winbindd_cli_state from
append_auth_data
via bdf830a s3: Remove a reference to winbindd_cli_state from
append_info3_as_txt
via 75f41c3 s3: Remove a reference to winbindd_cli_state from
append_afs_token
via 5b0724d s3: Remove a reference to winbindd_cli_state from
append_info3_as_ndr
via 3bfe676 s3: Remove a reference to winbindd_cli_state from
append_unix_username
via 240edd0 s3: Remove a reference to winbindd_cli_state from
append_auth_data
via fd9ea77 bool ? true : false is a bit pointless
via 0a19617 s3: Move parse_sidlist to the only calling file
via 705d93d s3: Remove some unused code
from 3e055cc ldb:ldb_dn.c - ldb_dn_explode - free also the extended
components on error cases
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d1c1aaeb8b9ca662f57e74546c56c9213c7e3920
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 17:58:10 2010 +0100
s3: Remove a reference to winbindd_cli_state from append_auth_data
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Wed Nov 17 12:02:34 UTC 2010 on sn-devel-104
commit bdf830ac6171020d18c0a07787c305b766e0ec61
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 17:56:21 2010 +0100
s3: Remove a reference to winbindd_cli_state from append_info3_as_txt
commit 75f41c304a8ae65dbb81752d123cf95770a40d1a
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 17:52:31 2010 +0100
s3: Remove a reference to winbindd_cli_state from append_afs_token
commit 5b0724d2289fbf14813636f1d5791ed76d56710e
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 17:50:16 2010 +0100
s3: Remove a reference to winbindd_cli_state from append_info3_as_ndr
commit 3bfe6765b20904a47b81d9fa7df6d6385f144ceb
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 17:44:08 2010 +0100
s3: Remove a reference to winbindd_cli_state from append_unix_username
commit 240edd07b30b20e9914de147d2773a36bc7a3a32
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 17:07:33 2010 +0100
s3: Remove a reference to winbindd_cli_state from append_auth_data
commit fd9ea77a7169070d869713ba0bde226ce653ad20
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 16:22:32 2010 +0100
bool ? true : false is a bit pointless
commit 0a19617c9785425e3328f82d022930d3fa91e7b3
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 16:11:14 2010 +0100
s3: Move parse_sidlist to the only calling file
commit 705d93d2ad3fffbe69fe19d521631bf6e249e4f1
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 16:09:04 2010 +0100
s3: Remove some unused code
---
Summary of changes:
source3/winbindd/winbindd_async.c | 60 --
source3/winbindd/winbindd_dual.c |3 +-
source3/winbindd/winbindd_getsidaliases.c | 42 ++
source3/winbindd/winbindd_pam.c | 125 +++--
source3/winbindd/winbindd_proto.h |7 --
5 files changed, 106 insertions(+), 131 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_async.c
b/source3/winbindd/winbindd_async.c
index 8e53892..75dfa0e 100644
--- a/source3/winbindd/winbindd_async.c
+++ b/source3/winbindd/winbindd_async.c
@@ -27,66 +27,6 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
-bool print_sidlist(TALLOC_CTX *mem_ctx, const struct dom_sid *sids,
- uint32_t num_sids, char **result, ssize_t *len)
-{
- size_t i;
- size_t buflen = 0;
-
- *len = 0;
- *result = NULL;
- for (i=0; inum_sids; i++) {
- fstring tmp;
- sprintf_append(mem_ctx, result, len, buflen,
- %s\n, sid_to_fstring(tmp, sids[i]));
- }
-
- if ((num_sids != 0) (*result == NULL)) {
- return False;
- }
-
- return True;
-}
-
-bool parse_sidlist(TALLOC_CTX *mem_ctx, const char *sidstr,
- struct dom_sid **sids, uint32_t *num_sids)
-{
- const char *p, *q;
-
- p = sidstr;
- if (p == NULL)
- return False;
-
- while (p[0] != '\0') {
- fstring tmp;
- size_t sidlen;
- struct dom_sid sid;
- q = strchr(p, '\n');
- if (q == NULL) {
- DEBUG(0, (Got invalid sidstr: %s\n, p));
- return False;
- }
- sidlen = PTR_DIFF(q, p);
- if (sidlen = sizeof(tmp)-1) {
- return false;
- }
- memcpy(tmp, p, sidlen);
- tmp[sidlen] = '\0';
- q += 1;
- if (!string_to_sid(sid, tmp)) {
-
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 2a2d118 s3: Remove a reference to winbindd_cli_state from
append_auth_data
via 9d02adc s3: Remove a reference to winbindd_cli_state from
append_info3_as_txt
via 940d4ab s3: Remove a reference to winbindd_cli_state from
append_afs_token
via 19bfd98 s3: Remove a reference to winbindd_cli_state from
append_info3_as_ndr
via 8f5591d s3: Remove a reference to winbindd_cli_state from
append_unix_username
via 4f20daf s3: Remove a reference to winbindd_cli_state from
append_auth_data
via 8a5939f bool ? true : false is a bit pointless
via e105708 s3: Move parse_sidlist to the only calling file
via f70d36f s3: Remove some unused code
from 37f8565 s3-spoolss: fix spoolss GetPrinterData behaviour
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 2a2d118f729ac4c8f014d3529afbfb0d4956fadd
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 17:58:10 2010 +0100
s3: Remove a reference to winbindd_cli_state from append_auth_data
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Wed Nov 17 12:02:34 UTC 2010 on sn-devel-104
commit 9d02adc7ae350ca72c2d442a545439247ef0b550
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 17:56:21 2010 +0100
s3: Remove a reference to winbindd_cli_state from append_info3_as_txt
commit 940d4ab44b21c9320269d207c1aae34d5e0fbd08
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 17:52:31 2010 +0100
s3: Remove a reference to winbindd_cli_state from append_afs_token
commit 19bfd988a3b8c61694772ac9f33587fdf70c10f8
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 17:50:16 2010 +0100
s3: Remove a reference to winbindd_cli_state from append_info3_as_ndr
commit 8f5591d046b75fb04290d7e08027b9ad250c56c9
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 17:44:08 2010 +0100
s3: Remove a reference to winbindd_cli_state from append_unix_username
commit 4f20daf7383c33c107fd3beda76e5aae2237d871
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 17:07:33 2010 +0100
s3: Remove a reference to winbindd_cli_state from append_auth_data
commit 8a5939f2af62ea4f3dc53372312975c0769595eb
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 16:22:32 2010 +0100
bool ? true : false is a bit pointless
commit e105708068d7836dbee97aaf20ff0d3520291118
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 16:11:14 2010 +0100
s3: Move parse_sidlist to the only calling file
commit f70d36fe2d0119db7d67aacc725796c793ed8174
Author: Volker Lendecke v...@samba.org
Date: Tue Nov 16 16:09:04 2010 +0100
s3: Remove some unused code
---
Summary of changes:
source3/winbindd/winbindd_async.c | 60 --
source3/winbindd/winbindd_dual.c |3 +-
source3/winbindd/winbindd_getsidaliases.c | 42 ++
source3/winbindd/winbindd_pam.c | 125 +++--
source3/winbindd/winbindd_proto.h |7 --
5 files changed, 106 insertions(+), 131 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_async.c
b/source3/winbindd/winbindd_async.c
index 9e7be6b..958dce3 100644
--- a/source3/winbindd/winbindd_async.c
+++ b/source3/winbindd/winbindd_async.c
@@ -26,66 +26,6 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
-bool print_sidlist(TALLOC_CTX *mem_ctx, const struct dom_sid *sids,
- size_t num_sids, char **result, ssize_t *len)
-{
- size_t i;
- size_t buflen = 0;
-
- *len = 0;
- *result = NULL;
- for (i=0; inum_sids; i++) {
- fstring tmp;
- sprintf_append(mem_ctx, result, len, buflen,
- %s\n, sid_to_fstring(tmp, sids[i]));
- }
-
- if ((num_sids != 0) (*result == NULL)) {
- return False;
- }
-
- return True;
-}
-
-bool parse_sidlist(TALLOC_CTX *mem_ctx, const char *sidstr,
- struct dom_sid **sids, size_t *num_sids)
-{
- const char *p, *q;
-
- p = sidstr;
- if (p == NULL)
- return False;
-
- while (p[0] != '\0') {
- fstring tmp;
- size_t sidlen;
- struct dom_sid sid;
- q = strchr(p, '\n');
- if (q == NULL) {
- DEBUG(0, (Got invalid sidstr: %s\n, p));
- return False;
- }
- sidlen = PTR_DIFF(q, p);
- if (sidlen = sizeof(tmp)-1) {
- return false;
- }
- memcpy(tmp, p, sidlen);
- tmp[sidlen] = '\0';
- q += 1;
- if (!string_to_sid(sid, tmp)) {
- DEBUG(0, (Could not parse sid
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 0a4b7bb s4-repl: removed the syncall_workaround code via 6c8b0d7 s4-repl: save the result of the last replication in repsFrom/repsTo via 73016ad s4-repl: ensure we don't starve pending replication ops via e17ea9f s4-kcc: fixed result_last_attempt in showrepl via 9a744c6 s4-doserr: telling our users to see Windows help doesn't seem right via 1645190 s4-provision: don't test for xattrs if posix:eadb is set via 333975d s4-provision: setup posix:eadb using lp.set() via 9432eab developer: only do the C++ reserved name checking on Linux via d7ea449 s4-provision: don't try to autodetect xattr is posix:eadb is set via 1a65180 s4-heimdal: ask for non-atomic heimdal via e7dad42 heimdal: added HEIM_BASE_NON_ATOMIC option via 6041938 s4-test: updates to test-howto.py via 0cf7189 s4-heimdal: implement KERB_AP_ERR_TYPE_SKEW_RECOVERY via 5f655e9 s4-gensec: zero the gssapi_state via 1887ce8 s4-provision: use the command line lp in provision via 2920033 s4-provision: add log messages about IP lookup via 60449d5 s4-dns: catch more expections in samba_dnsupdate from d1c1aae s3: Remove a reference to winbindd_cli_state from append_auth_data http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0a4b7bb9a547011c4c39b75acee1c00c90562cd1 Author: Andrew Tridgell tri...@samba.org Date: Wed Nov 17 23:48:23 2010 +1100 s4-repl: removed the syncall_workaround code this isn't needed any more Autobuild-User: Andrew Tridgell tri...@samba.org Autobuild-Date: Wed Nov 17 13:41:51 UTC 2010 on sn-devel-104 commit 6c8b0d7f2784faf68d08d42227765bdc0ce28b35 Author: Andrew Tridgell tri...@samba.org Date: Wed Nov 17 23:13:32 2010 +1100 s4-repl: save the result of the last replication in repsFrom/repsTo when a replication fails, we should add the failure to repsFrom when a notify fails, we need to save it to repsTo this ensures showrepl always shows the latest status commit 73016ad40523d4d41114c7b4d6bb2a46815bb597 Author: Andrew Tridgell tri...@samba.org Date: Wed Nov 17 23:12:10 2010 +1100 s4-repl: ensure we don't starve pending replication ops when there was a continuous sequence of notify ops, we could leave the replication ops starving. This ensures we run whichever was queued first commit e17ea9f3f5019cd95ace6920ba73129cda0adf55 Author: Andrew Tridgell tri...@samba.org Date: Wed Nov 17 23:11:12 2010 +1100 s4-kcc: fixed result_last_attempt in showrepl commit 9a744c634ff55c166294d63d192649ad238f9bf6 Author: Andrew Tridgell tri...@samba.org Date: Wed Nov 17 23:10:48 2010 +1100 s4-doserr: telling our users to see Windows help doesn't seem right commit 1645190b1c0a4708cb3110bc94c1b9ec3e0d77e4 Author: Andrew Tridgell tri...@samba.org Date: Wed Nov 17 21:50:06 2010 +1100 s4-provision: don't test for xattrs if posix:eadb is set when it is set in smb.conf or on the command line, obey the setting and don't try to test for system xattr support commit 333975d84f1f5016ad8d61c8107ef76e43af0c7e Author: Andrew Tridgell tri...@samba.org Date: Wed Nov 17 21:49:19 2010 +1100 s4-provision: setup posix:eadb using lp.set() this allows it to override a setting made during the automatic testing of xattr support commit 9432eabb2f6ba282943e1b7ea4e90c0ed38cefe2 Author: Andrew Tridgell tri...@samba.org Date: Wed Nov 17 20:36:37 2010 +1100 developer: only do the C++ reserved name checking on Linux this prevents us breaking the solaris build, but will still mean we prevent C++ vars in our code commit d7ea449049e6536c4c25274dc24d9eaa90cb7abd Author: Andrew Tridgell tri...@samba.org Date: Wed Nov 17 20:15:42 2010 +1100 s4-provision: don't try to autodetect xattr is posix:eadb is set when posix:eadb is set then we know we should be using an eadb commit 1a6518072899593f64e115e2c8cd5f5f4c523a4c Author: Andrew Tridgell tri...@opensolaris.home.tridgell.net Date: Mon Nov 15 22:54:09 2010 -0500 s4-heimdal: ask for non-atomic heimdal this allows us to build with compilers other than gcc commit e7dad42bc6cdf38d194a564c6ecdeb60cd4204c6 Author: Andrew Tridgell tri...@opensolaris.home.tridgell.net Date: Mon Nov 15 22:53:13 2010 -0500 heimdal: added HEIM_BASE_NON_ATOMIC option This allows heimdal to build without gcc, by not using atomic operations. We don't need heimdal to be atomic in Samba. commit 6041938908962ab89527671dd5fb8ce58f530f34 Author: Andrew Tridgell tri...@samba.org Date: Wed Nov 17 18:29:04 2010 +1100 s4-test: updates to test-howto.py - handle clock skew using net time on windows after we open the telnet connection - allow checking for result lists in order -
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 98612fe s3-spoolss: make sure members of BUILTIN\Print Operators
can open printers with admin privileges.
via ee8c035 s3-spoolss: add debug statement for access denied cases in
OpenPrinterEx path.
via b432a3b s3-rpcclient: exit early in cmd_spoolss_enum_data() when
there is a failure.
from 0a4b7bb s4-repl: removed the syncall_workaround code
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 98612fe79321ade72c23ca0c1d966a1c192ec977
Author: Günther Deschner g...@samba.org
Date: Mon Nov 15 12:22:52 2010 +0100
s3-spoolss: make sure members of BUILTIN\Print Operators can open printers
with admin privileges.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Wed Nov 17 15:05:02 UTC 2010 on sn-devel-104
commit ee8c035c41c08e5ac599cf68214acd12712191fa
Author: Günther Deschner g...@samba.org
Date: Mon Nov 15 11:19:23 2010 +0100
s3-spoolss: add debug statement for access denied cases in OpenPrinterEx
path.
Guenther
commit b432a3ba194fdd8a12f5198cd6012d4916301da4
Author: Günther Deschner g...@samba.org
Date: Thu Nov 11 13:26:10 2010 +0100
s3-rpcclient: exit early in cmd_spoolss_enum_data() when there is a failure.
Guenther
---
Summary of changes:
source3/rpc_server/srv_spoolss_nt.c |5 +
source3/rpcclient/cmd_spoolss.c |9 +
2 files changed, 14 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index c0f953b..01b4a75 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -1791,6 +1791,7 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p,
if ((p-server_info-utok.uid != sec_initial_uid())
!security_token_has_privilege(p-server_info-ptok,
SEC_PRIV_PRINT_OPERATOR)
+
!nt_token_check_sid(global_sid_Builtin_Print_Operators, p-server_info-ptok)
!token_contains_name_in_list(
uidtoname(p-server_info-utok.uid),
p-server_info-info3-base.domain.string,
@@ -1799,6 +1800,10 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p,
lp_printer_admin(snum))) {
close_printer_handle(p, r-out.handle);
ZERO_STRUCTP(r-out.handle);
+ DEBUG(3,(access DENIED as user is not root,
+ has no printoperator privilege,
+ not a member of the printoperater
builtin group and
+ is not in printer admin list));
return WERR_ACCESS_DENIED;
}
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 26112b9..1bb3a71 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -2902,6 +2902,15 @@ static WERROR cmd_spoolss_enum_data(struct
rpc_pipe_client *cli,
data_needed,
result);
+ if (!NT_STATUS_IS_OK(status)) {
+ result = ntstatus_to_werror(status);
+ goto done;
+ }
+
+ if (!W_ERROR_IS_OK(result)) {
+ goto done;
+ }
+
data_offered= data_needed;
value_offered = value_needed;
data= talloc_zero_array(mem_ctx, uint8_t, data_needed);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 63029eb s3: Fix a missing return value
from 98612fe s3-spoolss: make sure members of BUILTIN\Print Operators
can open printers with admin privileges.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 63029eb24b9a9b57fbf85b611a66b39b8100a5e3
Author: Volker Lendecke v...@samba.org
Date: Wed Nov 17 20:54:41 2010 +0100
s3: Fix a missing return value
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Wed Nov 17 20:40:18 UTC 2010 on sn-devel-104
---
Summary of changes:
source3/torture/nbio.c |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c
index f4625ab..a514245 100644
--- a/source3/torture/nbio.c
+++ b/source3/torture/nbio.c
@@ -290,7 +290,9 @@ static NTSTATUS delete_fn(const char *mnt, struct file_info
*finfo,
{
NTSTATUS status;
char *s, *n;
- if (finfo-name[0] == '.') return;
+ if (finfo-name[0] == '.') {
+ return NT_STATUS_OK;
+ }
n = SMB_STRDUP(name);
n[strlen(n)-1] = 0;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 23e053d s4-test: rename scripting/devel/howto to
scripting/devel/wintest
via f6c66cd s4-wintest: added wintest.py library
from 63029eb s3: Fix a missing return value
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 23e053d4a221f478d9f0dd5f422f64e7f5beccfe
Author: Andrew Tridgell tri...@samba.org
Date: Thu Nov 18 10:57:28 2010 +1100
s4-test: rename scripting/devel/howto to scripting/devel/wintest
this won't just be for the howto anymore
Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Thu Nov 18 00:45:18 UTC 2010 on sn-devel-104
commit f6c66cd6eee6dbaf34b9cb0c38aa83934104a867
Author: Andrew Tridgell tri...@samba.org
Date: Thu Nov 18 10:56:05 2010 +1100
s4-wintest: added wintest.py library
converted test-howto.py to use the wintest library.
The idea is for us to create other tests that test lots of different
interactions with windows
---
Summary of changes:
source4/scripting/devel/howto/test-howto.py| 700
source4/scripting/devel/wintest/test-howto.py | 522 +++
.../scripting/devel/{howto = wintest}/tridge.conf |0
source4/scripting/devel/wintest/wintest.py | 220 ++
4 files changed, 742 insertions(+), 700 deletions(-)
delete mode 100755 source4/scripting/devel/howto/test-howto.py
create mode 100755 source4/scripting/devel/wintest/test-howto.py
rename source4/scripting/devel/{howto = wintest}/tridge.conf (100%)
create mode 100644 source4/scripting/devel/wintest/wintest.py
Changeset truncated at 500 lines:
diff --git a/source4/scripting/devel/howto/test-howto.py
b/source4/scripting/devel/howto/test-howto.py
deleted file mode 100755
index 955509f..000
--- a/source4/scripting/devel/howto/test-howto.py
+++ /dev/null
@@ -1,700 +0,0 @@
-#!/usr/bin/env python
-
-'''automated testing of the steps of the Samba4 HOWTO'''
-
-import pexpect, subprocess
-import sys, os, time
-import optparse
-
-vars = {}
-
-parser = optparse.OptionParser(samba_dnsupdate)
-parser.add_option(--conf, type='string', default='', help='config file')
-
-def load_config(fname):
-'''load the config file'''
-f = open(fname)
-for line in f:
-line = line.strip()
-if len(line) == 0 or line[0] == '#':
-continue
-colon = line.find(':')
-if colon == -1:
-raise Exception(Invalid config line '%s' % line)
-varname = line[0:colon].strip()
-value = line[colon+1:].strip()
-vars[varname] = value
-
-def substitute(text):
-Substitute strings of the form ${NAME} in text, replacing
-with substitutions from vars.
-
-if isinstance(text, list):
-ret = text[:]
-for i in range(len(ret)):
-ret[i] = substitute(ret[i])
-return ret
-
-while True:
-var_start = text.find(${)
-if var_start == -1:
-return text
-var_end = text.find(}, var_start)
-if var_end == -1:
-return text
-var_name = text[var_start+2:var_end]
-if not var_name in vars:
-raise Exception(Unknown substitution variable ${%s} % var_name)
-text = text.replace(${%s} % var_name, vars[var_name])
-return text
-
-
-
-def putenv(key, value):
-os.putenv(key, substitute(value))
-
-def chdir(dir):
-os.chdir(substitute(dir))
-
-
-def run_cmd(cmd, dir=., show=None, output=False, checkfail=True):
-cmd = substitute(cmd)
-if isinstance(cmd, list):
-print('$ ' + .join(cmd))
-else:
-print('$ ' + cmd)
-if output:
-return subprocess.Popen([cmd], shell=True, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, cwd=dir).communicate()[0]
-if isinstance(cmd, list):
-shell=False
-else:
-shell=True
-if checkfail:
-return subprocess.check_call(cmd, shell=shell, cwd=dir)
-else:
-return subprocess.call(cmd, shell=shell, cwd=dir)
-
-
-def cmd_output(cmd):
-'''return output from and command'''
-cmd = substitute(cmd)
-return run_cmd(cmd, output=True)
-
-def cmd_contains(cmd, contains, nomatch=False, ordered=False):
-'''check that command output contains the listed strings'''
-out = cmd_output(cmd)
-print out
-for c in substitute(contains):
-ofs = out.find(c)
-if nomatch:
-if ofs != -1:
-raise Exception(Expected to not see %s in %s % (c, cmd))
-else:
-if ofs == -1:
-raise Exception(Expected to see %s in %s % (c, cmd))
-if ordered and ofs != -1:
-ofs += len(c)
-out = out[ofs:]
-
-def retry_cmd(cmd, contains, retries=30, delay=2, wait_for_fail=False):
-'''retry a command a number of times'''
-
[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-241-g92bcf1c
The branch, 1.2 has been updated
via 92bcf1c475d8497e08a0babf7a7b3434dade7208 (commit)
from d0b790de08b9c9226ac9848b434a051d99a41dd8 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.2
- Log -
commit 92bcf1c475d8497e08a0babf7a7b3434dade7208
Author: Martin Schwenke mar...@meltin.net
Date: Thu Nov 18 11:04:52 2010 +1100
50.samba eventscript should stop/start services when they become
(un)managed.
When the value of $CTDB_MANAGES_SAMBA or $CTDB_MANAGES_WINBIND (or
corresponding changes are made to $CTDB_MANAGED_VERSIONS), the
associated service should be started or stopped as necessary.
This add calls to ctdb_start_stop_service() to manage
starting/stopping samba and winbind.
An associated cleanup is made to the initial checks that one of
$CTDB_MANAGES_SAMBA or $CTDB_MANAGES_WINBIND is set, replacing them
with calls to is_ctdb_managed_service().
To handle the winbind cases ctdb_start_stop_service() and
is_ctdb_managed_service() are updated to take an optional service name
parameter.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
config/events.d/50.samba | 11 +--
config/functions | 14 +-
2 files changed, 18 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 047f9e0..5338c92 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -30,8 +30,6 @@ service_stop=stop_samba
loadconfig
-[ $CTDB_MANAGES_SAMBA = yes ] || [ $CTDB_MANAGES_WINBIND = yes ] ||
exit 0
-
start_samba() {
# create the state directory for samba
/bin/mkdir -p $CTDB_VARDIR/state/samba
@@ -203,6 +201,15 @@ periodic_cleanup() {
smbstatus -np /dev/null 21
}
+###
+
+ctdb_start_stop_service
+ctdb_start_stop_service windbind
+
+is_ctdb_managed_service || is_ctdb_managed_service winbind || exit 0
+
+###
+
case $1 in
startup)
ctdb_service_start
diff --git a/config/functions b/config/functions
index 4acfc4f..a7e3e53 100755
--- a/config/functions
+++ b/config/functions
@@ -662,6 +662,8 @@ ctdb_compat_managed_service ()
is_ctdb_managed_service ()
{
+_service_name=${1:-${service_name}}
+
t= $CTDB_MANAGED_SERVICES
ctdb_compat_managed_service $CTDB_MANAGES_VSFTPD vsftpd
@@ -673,17 +675,19 @@ is_ctdb_managed_service ()
ctdb_compat_managed_service $CTDB_MANAGES_CLAMDclamd
ctdb_compat_managed_service $CTDB_MANAGES_NFS nfs
-# Returns 0 if space$service_namespace appears in $t
-[ ${t#* ${service_name} } != ${t} ]
+# Returns 0 if space$_service_namespace appears in $t
+[ ${t#* ${_service_name} } != ${t} ]
}
ctdb_start_stop_service ()
{
-_active=$ctdb_active_dir/$service_name
+_service_name=${1:-${service_name}}
+
+_active=$ctdb_active_dir/$_service_name
if is_ctdb_managed_service ; then
if ! [ -e $_active ] ; then
- echo Starting service $service_name
+ echo Starting service $_service_name
ctdb_service_start || exit $?
mkdir -p $ctdb_active_dir
touch $_active
@@ -691,7 +695,7 @@ ctdb_start_stop_service ()
fi
elif ! is_ctdb_managed_service ; then
if [ -e $_active ] ; then
- echo Stopping service $service_name
+ echo Stopping service $_service_name
ctdb_service_stop || exit $?
rm -f $_active
fi
--
CTDB repository
[SCM] CTDB repository - branch 1.2-nodeflags updated - ctdb-1.9.1-234-gd02348e
The branch, 1.2-nodeflags has been updated
via d02348ed053cb7c0cf7d53ef14aed15553d67816 (commit)
from 028e2a43edec784b0bb871d39975bc0abc6fd7b2 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.2-nodeflags
- Log -
commit d02348ed053cb7c0cf7d53ef14aed15553d67816
Author: Martin Schwenke mar...@meltin.net
Date: Thu Nov 18 11:04:52 2010 +1100
50.samba eventscript should stop/start services when they become
(un)managed.
When the value of $CTDB_MANAGES_SAMBA or $CTDB_MANAGES_WINBIND (or
corresponding changes are made to $CTDB_MANAGED_VERSIONS), the
associated service should be started or stopped as necessary.
This add calls to ctdb_start_stop_service() to manage
starting/stopping samba and winbind.
An associated cleanup is made to the initial checks that one of
$CTDB_MANAGES_SAMBA or $CTDB_MANAGES_WINBIND is set, replacing them
with calls to is_ctdb_managed_service().
To handle the winbind cases ctdb_start_stop_service() and
is_ctdb_managed_service() are updated to take an optional service name
parameter.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
config/events.d/50.samba | 11 +--
config/functions | 14 +-
2 files changed, 18 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 047f9e0..5338c92 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -30,8 +30,6 @@ service_stop=stop_samba
loadconfig
-[ $CTDB_MANAGES_SAMBA = yes ] || [ $CTDB_MANAGES_WINBIND = yes ] ||
exit 0
-
start_samba() {
# create the state directory for samba
/bin/mkdir -p $CTDB_VARDIR/state/samba
@@ -203,6 +201,15 @@ periodic_cleanup() {
smbstatus -np /dev/null 21
}
+###
+
+ctdb_start_stop_service
+ctdb_start_stop_service windbind
+
+is_ctdb_managed_service || is_ctdb_managed_service winbind || exit 0
+
+###
+
case $1 in
startup)
ctdb_service_start
diff --git a/config/functions b/config/functions
index 4acfc4f..a7e3e53 100755
--- a/config/functions
+++ b/config/functions
@@ -662,6 +662,8 @@ ctdb_compat_managed_service ()
is_ctdb_managed_service ()
{
+_service_name=${1:-${service_name}}
+
t= $CTDB_MANAGED_SERVICES
ctdb_compat_managed_service $CTDB_MANAGES_VSFTPD vsftpd
@@ -673,17 +675,19 @@ is_ctdb_managed_service ()
ctdb_compat_managed_service $CTDB_MANAGES_CLAMDclamd
ctdb_compat_managed_service $CTDB_MANAGES_NFS nfs
-# Returns 0 if space$service_namespace appears in $t
-[ ${t#* ${service_name} } != ${t} ]
+# Returns 0 if space$_service_namespace appears in $t
+[ ${t#* ${_service_name} } != ${t} ]
}
ctdb_start_stop_service ()
{
-_active=$ctdb_active_dir/$service_name
+_service_name=${1:-${service_name}}
+
+_active=$ctdb_active_dir/$_service_name
if is_ctdb_managed_service ; then
if ! [ -e $_active ] ; then
- echo Starting service $service_name
+ echo Starting service $_service_name
ctdb_service_start || exit $?
mkdir -p $ctdb_active_dir
touch $_active
@@ -691,7 +695,7 @@ ctdb_start_stop_service ()
fi
elif ! is_ctdb_managed_service ; then
if [ -e $_active ] ; then
- echo Stopping service $service_name
+ echo Stopping service $_service_name
ctdb_service_stop || exit $?
rm -f $_active
fi
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.10-27-gd98f175
The branch, master has been updated
via d98f175e8420d921a123ae9c0ce00945350b1537 (commit)
from 1569a54bb82fc433895ed68f816cf48399ad9d40 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit d98f175e8420d921a123ae9c0ce00945350b1537
Author: Martin Schwenke mar...@meltin.net
Date: Thu Nov 18 11:04:52 2010 +1100
50.samba eventscript should stop/start services when they become
(un)managed.
When the value of $CTDB_MANAGES_SAMBA or $CTDB_MANAGES_WINBIND (or
corresponding changes are made to $CTDB_MANAGED_VERSIONS), the
associated service should be started or stopped as necessary.
This add calls to ctdb_start_stop_service() to manage
starting/stopping samba and winbind.
An associated cleanup is made to the initial checks that one of
$CTDB_MANAGES_SAMBA or $CTDB_MANAGES_WINBIND is set, replacing them
with calls to is_ctdb_managed_service().
To handle the winbind cases ctdb_start_stop_service() and
is_ctdb_managed_service() are updated to take an optional service name
parameter.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
config/events.d/50.samba | 11 +--
config/functions | 14 +-
2 files changed, 18 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 047f9e0..5338c92 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -30,8 +30,6 @@ service_stop=stop_samba
loadconfig
-[ $CTDB_MANAGES_SAMBA = yes ] || [ $CTDB_MANAGES_WINBIND = yes ] ||
exit 0
-
start_samba() {
# create the state directory for samba
/bin/mkdir -p $CTDB_VARDIR/state/samba
@@ -203,6 +201,15 @@ periodic_cleanup() {
smbstatus -np /dev/null 21
}
+###
+
+ctdb_start_stop_service
+ctdb_start_stop_service windbind
+
+is_ctdb_managed_service || is_ctdb_managed_service winbind || exit 0
+
+###
+
case $1 in
startup)
ctdb_service_start
diff --git a/config/functions b/config/functions
index 4acfc4f..a7e3e53 100755
--- a/config/functions
+++ b/config/functions
@@ -662,6 +662,8 @@ ctdb_compat_managed_service ()
is_ctdb_managed_service ()
{
+_service_name=${1:-${service_name}}
+
t= $CTDB_MANAGED_SERVICES
ctdb_compat_managed_service $CTDB_MANAGES_VSFTPD vsftpd
@@ -673,17 +675,19 @@ is_ctdb_managed_service ()
ctdb_compat_managed_service $CTDB_MANAGES_CLAMDclamd
ctdb_compat_managed_service $CTDB_MANAGES_NFS nfs
-# Returns 0 if space$service_namespace appears in $t
-[ ${t#* ${service_name} } != ${t} ]
+# Returns 0 if space$_service_namespace appears in $t
+[ ${t#* ${_service_name} } != ${t} ]
}
ctdb_start_stop_service ()
{
-_active=$ctdb_active_dir/$service_name
+_service_name=${1:-${service_name}}
+
+_active=$ctdb_active_dir/$_service_name
if is_ctdb_managed_service ; then
if ! [ -e $_active ] ; then
- echo Starting service $service_name
+ echo Starting service $_service_name
ctdb_service_start || exit $?
mkdir -p $ctdb_active_dir
touch $_active
@@ -691,7 +695,7 @@ ctdb_start_stop_service ()
fi
elif ! is_ctdb_managed_service ; then
if [ -e $_active ] ; then
- echo Stopping service $service_name
+ echo Stopping service $_service_name
ctdb_service_stop || exit $?
rm -f $_active
fi
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1c4807a s4-test: added greater control over tests to run
from 23e053d s4-test: rename scripting/devel/howto to
scripting/devel/wintest
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1c4807a62f2a7c4199079b7ab13ed6a4b121ff09
Author: Andrew Tridgell tri...@samba.org
Date: Thu Nov 18 14:43:53 2010 +1100
s4-test: added greater control over tests to run
now supports --list to list tests, and --skip to skip the named tests
Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Thu Nov 18 04:29:24 UTC 2010 on sn-devel-104
---
Summary of changes:
source4/scripting/devel/wintest/test-howto.py | 468 ++---
source4/scripting/devel/wintest/tridge.conf | 30 ++-
source4/scripting/devel/wintest/wintest.py| 42 ++-
3 files changed, 320 insertions(+), 220 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/devel/wintest/test-howto.py
b/source4/scripting/devel/wintest/test-howto.py
index e08595a..c53fc51 100755
--- a/source4/scripting/devel/wintest/test-howto.py
+++ b/source4/scripting/devel/wintest/test-howto.py
@@ -8,12 +8,8 @@ import wintest
vars = {}
-parser = optparse.OptionParser(samba_dnsupdate)
-parser.add_option(--conf, type='string', default='', help='config file')
-
-
def check_prerequesites(t):
-print(Checking prerequesites)
+t.info(Checking prerequesites)
t.setvar('HOSTNAME', t.cmd_output(hostname -s).strip())
if os.getuid() != 0:
raise Exception(You must run this script as root)
@@ -22,7 +18,7 @@ def check_prerequesites(t):
def build_s4(t):
'''build samba4'''
-print('Building s4')
+t.info('Building s4')
t.chdir('${SOURCETREE}/source4')
t.putenv('CC', 'ccache gcc')
t.run_cmd('make reconfigure || ./configure --enable-auto-reconfigure
--enable-developer --prefix=${PREFIX} -C')
@@ -32,7 +28,7 @@ def build_s4(t):
def provision_s4(t):
'''provision s4 as a DC'''
-print('Provisioning s4')
+t.info('Provisioning s4')
t.chdir('${PREFIX}')
t.run_cmd(rm -rf etc private)
t.run_cmd('sbin/provision --realm=${LCREALM} --domain=${DOMAIN}
--adminpass=${PASSWORD1} --server-role=domain controller
--function-level=2008 -d${DEBUGLEVEL}')
@@ -41,7 +37,7 @@ def provision_s4(t):
t.run_cmd('bin/samba-tool group addmembers Allowed RODC Password
Replication Group testallowed')
def start_s4(t, interfaces=None):
-print('Starting Samba4')
+t.info('Starting Samba4')
t.chdir(${PREFIX})
t.run_cmd('killall -9 -q samba smbd nmbd winbindd', checkfail=False)
t.run_cmd(['sbin/samba',
@@ -50,7 +46,7 @@ def start_s4(t, interfaces=None):
t.port_wait(localhost, 445)
def test_smbclient(t):
-print('Testing smbclient')
+t.info('Testing smbclient')
t.chdir('${PREFIX}')
t.cmd_contains(bin/smbclient --version, [Version 4.0])
t.retry_cmd('bin/smbclient -L localhost -U%', [netlogon, sysvol, IPC
Service])
@@ -66,7 +62,7 @@ def test_smbclient(t):
child.sendline(rmdir testdir)
def create_shares(t):
-print(Adding test shares)
+t.info(Adding test shares)
t.chdir('${PREFIX}')
f = open(etc/smb.conf, mode='a')
f.write(t.substitute('''
@@ -83,7 +79,7 @@ def create_shares(t):
def restart_bind(t):
-print(Restarting bind9)
+t.info(Restarting bind9)
t.putenv('KEYTAB_FILE', '${PREFIX}/private/dns.keytab')
t.putenv('KRB5_KTNAME', '${PREFIX}/private/dns.keytab')
t.run_cmd('killall -9 -q named', checkfail=False)
@@ -95,7 +91,7 @@ def restart_bind(t):
t.run_cmd(${RNDC} thaw)
def test_dns(t):
-print(Testing DNS)
+t.info(Testing DNS)
t.cmd_contains(host -t SRV _ldap._tcp.${LCREALM}.,
['_ldap._tcp.${LCREALM} has SRV record 0 100 389
${HOSTNAME}.${LCREALM}'])
t.cmd_contains(host -t SRV _kerberos._udp.${LCREALM}.,
@@ -104,7 +100,7 @@ def test_dns(t):
['${HOSTNAME}.${LCREALM} has address'])
def test_kerberos(t):
-print(Testing kerberos)
+t.info(Testing kerberos)
t.run_cmd(kdestroy)
t.kinit(administra...@${realm}, ${PASSWORD1})
t.cmd_contains(klist -e, [Ticket cache, Default principal, Valid
starting])
@@ -116,44 +112,49 @@ def test_dyndns(t):
t.run_cmd(${RNDC} flush)
t.cmd_contains(sbin/samba_dnsupdate --verbose, [No DNS updates needed])
-def join_win7(t):
-print(Joining a Win7 box to the domain)
-t.vm_poweroff(${WINDOWS7_VM}, checkfail=False)
-t.vm_restore(${WINDOWS7_VM}, ${WINDOWS7_SNAPSHOT})
-t.ping_wait(${WINDOWS7})
-t.port_wait(${WINDOWS7}, 23)
-child = t.open_telnet(${WINDOWS7}, administrator, ${PASSWORD1},
set_time=True)
-child.sendline(netdom join ${WINDOWS7} /Domain:${LCREALM}
/PasswordD:${PASSWORD1}
[SCM] CTDB repository - branch 1.2-nodeflags updated - ctdb-1.9.1-236-gd245fd3
The branch, 1.2-nodeflags has been updated
via d245fd3187570320f972a4c411da3ea1334b8e0b (commit)
via a14724cfcb9688745b15b0cfb3b556d0a9af1d4d (commit)
from d02348ed053cb7c0cf7d53ef14aed15553d67816 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.2-nodeflags
- Log -
commit d245fd3187570320f972a4c411da3ea1334b8e0b
Author: Martin Schwenke mar...@meltin.net
Date: Thu Nov 18 13:23:40 2010 +1100
60.nfs eventscript should do nothing if NFS isn't managed by CTDB.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit a14724cfcb9688745b15b0cfb3b556d0a9af1d4d
Author: Martin Schwenke mar...@meltin.net
Date: Thu Nov 18 11:27:10 2010 +1100
Eventscript functions - catch failures in ctdb_service_start().
ctdb_service_start() currently succeeds if ctdb_counter_init()
succeeds.
This changes it to fail when a service start fails.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
config/events.d/60.nfs |2 ++
config/functions |4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 8889cad..ff56166 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -19,6 +19,8 @@ loadconfig
ctdb_start_stop_service
+is_ctdb_managed_service || exit 0
+
case $1 in
init)
# read statd from persistent database
diff --git a/config/functions b/config/functions
index a7e3e53..5dd31fe 100755
--- a/config/functions
+++ b/config/functions
@@ -706,9 +706,9 @@ ctdb_start_stop_service ()
ctdb_service_start ()
{
if [ -n $service_start ] ; then
- eval $service_start
+ eval $service_start || return $?
else
- service $service_name start
+ service $service_name start || return $?
fi
ctdb_counter_init
}
--
CTDB repository
[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-246-ga500cc6
The branch, 1.2 has been updated
via a500cc6cf2f118355bee7d983d4355341309d636 (commit)
via 11b234458621fe0cbc72a36cae0ee7d9c1d06cf9 (commit)
via cb5451d4c164cc3ed20d026344c53c4ee492fc04 (commit)
via cdac098f3c829011830b63edba571856875c7b8d (commit)
via a24ac016323be5edcbae7d614315df92d77e1773 (commit)
from 92bcf1c475d8497e08a0babf7a7b3434dade7208 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.2
- Log -
commit a500cc6cf2f118355bee7d983d4355341309d636
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Thu Nov 18 15:40:19 2010 +1100
update autostart/stop to work for samba
commit 11b234458621fe0cbc72a36cae0ee7d9c1d06cf9
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Thu Nov 18 14:15:18 2010 +1100
add an explicit _is_managed_service to iscsi eventscript
commit cb5451d4c164cc3ed20d026344c53c4ee492fc04
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Thu Nov 18 13:52:46 2010 +1100
Dont pollute the logs with a file not found message
CQ S1020745
commit cdac098f3c829011830b63edba571856875c7b8d
Author: Martin Schwenke mar...@meltin.net
Date: Thu Nov 18 13:23:40 2010 +1100
60.nfs eventscript should do nothing if NFS isn't managed by CTDB.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit a24ac016323be5edcbae7d614315df92d77e1773
Author: Martin Schwenke mar...@meltin.net
Date: Thu Nov 18 11:27:10 2010 +1100
Eventscript functions - catch failures in ctdb_service_start().
ctdb_service_start() currently succeeds if ctdb_counter_init()
succeeds.
This changes it to fail when a service start fails.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
config/events.d/50.samba |5 -
config/events.d/60.nfs |4 +++-
config/events.d/70.iscsi |2 ++
config/functions | 13 ++---
4 files changed, 15 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 5338c92..54a29cf 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -77,6 +77,7 @@ start_samba() {
nice_service $CTDB_SERVICE_NMB start
nice_service $CTDB_SERVICE_SMB start
}
+ return 0
}
stop_samba() {
@@ -91,6 +92,8 @@ stop_samba() {
[ $CTDB_MANAGES_WINBIND = yes ] {
service $CTDB_SERVICE_WINBIND stop
}
+
+ return 0
}
# set default samba cleanup period - in minutes
@@ -204,7 +207,7 @@ periodic_cleanup() {
###
ctdb_start_stop_service
-ctdb_start_stop_service windbind
+ctdb_start_stop_service winbind
is_ctdb_managed_service || is_ctdb_managed_service winbind || exit 0
diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 8889cad..23f22b7 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -19,6 +19,8 @@ loadconfig
ctdb_start_stop_service
+is_ctdb_managed_service || exit 0
+
case $1 in
init)
# read statd from persistent database
@@ -154,7 +156,7 @@ case $1 in
# once every 60 seconds, update the statd state database for which
# clients need notifications
- LAST_UPDATE=`stat --printf=%Y $CTDB_VARDIR/state/statd/update-trigger`
+ LAST_UPDATE=`stat --printf=%Y $CTDB_VARDIR/state/statd/update-trigger
2/dev/null`
CURRENT_TIME=`date +%s`
[ $CURRENT_TIME -ge $(($LAST_UPDATE + 60)) ] {
mkdir -p $CTDB_VARDIR/state/statd
diff --git a/config/events.d/70.iscsi b/config/events.d/70.iscsi
index a3cf040..a050259 100755
--- a/config/events.d/70.iscsi
+++ b/config/events.d/70.iscsi
@@ -7,6 +7,8 @@ service_name=iscsi
ctdb_start_stop_service
+is_ctdb_managed_service || exit 0
+
[ -z $CTDB_START_ISCSI_SCRIPTS ] {
echo No iscsi start script directory found
exit 0
diff --git a/config/functions b/config/functions
index a7e3e53..ee38225 100755
--- a/config/functions
+++ b/config/functions
@@ -669,7 +669,7 @@ is_ctdb_managed_service ()
ctdb_compat_managed_service $CTDB_MANAGES_VSFTPD vsftpd
ctdb_compat_managed_service $CTDB_MANAGES_SAMBAsamba
ctdb_compat_managed_service $CTDB_MANAGES_SCP scp
-ctdb_compat_managed_service $CTDB_MANAGES_WINDBIND windbind
+ctdb_compat_managed_service $CTDB_MANAGES_WINBIND winbind
ctdb_compat_managed_service $CTDB_MANAGES_HTTPDhttpd
ctdb_compat_managed_service $CTDB_MANAGES_ISCSIiscsi
ctdb_compat_managed_service $CTDB_MANAGES_CLAMDclamd
@@ -684,8 +684,7 @@ ctdb_start_stop_service ()
_service_name=${1:-${service_name}}
_active=$ctdb_active_dir/$_service_name
-
-if is_ctdb_managed_service ; then
+if is_ctdb_managed_service $_service_name; then
if ! [ -e $_active ] ; then
[SCM] CTDB repository - branch master updated - ctdb-1.10-29-g582e5cd
The branch, master has been updated
via 582e5cd077501e8d4131a9c7981781471308edfd (commit)
via ddb73962d72d933bf0edc28be0dbb45bea7e5ef4 (commit)
from d98f175e8420d921a123ae9c0ce00945350b1537 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 582e5cd077501e8d4131a9c7981781471308edfd
Author: Martin Schwenke mar...@meltin.net
Date: Thu Nov 18 13:23:40 2010 +1100
60.nfs eventscript should do nothing if NFS isn't managed by CTDB.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit ddb73962d72d933bf0edc28be0dbb45bea7e5ef4
Author: Martin Schwenke mar...@meltin.net
Date: Thu Nov 18 11:27:10 2010 +1100
Eventscript functions - catch failures in ctdb_service_start().
ctdb_service_start() currently succeeds if ctdb_counter_init()
succeeds.
This changes it to fail when a service start fails.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
config/events.d/60.nfs |2 ++
config/functions |4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 8889cad..ff56166 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -19,6 +19,8 @@ loadconfig
ctdb_start_stop_service
+is_ctdb_managed_service || exit 0
+
case $1 in
init)
# read statd from persistent database
diff --git a/config/functions b/config/functions
index a7e3e53..5dd31fe 100755
--- a/config/functions
+++ b/config/functions
@@ -706,9 +706,9 @@ ctdb_start_stop_service ()
ctdb_service_start ()
{
if [ -n $service_start ] ; then
- eval $service_start
+ eval $service_start || return $?
else
- service $service_name start
+ service $service_name start || return $?
fi
ctdb_counter_init
}
--
CTDB repository
Build status as of Thu Nov 18 07:00:11 2010
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2010-11-17 00:00:15.0 -0700 +++ /home/build/master/cache/broken_results.txt 2010-11-18 00:01:34.0 -0700 @@ -1,4 +1,4 @@ -Build status as of Wed Nov 17 07:00:01 2010 +Build status as of Thu Nov 18 07:00:11 2010 Build counts: Tree Total Broken Panic @@ -13,10 +13,10 @@ rsync36 0 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 36 22 0 +samba_3_current 36 23 0 samba_3_master 36 19 0 samba_3_next 36 33 0 -samba_4_0_test 42 28 1 +samba_4_0_test 42 28 2 talloc 36 1 0 tdb 34 1 0
