[Samba] Fwd: Directory permissions
Hello, I have a Samba server (Version 3.2.4-4.3-2042-SUSE-SL11.0) running on a openSUSE 11.0 machine. There is one share configured which allows for all users to read/write from/to that share. The share is called public and is /home/data on disk: [public] comment = Public data path = /home/data read only = No guest ok = No One of the directories (/home/data/library) inside the share should be read only for everybody but three users. The easiest I see to do this is to create a new share with the correct permissions but the customer doesn't see it that way - too much trouble mapping another drive on their machines. Is there a way that I can configure the file permissions or share that the directory would be read only for everybody apart from three users? In other words, share public contains directory library. This library directory should be read only for all users apart from John, Tracy and Peter. At present all users belong to the same group (smbusers) and the directory /home/data (and all subdirs/files) are owned by whoever created it and group smbusers. They are all rwxrwx---. Thanks, Albert -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] HP Laserjet Printer Installation
Hi, Also i m not able to find PID file for cups as well PID no. for cups using command ps -ef | grep cups Following is the o/p for rpm -qi cups command Name: cups Relocations: (not relocatable) Version : 1.2.4 Vendor: Red Hat, Inc. Release : 11.5.el5 Build Date: Tue 12 Dec 2006 05:02:44 PM IST Install Date: Sat 07 Mar 2009 11:59:04 AM IST Build Host: ls20-bc1-13.build.redhat.com Group : System Environment/DaemonsSource RPM: cups-1.2.4-11.5.el5.src.rpm Size: 8201990 License: GPL Signature : DSA/SHA1, Wed 17 Jan 2007 10:28:48 PM IST, Key ID 5326810137017186 Packager: Red Hat, Inc. http://bugzilla.redhat.com/bugzilla URL : http://www.cups.org/ Summary : Common Unix Printing System Description : The Common UNIX Printing System provides a portable printing layer for UNIX® operating systems. It has been developed by Easy Software Products to promote a standard printing solution for all UNIX vendors and users. CUPS provides the System V and Berkeley command-line interfaces. Not updating to latest one too.. But below file shows updated status vi /etc/cups/printers.conf # Printer configuration file for CUPS v1.4b2 # Written by cupsd on 2009-04-14 14:36 Please let m know anything can b added in this case.. Regards Amit Sudhir Anjarlekar Asst. Systems Engr. Tata Consultancy Services Mailto: amit.anjarle...@tcs.com Website: http://www.tcs.com Experience certainty. IT Services Business Solutions Outsourcing Amit Anjarlekar/MUM/TCS 04/14/2009 01:15 PM To mallapadi niranjan niranjan.as...@gmail.com cc Subject Re: [Samba] HP Laserjet Printer Installation Hi niranjan, Thanks for the support .. Can u just guide as where do i chk init script that you are using point to the newly compiled cupsd? Log file i m not getting anything related to this. Pls advise. Thanks in advance.. Regards Amit Sudhir Anjarlekar Asst. Systems Engr. Tata Consultancy Services Mailto: amit.anjarle...@tcs.com Website: http://www.tcs.com Experience certainty. IT Services Business Solutions Outsourcing mallapadi niranjan niranjan.as...@gmail.com 04/13/2009 10:37 PM To amit.anjarle...@tcs.com cc Subject Re: [Samba] HP Laserjet Printer Installation Hi amit Also one thing i forgot to mention ie after installation of latest cups service cups restart is showing following error: cups: restarted scheduler. [ OK ] Cups service not starting. Can u guide as what may b the reason. I followed the procedure from INSTALL.txt file. Does the init script that you are using point to the newly compiled cupsd Also, it can be possible that cupsd process is already running and you are trying to start the cupsd process again. check what messages are reported in /var/log/cups/error.log or appropriate error log file. Regards Niranjan On Mon, Apr 13, 2009 at 3:07 PM, amit.anjarle...@tcs.com wrote: Hi, Its not reflecting in /etc/cups/printers.conf file . Even if i am manually adding the entry, is also not working. Pls suggest. Regards Amit Sudhir Anjarlekar Asst. Systems Engr. Tata Consultancy Services Mailto: amit.anjarle...@tcs.com Website: http://www.tcs.com Experience certainty.IT Services Business Solutions Outsourcing mallapadi niranjan niranjan.as...@gmail.com 04/13/2009 02:04 PM To amit.anjarle...@tcs.com cc Subject Re: [Samba] HP Laserjet Printer Installation Hi Amit On Mon, Apr 13, 2009 at 1:18 PM, amit.anjarle...@tcs.com wrote: Hi all, I have a very good query related to printer sharing using samba. Following is the scenario... I had installed HP laserjet 9040Dn printer on redhat Enterprise linux 5. Shared it using samba. Used winbind protocol to integrate linux with windows AD 2003. Now i am able to see printer in Active directory as well as linux computer account in AD. But unable to set option lpadmin -p printer -o job-quota-period=604800 -o job-page-limit=100 Going after lot of forums, i found that printer should support job-page-limit option. Whatever drivers installed for printer are current drivers ie also from HP site only. HP doesant support linux OS. So no support from there. Following is the o/p of lpoptions -l command for the above printer. As per problem description , it seems it is a cups issue than samba issue . When you set the limits using lpadmin command, does the limit show in /etc/cups/printers.conf ? ie. when you run lpadmin -p printer
[Samba] Stefan Immel ist außer Haus.
Ich werde ab 14.04.2009 nicht im Büro sein. Ich kehre zurück am 20.04.2009. Ich werde Ihre Nachricht nach meiner Rückkehr beantworten. In dringenden Fällen senden Sie bitte eine Email an i...@stroeher.de. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] set up for Active Directory
Running Sun OS 5.10 sparc. OK, I am trying to establish an Active Directory connection from my Sun Solaris box and am trying to utilize Samba to accomplish this task. I've installed OpenLDAP Samba, but when I run a few checks, it appears that Samba is not seeing KRB or ADS, but is seeing LDAP WINBIND. (This is Samba 3.3.3) # cd /usr/local/samba/sbin # smbd -b|grep LDAP HAVE_LDAP_H HAVE_LDAP HAVE_LDAP_INIT HAVE_LDAP_SASL_WRAPPING HAVE_LDAP_SET_REBIND_PROC HAVE_LIBLDAP LDAP_SET_REBIND_PROC_ARGS # smbd -b|grep KRB # smbd -b|grep ADS # smbd -b|grep WINBIND WITH_WINBIND WITH_WINBIND I thought it might have been something with my ./configure script I ran for samba, so I tried it again, but this time it tells me ldap is not initialized: configure:59398: checking whether LDAP support is used configure:59400: result: yes configure:59423: checking for Active Directory and krb5 support configure:59437: result: yes configure:59580: checking for ldap_initialize configure:59663: result: no configure:59676: error: Active Directory support requires ldap_initialize UGH! So frustrating. I've been at this one project for a week now and still have not been able to get this to work. Please - any guidance you can provide would be a great help! Thank you! *** * Jamen McGranahan * Systems Services Librarian * Library Information Technology Services * Vanderbilt University * Suite 700 * 110 21st Avenue South * Nashville, TN 37240 * (615) 343-1614 * (615) 343-8834 (fax) * jamen.mcgrana...@vanderbilt.edu *** -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] set up for Active Directory
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 McGranahan, Jamen wrote: configure:59580: checking for ldap_initialize configure:59663: result: no configure:59676: error: Active Directory support requires ldap_initialize Did the howto that was previously posted not help? My advice is to get the latest OpenLDAP and MIT krb5 libs and install those. Then rebuild Samba. Life is to short to spend it trying to get code compiling :-) But it's your call. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFJ5KAqIR7qMdg1EfYRAmrDAJ93XxnV/TdvFlV2cjMRryPes/r3jwCfW8pH qKFCqgc0v8mgtOmAyOxTXnc= =TdQv -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
RE: [Samba] set up for Active Directory
OK, I've installed the MIT version of KRB5 samba appears to have installed correctly. However, it appears that I am not able to join my domain. # ./net ads join -U mcgr...@ds.vanderbilt.edu [2009/04/14 11:36:50, 0] param/loadparm.c:lp_set_enum_parm(7097) WARNING: Ignoring invalid value 'ADS' for parameter 'security' [2009/04/14 11:36:50, 0] param/loadparm.c:lp_do_parameter(7174) Ignoring unknown parameter realm ADS support not compiled in So I tried the -d3 version of ./net and got this: # ./net ads -d3 join -U mcgr...@vanderbilt.edu [2009/04/14 11:17:10, 3] param/loadparm.c:lp_load_ex(8794) lp_load_ex: refreshing parameters [2009/04/14 11:17:10, 3] param/loadparm.c:init_globals(4629) Initialising global parameters [2009/04/14 11:17:10, 3] param/params.c:pm_process(569) params.c:pm_process() - Processing configuration file /usr/local/samba/lib/smb.conf [2009/04/14 11:17:10, 3] param/loadparm.c:do_section(7457) Processing section [global] [2009/04/14 11:17:10, 0] param/loadparm.c:lp_set_enum_parm(7097) WARNING: Ignoring invalid value 'ADS' for parameter 'security' [2009/04/14 11:17:10, 1] param/loadparm.c:map_parameter(6131) Unknown parameter encountered: realm [2009/04/14 11:17:10, 0] param/loadparm.c:lp_do_parameter(7174) Ignoring unknown parameter realm [2009/04/14 11:17:10, 2] lib/interface.c:add_interface(340) added interface ce1 ip=129.59.95.89 bcast=129.59.95.255 netmask=255.255.255.0 ADS support not compiled in [2009/04/14 11:17:10, 2] utils/net.c:main(769) return code = -1 I'm not sure where to check now. Please advise. Thank you! Jamen McGranahan Systems Services Librarian Vanderbilt University -Original Message- From: jerry [mailto:je...@samba.org] Sent: Tuesday, April 14, 2009 9:40 AM To: McGranahan, Jamen Cc: samba@lists.samba.org Subject: Re: [Samba] set up for Active Directory -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 McGranahan, Jamen wrote: configure:59580: checking for ldap_initialize configure:59663: result: no configure:59676: error: Active Directory support requires ldap_initialize Did the howto that was previously posted not help? My advice is to get the latest OpenLDAP and MIT krb5 libs and install those. Then rebuild Samba. Life is to short to spend it trying to get code compiling :-) But it's your call. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFJ5KAqIR7qMdg1EfYRAmrDAJ93XxnV/TdvFlV2cjMRryPes/r3jwCfW8pH qKFCqgc0v8mgtOmAyOxTXnc= =TdQv -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Samba 3.2.10: WinXP SP2 trouble
Hi, Yesterday I upgraded our PDC and BDC from Samba 3.2.8 to 3.2.10 (OpenSUSE 11.0). Now all WinXP SP3 clients are still working fine, but those (fortunately few) clients with only SP2 or SP1 cannot correctly login anymore. After login, a lsass.exe error shows up, and Windows starts shutting down (60 seconds left) If one stops the shutdown, all file access to the PDC works nicely, but the system control panel shows the domain name as *unknown*, and a message pops up telling that the RPC server is not available. If I do a local login instead of a domain login, no problem occurs, and I even can map a network drive in explorer with no bad consequences. What could be wrong? Thanks for hints Peter -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] CIFS hang
I have a Proliant running Red Hat with the 2.6.9-5.ELsmp kernel. We have a Windows 2000 Server who's secondary disc drive is mounted on the Linux box via CIFS using the following command: /sbin/mount.cifs //w2000/docs /var/www/documents -o dir_mode=0777,file_mode=0444,gid=100,uid=501,username=winuser,password=winpass From time to time, for whatever reason, the Windows 2000 Server requires rebooting and if they reboot it without first allowing us to umount the cifs, all requests to the cfis directory will hang. Requests, cd commands, df commands ... all hang ... for as long as three HOURS and they cannot be killed (kill -1, -15, -9) and the smb cannot be restarted. Presumably this is all a result of the calls being hung within the kernel. It has been suggested that we upgrade the kernel to 2.6.9-78.0.13. I'm not generally opposed to upgrades, but I'm hesitant to upgrade to the latest version as a substitute for understanding the root of any problem and engineering a proper fix. Maybe it's the years of Microsoft software, but I believe that upgrading to the latest version has become tech support slang for we have NO IDEA what your problem is, so maybe the latest version will fix it by accident -- but for very sure you'll be so deep in the woods with NEW problems that you'll likely forget about this one entirely. Would anyone have any first hand knowledge of this problem and experience that a later kernel is a solution? Regards Darrel -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] CIFS hang
It has been suggested that we upgrade the kernel to 2.6.9-78.0.13. I'm not generally opposed to upgrades, but I'm hesitant to upgrade to the latest version Do you realize the 2.6.9 kernel is 5 years old? The current kernel.org version is 2.6.29 and development has begun on 2.6.30. John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
RE: [Samba] CIFS hang
Hi Darrel. The first thing I would suggest is to do a modinfo cifs and see which version you're using. (It should be on the second row). I had a similar problem a few months ago-I have a script which mounts a CIFS share every few minutes, then does an rsync to a distant end Linux server. I was using version 1.50RH, if I'm not mistaken. I actually had to reboot my Linux server every time I had the problem. I solved it (with the help of Steve French) by upgrading my kernel. A newer CIFS module might solve your issue; Steve told me that 1.56 is more robust. I'm not sure about 1.54 and 1.55, but they may be better also. -Original Message- From: samba-bounces+william.m.dorrian=usace.army@lists.samba.org [mailto:samba-bounces+william.m.dorrian=usace.army@lists.samba.org] On Behalf Of Darrel Barton Sent: Tuesday, April 14, 2009 1:45 PM To: samba@lists.samba.org Subject: [Samba] CIFS hang I have a Proliant running Red Hat with the 2.6.9-5.ELsmp kernel. We have a Windows 2000 Server who's secondary disc drive is mounted on the Linux box via CIFS using the following command: /sbin/mount.cifs //w2000/docs /var/www/documents -o dir_mode=0777,file_mode=0444,gid=100,uid=501,username=winuser,password=winpas s From time to time, for whatever reason, the Windows 2000 Server requires rebooting and if they reboot it without first allowing us to umount the cifs, all requests to the cfis directory will hang. Requests, cd commands, df commands ... all hang ... for as long as three HOURS and they cannot be killed (kill -1, -15, -9) and the smb cannot be restarted. Presumably this is all a result of the calls being hung within the kernel. It has been suggested that we upgrade the kernel to 2.6.9-78.0.13. I'm not generally opposed to upgrades, but I'm hesitant to upgrade to the latest version as a substitute for understanding the root of any problem and engineering a proper fix. Maybe it's the years of Microsoft software, but I believe that upgrading to the latest version has become tech support slang for we have NO IDEA what your problem is, so maybe the latest version will fix it by accident -- but for very sure you'll be so deep in the woods with NEW problems that you'll likely forget about this one entirely. Would anyone have any first hand knowledge of this problem and experience that a later kernel is a solution? Regards Darrel -- 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] CIFS hang
Are you saying that the new kernel will solve this problem? I was trying to make the point not to be scared of this update. The only/main reason for RedHat releasing new kernel revisions for 5 year old kernel versions is for bug fixes and generally not to add new features that have a chance to destabilize the kernel. John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] CIFS hang
On Tue, Apr 14, 2009 at 12:41 PM, Dorrian, William M william.m.dorr...@usace.army.mil wrote: Hi Darrel. The first thing I would suggest is to do a modinfo cifs and see which version you're using. (It should be on the second row). I had a similar problem a few months ago-I have a script which mounts a CIFS share every few minutes, then does an rsync to a distant end Linux server. I was using version 1.50RH, if I'm not mistaken. I actually had to reboot my Linux server every time I had the problem. I solved it (with the help of Steve French) by upgrading my kernel. A newer CIFS module might solve your issue; Steve told me that 1.56 is more robust. I'm not sure about 1.54 and 1.55, but they may be better also. -Original Message- From: samba-bounces+william.m.dorrian=usace.army@lists.samba.org [mailto:samba-bounces+william.m.dorrian=usace.army@lists.samba.org] On Behalf Of Darrel Barton Sent: Tuesday, April 14, 2009 1:45 PM To: samba@lists.samba.org Subject: [Samba] CIFS hang I have a Proliant running Red Hat with the 2.6.9-5.ELsmp kernel. We have a Windows 2000 Server who's secondary disc drive is mounted on the Linux box via CIFS using the following command: /sbin/mount.cifs //w2000/docs /var/www/documents -o dir_mode=0777,file_mode=0444,gid=100,uid=501,username=winuser,password=winpas s From time to time, for whatever reason, the Windows 2000 Server requires rebooting and if they reboot it without first allowing us to umount the cifs, all requests to the cfis directory will hang. Requests, cd commands, df commands ... all hang ... for as long as three HOURS and they cannot be killed (kill -1, -15, -9) and the smb cannot be restarted. Presumably this is all a result of the calls being hung within the kernel. It has been suggested that we upgrade the kernel to 2.6.9-78.0.13. I'm not generally opposed to upgrades, but I'm hesitant to upgrade to the latest version as a substitute for understanding the root of any problem and engineering a proper fix. Maybe it's the years of Microsoft software, but I believe that upgrading to the latest version has become tech support slang for we have NO IDEA what your problem is, so maybe the latest version will fix it by accident -- but for very sure you'll be so deep in the woods with NEW problems that you'll likely forget about this one entirely. Would anyone have any first hand knowledge of this problem and experience that a later kernel is a solution? Regards Darrel -- 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 I think 1.56 is more robust because the sockets within cifs are now blocking instead of non-blockig which solved lot of data integrity issues due to lost responses etc.. But as soon as you notice hang, you can start a tcpdump on the cifs client box and issue a command like ls or cd (which hangs) and stop tcpdump after a while (2/3 minutes) and post tcpdump output file to look at. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] set up for Active Directory
hi, 2009/4/14 McGranahan, Jamen jamen.mcgrana...@vanderbilt.edu: OK, I've installed the MIT version of KRB5 samba appears to have installed correctly. However, it appears that I am not able to join my domain. # ./net ads join -U mcgr...@ds.vanderbilt.edu [2009/04/14 11:36:50, 0] param/loadparm.c:lp_set_enum_parm(7097) WARNING: Ignoring invalid value 'ADS' for parameter 'security' [2009/04/14 11:36:50, 0] param/loadparm.c:lp_do_parameter(7174) Ignoring unknown parameter realm ADS support not compiled in So I tried the -d3 version of ./net and got this: # ./net ads -d3 join -U mcgr...@vanderbilt.edu [2009/04/14 11:17:10, 3] param/loadparm.c:lp_load_ex(8794) lp_load_ex: refreshing parameters [2009/04/14 11:17:10, 3] param/loadparm.c:init_globals(4629) Initialising global parameters [2009/04/14 11:17:10, 3] param/params.c:pm_process(569) params.c:pm_process() - Processing configuration file /usr/local/samba/lib/smb.conf [2009/04/14 11:17:10, 3] param/loadparm.c:do_section(7457) Processing section [global] [2009/04/14 11:17:10, 0] param/loadparm.c:lp_set_enum_parm(7097) WARNING: Ignoring invalid value 'ADS' for parameter 'security' [2009/04/14 11:17:10, 1] param/loadparm.c:map_parameter(6131) Unknown parameter encountered: realm [2009/04/14 11:17:10, 0] param/loadparm.c:lp_do_parameter(7174) Ignoring unknown parameter realm [2009/04/14 11:17:10, 2] lib/interface.c:add_interface(340) added interface ce1 ip=129.59.95.89 bcast=129.59.95.255 netmask=255.255.255.0 ADS support not compiled in [2009/04/14 11:17:10, 2] utils/net.c:main(769) return code = -1 I'm not sure where to check now. Please advise. Thank you! Jamen McGranahan Systems Services Librarian Vanderbilt University -Original Message- From: jerry [mailto:je...@samba.org] Sent: Tuesday, April 14, 2009 9:40 AM To: McGranahan, Jamen Cc: samba@lists.samba.org Subject: Re: [Samba] set up for Active Directory -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 McGranahan, Jamen wrote: configure:59580: checking for ldap_initialize configure:59663: result: no configure:59676: error: Active Directory support requires ldap_initialize Did the howto that was previously posted not help? My advice is to get the latest OpenLDAP and MIT krb5 libs and install those. Then rebuild Samba. Life is to short to spend it trying to get code compiling :-) But it's your call. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFJ5KAqIR7qMdg1EfYRAmrDAJ93XxnV/TdvFlV2cjMRryPes/r3jwCfW8pH qKFCqgc0v8mgtOmAyOxTXnc= =TdQv -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/domain-member.html tell us: ADS support not compiled in Samba must be reconfigured (remove config.cache) and recompiled (make clean all install) after the Kerberos libraries and headers files are installed. -- To boldly go where no man has gone before ... I'll wait there with touristinformation -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] set up for Active Directory
Solaris 10 U6 comes with a samba that is capable to joining AD out of the box. Bjoern Meier wrote: hi, 2009/4/14 McGranahan, Jamen jamen.mcgrana...@vanderbilt.edu: OK, I've installed the MIT version of KRB5 samba appears to have installed correctly. However, it appears that I am not able to join my domain. # ./net ads join -U mcgr...@ds.vanderbilt.edu [2009/04/14 11:36:50, 0] param/loadparm.c:lp_set_enum_parm(7097) WARNING: Ignoring invalid value 'ADS' for parameter 'security' [2009/04/14 11:36:50, 0] param/loadparm.c:lp_do_parameter(7174) Ignoring unknown parameter realm ADS support not compiled in So I tried the -d3 version of ./net and got this: # ./net ads -d3 join -U mcgr...@vanderbilt.edu [2009/04/14 11:17:10, 3] param/loadparm.c:lp_load_ex(8794) lp_load_ex: refreshing parameters [2009/04/14 11:17:10, 3] param/loadparm.c:init_globals(4629) Initialising global parameters [2009/04/14 11:17:10, 3] param/params.c:pm_process(569) params.c:pm_process() - Processing configuration file /usr/local/samba/lib/smb.conf [2009/04/14 11:17:10, 3] param/loadparm.c:do_section(7457) Processing section [global] [2009/04/14 11:17:10, 0] param/loadparm.c:lp_set_enum_parm(7097) WARNING: Ignoring invalid value 'ADS' for parameter 'security' [2009/04/14 11:17:10, 1] param/loadparm.c:map_parameter(6131) Unknown parameter encountered: realm [2009/04/14 11:17:10, 0] param/loadparm.c:lp_do_parameter(7174) Ignoring unknown parameter realm [2009/04/14 11:17:10, 2] lib/interface.c:add_interface(340) added interface ce1 ip=129.59.95.89 bcast=129.59.95.255 netmask=255.255.255.0 ADS support not compiled in [2009/04/14 11:17:10, 2] utils/net.c:main(769) return code = -1 I'm not sure where to check now. Please advise. Thank you! Jamen McGranahan Systems Services Librarian Vanderbilt University -Original Message- From: jerry [mailto:je...@samba.org] Sent: Tuesday, April 14, 2009 9:40 AM To: McGranahan, Jamen Cc: samba@lists.samba.org Subject: Re: [Samba] set up for Active Directory McGranahan, Jamen wrote: configure:59580: checking for ldap_initialize configure:59663: result: no configure:59676: error: Active Directory support requires ldap_initialize Did the howto that was previously posted not help? My advice is to get the latest OpenLDAP and MIT krb5 libs and install those. Then rebuild Samba. Life is to short to spend it trying to get code compiling :-) But it's your call. cheers, jerry -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/domain-member.html tell us: ADS support not compiled in Samba must be reconfigured (remove config.cache) and recompiled (make clean all install) after the Kerberos libraries and headers files are installed. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] set up for Active Directory
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 McGranahan, Jamen wrote: OK, I've installed the MIT version of KRB5 samba appears to have installed correctly. However, it appears that I am not able to join my domain. If `smbd -b | WITH_ADS` returns nothing, then you don't have ADS support (as the long indicates). You're last email was about insufficient ldap_initialize support. SO did you install the OpenLDAP client libs? # ./net ads join -U mcgr...@ds.vanderbilt.edu [2009/04/14 11:36:50, 0] param/loadparm.c:lp_set_enum_parm(7097) WARNING: Ignoring invalid value 'ADS' for parameter 'security' [2009/04/14 11:36:50, 0] param/loadparm.c:lp_do_parameter(7174) Ignoring unknown parameter realm ADS support not compiled in cheers, jerry - -- = http://git.plainjoe.org/ CODE What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFJ5NKcIR7qMdg1EfYRAlLBAJ9YXh9Gw7z3SzosvYx25m6mNtVw3gCfXlPX B9ic6Qk7LsQEzWm8B++6KP4= =IIK5 -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] set up for Active Directory
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 David Markey wrote: Solaris 10 U6 comes with a samba that is capable to joining AD out of the box. Woot! didn't realize that. Very good news :-) What version is it (out of curiousity). cheers, jerry - -- = http://git.plainjoe.org/ CODE What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFJ5NQCIR7qMdg1EfYRAgnZAJ9sXm1P62VCZcb2bEXC3uPXoT/jJACggntg OZ+4s66c3R0B4KPjVMlJ1ho= =f9nU -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] set up for Active Directory
-bash-3.00# /usr/sfw/sbin/smbd -V Version 3.0.33 Not the most the up to date release bit its progress. jerry wrote: David Markey wrote: Solaris 10 U6 comes with a samba that is capable to joining AD out of the box. Woot! didn't realize that. Very good news :-) What version is it (out of curiousity). cheers, jerry -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] where is the machine name used?
Hi All, Just a bit of PDC confusion on my part. 1) I do not give machine names a password. Am I correct? 2) I am presuming that machine names are used to limit what machine user names can have access to to the samba server. If Foo has an smb username and computer A has a machine name, but computer B does not, then Foo can enter only through computer A. Am I correct? 3) If I am correct on #2 above, the machines that do not have a samba user can get around this by entering as a workgroup. Am I correct? 4) When joining a domain, the user name and password requested is the root's or whatever alias that smbusers points to and not the machine's name. Am I correct? Many thanks, -T -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] where is the machine name used?
MargoAndTodd wrote: Hi All, Just a bit of PDC confusion on my part. 1) I do not give machine names a password. Am I correct? yes. 2) I am presuming that machine names are used to limit what machine user names can have access to to the samba server. If Foo has an smb username and computer A has a machine name, but computer B does not, then Foo can enter only through computer A. Am I correct? No, The machines are added to the samba server so a SID can be generated for it (for identification). 3) If I am correct on #2 above, the machines that do not have a samba user can get around this by entering as a workgroup. Am I correct? 4) When joining a domain, the user name and password requested is the root's or whatever alias that smbusers points to and not the machine's name. Am I correct? It has to be a user on the box with a uid of 0 (as far as I know) so root would be the user. HTH cya Andrew Many thanks, -T -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] where is the machine name used?
Am Tuesday 14 April 2009 23:42:58 schrieb MargoAndTodd: Hi All, Just a bit of PDC confusion on my part. 1) I do not give machine names a password. Am I correct? Yes, the machine password is machine-generated at the time a machine is joined to the domain. 2) I am presuming that machine names are used to limit what machine user names can have access to to the samba server. If Foo has an smb username and computer A has a machine name, but computer B does not, then Foo can enter only through computer A. Am I correct? No. Or depends upon setup. A machine account is established when joining the machine to the domain. It involves a trust relationship, which means only domain member clients do not need local user accounts. With a local user account matching the domain account details, Foo may enter through B as well (the user trust still established). But then, Bar who has a domain account and can logon on A and C, may still not do so on B unless he posesses permissions to create a local user account. Once Foo or Bar change password on a domain member computer, it is changed on all other domain members as well - but not on Computer B ... 3) If I am correct on #2 above, the machines that do not have a samba user can get around this by entering as a workgroup. Am I correct? Not even necessary, but helpful for browsing. 4) When joining a domain, the user name and password requested is the root's or whatever alias that smbusers points to and not the machine's name. Am I correct? Mostly. Not smbusers, but groupmap will define members of the domain admins group (which then are able to join machines to the domain). -- 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 v3-2-test updated - release-3-2-0pre2-3550-g6d30895
The branch, v3-2-test has been updated via 6d308951c5b0fec988685f64f040f0770b537efb (commit) from 8203f5f3890afec3ec631f822b0f2e5ddd262b9a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 6d308951c5b0fec988685f64f040f0770b537efb Author: Michael Adam ob...@samba.org Date: Mon Sep 8 15:51:57 2008 +0200 packaging(RHEL): add cifs.upcall binary and manpage to client package Michael (cherry picked from commit f1b80bcb58b8aa5c586835dc201ce674b3417835) (cherry picked from commit b4c58d49902d62f25aa0c9289d1857aa2636c028) --- Summary of changes: packaging/RHEL/samba.spec.tmpl |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl index e0e772c..071fe87 100644 --- a/packaging/RHEL/samba.spec.tmpl +++ b/packaging/RHEL/samba.spec.tmpl @@ -404,6 +404,7 @@ fi %defattr(-,root,root) /sbin/mount.cifs /sbin/umount.cifs +%{_sbindir}/cifs.upcall %{_bindir}/rpcclient %{_bindir}/smbcacls @@ -420,6 +421,7 @@ fi %{_mandir}/man8/mount.cifs.8.* %{_mandir}/man8/umount.cifs.8.* +%{_mandir}/man8/cifs.upcall.8.* %{_mandir}/man8/smbspool.8* %{_mandir}/man1/smbget.1* %{_mandir}/man5/smbgetrc.5* -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1038-ga2ef1fe
The branch, master has been updated via a2ef1fee69771f58c27604ef213405031f42ff96 (commit) via fa302020ee39bf39bf324983cf8e381232691e76 (commit) via e3ceb0c65333cb870463971021e3af24d82abf26 (commit) via 4a2dfbf3c94c8fc4c2cbcbea3b138c5a9674f951 (commit) from 786447dea021f97a44582009bf33e28d972dacb4 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a2ef1fee69771f58c27604ef213405031f42ff96 Author: Günther Deschner g...@samba.org Date: Tue Apr 14 12:10:22 2009 +0200 s4-smbtorture: make sure samba3 does not regress in EnumServicesStatusW call. Guenther commit fa302020ee39bf39bf324983cf8e381232691e76 Author: Günther Deschner g...@samba.org Date: Tue Apr 14 12:08:55 2009 +0200 s3-svcctl: fix memcpy in _svcctl_EnumServicesStatusW(). Make sure we are not copying more than what we have as valid data. Fix from Jeremy. Thanks a lot for watching this so closely! Guenther commit e3ceb0c65333cb870463971021e3af24d82abf26 Author: Günther Deschner g...@samba.org Date: Tue Apr 14 12:00:39 2009 +0200 s3-spoolss: remove unused dup_nt_devicemode(). Guenther commit 4a2dfbf3c94c8fc4c2cbcbea3b138c5a9674f951 Author: Günther Deschner g...@samba.org Date: Tue Apr 14 01:08:23 2009 +0200 s4-smbtorture: print SPOOLSS_JOB_CONTROL flags in RPC-SPOOLSS test. Guenther --- Summary of changes: source3/include/proto.h|1 - source3/printing/nt_printing.c | 28 source3/rpc_server/srv_svcctl_nt.c |3 +-- source4/torture/rpc/spoolss.c | 33 - source4/torture/rpc/svcctl.c |3 +++ 5 files changed, 36 insertions(+), 32 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index b8ba8c0..25e81fd 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4843,7 +4843,6 @@ WERROR move_driver_to_download_area(struct pipes_struct *p, int pack_devicemode(NT_DEVICEMODE *nt_devmode, uint8 *buf, int buflen); uint32 del_a_printer(const char *sharename); NT_DEVICEMODE *construct_nt_devicemode(const fstring default_devicename); -NT_DEVICEMODE *dup_nt_devicemode(NT_DEVICEMODE *nt_devicemode); void free_nt_devicemode(NT_DEVICEMODE **devmode_ptr); int unpack_devicemode(NT_DEVICEMODE **nt_devmode, const uint8 *buf, int buflen); int add_new_printer_key( NT_PRINTER_DATA *data, const char *name ); diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index c20171b..f3b938e 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -2732,34 +2732,6 @@ NT_DEVICEMODE *construct_nt_devicemode(const fstring default_devicename) } / - Deepcopy an NT devicemode. -/ - -NT_DEVICEMODE *dup_nt_devicemode(NT_DEVICEMODE *nt_devicemode) -{ - NT_DEVICEMODE *new_nt_devicemode = NULL; - - if ( !nt_devicemode ) - return NULL; - - if ((new_nt_devicemode = (NT_DEVICEMODE *)memdup(nt_devicemode, sizeof(NT_DEVICEMODE))) == NULL) { - DEBUG(0,(dup_nt_devicemode: malloc fail.\n)); - return NULL; - } - - new_nt_devicemode-nt_dev_private = NULL; - if (nt_devicemode-nt_dev_private != NULL) { - if ((new_nt_devicemode-nt_dev_private = (uint8 *)memdup(nt_devicemode-nt_dev_private, nt_devicemode-driverextra)) == NULL) { - SAFE_FREE(new_nt_devicemode); - DEBUG(0,(dup_nt_devicemode: malloc fail.\n)); - return NULL; -} - } - - return new_nt_devicemode; -} - -/ Clean up and deallocate a (maybe partially) allocated NT_DEVICEMODE. / diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c index 0b0ef83..d73f73f 100644 --- a/source3/rpc_server/srv_svcctl_nt.c +++ b/source3/rpc_server/srv_svcctl_nt.c @@ -464,9 +464,8 @@ WERROR _svcctl_EnumServicesStatusW(pipes_struct *p, if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { return ntstatus_to_werror(ndr_map_error2ntstatus(ndr_err)); } - blob = ndr_push_blob(ndr); - memcpy(r-out.service, blob.data, r-in.offered); + memcpy(r-out.service, blob.data, MIN(blob.length, r-in.offered)); } *r-out.needed = (buffer_size r-in.offered) ? buffer_size : r-in.offered; diff --git a/source4/torture/rpc/spoolss.c
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-748-g3368cd3
The branch, v3-4-test has been updated via 3368cd38f710b9d21a3382bfd8971f0f6517eec1 (commit) via 5fc2656e600791667835775c94a86f788abbcc1a (commit) via 0f48d27d6fb45bc61899916037a5133e3022ec59 (commit) via f78af6c1f1bab5299ef286ada2477e849cf5ba97 (commit) from d99b3025eb54030e90d0c32b2967490d41a1e02a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 3368cd38f710b9d21a3382bfd8971f0f6517eec1 Author: Günther Deschner g...@samba.org Date: Tue Apr 14 12:10:22 2009 +0200 s4-smbtorture: make sure samba3 does not regress in EnumServicesStatusW call. Guenther (cherry picked from commit a2ef1fee69771f58c27604ef213405031f42ff96) commit 5fc2656e600791667835775c94a86f788abbcc1a Author: Günther Deschner g...@samba.org Date: Tue Apr 14 12:08:55 2009 +0200 s3-svcctl: fix memcpy in _svcctl_EnumServicesStatusW(). Make sure we are not copying more than what we have as valid data. Fix from Jeremy. Thanks a lot for watching this so closely! Guenther (cherry picked from commit fa302020ee39bf39bf324983cf8e381232691e76) commit 0f48d27d6fb45bc61899916037a5133e3022ec59 Author: Günther Deschner g...@samba.org Date: Tue Apr 14 12:00:39 2009 +0200 s3-spoolss: remove unused dup_nt_devicemode(). Guenther (cherry picked from commit e3ceb0c65333cb870463971021e3af24d82abf26) commit f78af6c1f1bab5299ef286ada2477e849cf5ba97 Author: Günther Deschner g...@samba.org Date: Tue Apr 14 01:08:23 2009 +0200 s4-smbtorture: print SPOOLSS_JOB_CONTROL flags in RPC-SPOOLSS test. Guenther (cherry picked from commit 4a2dfbf3c94c8fc4c2cbcbea3b138c5a9674f951) --- Summary of changes: source3/include/proto.h|1 - source3/printing/nt_printing.c | 28 source3/rpc_server/srv_svcctl_nt.c |3 +-- source4/torture/rpc/spoolss.c | 33 - source4/torture/rpc/svcctl.c |3 +++ 5 files changed, 36 insertions(+), 32 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index d13ac21..5d665c6 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4805,7 +4805,6 @@ WERROR move_driver_to_download_area(struct pipes_struct *p, int pack_devicemode(NT_DEVICEMODE *nt_devmode, uint8 *buf, int buflen); uint32 del_a_printer(const char *sharename); NT_DEVICEMODE *construct_nt_devicemode(const fstring default_devicename); -NT_DEVICEMODE *dup_nt_devicemode(NT_DEVICEMODE *nt_devicemode); void free_nt_devicemode(NT_DEVICEMODE **devmode_ptr); int unpack_devicemode(NT_DEVICEMODE **nt_devmode, const uint8 *buf, int buflen); int add_new_printer_key( NT_PRINTER_DATA *data, const char *name ); diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index c20171b..f3b938e 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -2732,34 +2732,6 @@ NT_DEVICEMODE *construct_nt_devicemode(const fstring default_devicename) } / - Deepcopy an NT devicemode. -/ - -NT_DEVICEMODE *dup_nt_devicemode(NT_DEVICEMODE *nt_devicemode) -{ - NT_DEVICEMODE *new_nt_devicemode = NULL; - - if ( !nt_devicemode ) - return NULL; - - if ((new_nt_devicemode = (NT_DEVICEMODE *)memdup(nt_devicemode, sizeof(NT_DEVICEMODE))) == NULL) { - DEBUG(0,(dup_nt_devicemode: malloc fail.\n)); - return NULL; - } - - new_nt_devicemode-nt_dev_private = NULL; - if (nt_devicemode-nt_dev_private != NULL) { - if ((new_nt_devicemode-nt_dev_private = (uint8 *)memdup(nt_devicemode-nt_dev_private, nt_devicemode-driverextra)) == NULL) { - SAFE_FREE(new_nt_devicemode); - DEBUG(0,(dup_nt_devicemode: malloc fail.\n)); - return NULL; -} - } - - return new_nt_devicemode; -} - -/ Clean up and deallocate a (maybe partially) allocated NT_DEVICEMODE. / diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c index 0b0ef83..d73f73f 100644 --- a/source3/rpc_server/srv_svcctl_nt.c +++ b/source3/rpc_server/srv_svcctl_nt.c @@ -464,9 +464,8 @@ WERROR _svcctl_EnumServicesStatusW(pipes_struct *p, if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { return ntstatus_to_werror(ndr_map_error2ntstatus(ndr_err)); } - blob = ndr_push_blob(ndr); -
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1039-g74707e8
The branch, master has been updated via 74707e8e8e1be2cbaa71fb0442957be2e663cbde (commit) from a2ef1fee69771f58c27604ef213405031f42ff96 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 74707e8e8e1be2cbaa71fb0442957be2e663cbde Author: Stefan Metzmacher me...@samba.org Date: Tue Apr 14 12:45:48 2009 +0200 socket_wrapper: fix the build on systems without ipv6 support metze --- Summary of changes: lib/socket_wrapper/socket_wrapper.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c index d3853de..d809d8a 100644 --- a/lib/socket_wrapper/socket_wrapper.c +++ b/lib/socket_wrapper/socket_wrapper.c @@ -1102,8 +1102,10 @@ static uint8_t *swrap_marshall_packet(struct socket_info *si, switch (si-family) { case AF_INET: break; +#ifdef HAVE_IPV6 case AF_INET6: break; +#endif default: return NULL; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-749-gb5faa34
The branch, v3-4-test has been updated via b5faa34596eed3ada7f45db991ef0beb0391ce82 (commit) from 3368cd38f710b9d21a3382bfd8971f0f6517eec1 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit b5faa34596eed3ada7f45db991ef0beb0391ce82 Author: Stefan Metzmacher me...@samba.org Date: Tue Apr 14 12:45:48 2009 +0200 socket_wrapper: fix the build on systems without ipv6 support metze (cherry picked from commit 74707e8e8e1be2cbaa71fb0442957be2e663cbde) --- Summary of changes: lib/socket_wrapper/socket_wrapper.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c index 193e7a1..cdfdcee 100644 --- a/lib/socket_wrapper/socket_wrapper.c +++ b/lib/socket_wrapper/socket_wrapper.c @@ -1101,8 +1101,10 @@ static uint8_t *swrap_marshall_packet(struct socket_info *si, switch (si-family) { case AF_INET: break; +#ifdef HAVE_IPV6 case AF_INET6: break; +#endif default: return NULL; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1040-g1b9384a
The branch, master has been updated via 1b9384a11f2957bcfbe9f23e023c79535d4a7bc9 (commit) from 74707e8e8e1be2cbaa71fb0442957be2e663cbde (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 1b9384a11f2957bcfbe9f23e023c79535d4a7bc9 Author: Günther Deschner g...@samba.org Date: Tue Apr 14 14:55:24 2009 +0200 s3-nsswitch: fix make test_wbpad. Guenther --- Summary of changes: source3/script/tests/wb_pad.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/script/tests/wb_pad.sh b/source3/script/tests/wb_pad.sh index f1f5ca2..10cedc8 100755 --- a/source3/script/tests/wb_pad.sh +++ b/source3/script/tests/wb_pad.sh @@ -46,7 +46,7 @@ cleanup() { rmdir $tempdir } -cflags=-I. -I./../lib/replace -Iinclude +cflags=-I. -I../ -I./../lib/replace -Iinclude ${CC:-gcc} -m32 $RPM_OPT_FLAGS $CFLAGS -o $tempdir/wb_pad_32 $cflags $tempdir/wb_pad.c if [ $? -ne 0 ]; then cleanup -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-750-ge7c9c2f
The branch, v3-4-test has been updated via e7c9c2f279eaa424ba7cfecd0bfd827520640f5d (commit) from b5faa34596eed3ada7f45db991ef0beb0391ce82 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit e7c9c2f279eaa424ba7cfecd0bfd827520640f5d Author: Günther Deschner g...@samba.org Date: Tue Apr 14 14:55:24 2009 +0200 s3-nsswitch: fix make test_wbpad. Guenther (cherry picked from commit 1b9384a11f2957bcfbe9f23e023c79535d4a7bc9) --- Summary of changes: source3/script/tests/wb_pad.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/script/tests/wb_pad.sh b/source3/script/tests/wb_pad.sh index f1f5ca2..10cedc8 100755 --- a/source3/script/tests/wb_pad.sh +++ b/source3/script/tests/wb_pad.sh @@ -46,7 +46,7 @@ cleanup() { rmdir $tempdir } -cflags=-I. -I./../lib/replace -Iinclude +cflags=-I. -I../ -I./../lib/replace -Iinclude ${CC:-gcc} -m32 $RPM_OPT_FLAGS $CFLAGS -o $tempdir/wb_pad_32 $cflags $tempdir/wb_pad.c if [ $? -ne 0 ]; then cleanup -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-751-gf2b3fbf
The branch, v3-4-test has been updated via f2b3fbf0c04a6f9484853da263174a472eb6bb6d (commit) from e7c9c2f279eaa424ba7cfecd0bfd827520640f5d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit f2b3fbf0c04a6f9484853da263174a472eb6bb6d Author: Günther Deschner g...@samba.org Date: Tue Apr 14 16:27:05 2009 +0200 libwbclient: Fix undocumented arguments doxygen warnings. Guenther --- Summary of changes: nsswitch/libwbclient/wbclient.h | 16 1 files changed, 8 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/nsswitch/libwbclient/wbclient.h b/nsswitch/libwbclient/wbclient.h index 9d29951..d3c1b63 100644 --- a/nsswitch/libwbclient/wbclient.h +++ b/nsswitch/libwbclient/wbclient.h @@ -495,7 +495,7 @@ struct wbcDomainControllerInfoEx { /** * @brief Free library allocated memory * - * @param *p Pointer to free + * @param * Pointer to free * * @return void **/ @@ -520,7 +520,7 @@ wbcErr wbcSidToString(const struct wbcDomainSid *sid, /** * @brief Convert a character string to a binary SID * - * @param *str Character string in the form of S-... + * @param *sid_string Character string in the form of S-... * @param sid Resulting binary SID * * @return #wbcErr @@ -546,7 +546,7 @@ wbcErr wbcGuidToString(const struct wbcGuid *guid, /** * @brief Convert a character string to a binary GUID * - * @param *str Character string + * @param *guid_string Character string * @param guid Resulting binary GUID * * @return #wbcErr @@ -572,7 +572,7 @@ wbcErr wbcInterfaceDetails(struct wbcInterfaceDetails **details); /** * @brief Convert a domain and name to SID * - * @param domain Domain name (possibly ) + * @param dom_nameDomain name (possibly ) * @param nameUser or group name * @param *sidPointer to the resolved domain SID * @param *name_type Pointer to the SID type @@ -588,9 +588,9 @@ wbcErr wbcLookupName(const char *dom_name, * @brief Convert a SID to a domain and name * * @param *sidPointer to the domain SID to be resolved - * @param pdomain Resolved Domain name (possibly ) - * @param pname Resolved User or group name - * @param *pname_type Pointer to the resolved SID type + * @param domain Resolved Domain name (possibly ) + * @param name Resolved User or group name + * @param *name_type Pointer to the resolved SID type * * @return #wbcErr **/ @@ -959,7 +959,7 @@ wbcErr wbcGetGroups(const char *account, * @brief Lookup the current status of a trusted domain * * @param domain Domain to query - * @param *dinfo Pointer to returned domain_info struct + * @param *info Pointer to returned domain_info struct * * @return #wbcErr **/ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1041-g48f1494
The branch, master has been updated via 48f14949b1b9a377c2af489032de02a0fe4d118b (commit) from 1b9384a11f2957bcfbe9f23e023c79535d4a7bc9 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 48f14949b1b9a377c2af489032de02a0fe4d118b Author: Günther Deschner g...@samba.org Date: Tue Apr 14 16:27:05 2009 +0200 libwbclient: Fix undocumented arguments doxygen warnings. Guenther (cherry picked from commit f2b3fbf0c04a6f9484853da263174a472eb6bb6d) --- Summary of changes: nsswitch/libwbclient/wbclient.h | 16 1 files changed, 8 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/nsswitch/libwbclient/wbclient.h b/nsswitch/libwbclient/wbclient.h index 9d29951..d3c1b63 100644 --- a/nsswitch/libwbclient/wbclient.h +++ b/nsswitch/libwbclient/wbclient.h @@ -495,7 +495,7 @@ struct wbcDomainControllerInfoEx { /** * @brief Free library allocated memory * - * @param *p Pointer to free + * @param * Pointer to free * * @return void **/ @@ -520,7 +520,7 @@ wbcErr wbcSidToString(const struct wbcDomainSid *sid, /** * @brief Convert a character string to a binary SID * - * @param *str Character string in the form of S-... + * @param *sid_string Character string in the form of S-... * @param sid Resulting binary SID * * @return #wbcErr @@ -546,7 +546,7 @@ wbcErr wbcGuidToString(const struct wbcGuid *guid, /** * @brief Convert a character string to a binary GUID * - * @param *str Character string + * @param *guid_string Character string * @param guid Resulting binary GUID * * @return #wbcErr @@ -572,7 +572,7 @@ wbcErr wbcInterfaceDetails(struct wbcInterfaceDetails **details); /** * @brief Convert a domain and name to SID * - * @param domain Domain name (possibly ) + * @param dom_nameDomain name (possibly ) * @param nameUser or group name * @param *sidPointer to the resolved domain SID * @param *name_type Pointer to the SID type @@ -588,9 +588,9 @@ wbcErr wbcLookupName(const char *dom_name, * @brief Convert a SID to a domain and name * * @param *sidPointer to the domain SID to be resolved - * @param pdomain Resolved Domain name (possibly ) - * @param pname Resolved User or group name - * @param *pname_type Pointer to the resolved SID type + * @param domain Resolved Domain name (possibly ) + * @param name Resolved User or group name + * @param *name_type Pointer to the resolved SID type * * @return #wbcErr **/ @@ -959,7 +959,7 @@ wbcErr wbcGetGroups(const char *account, * @brief Lookup the current status of a trusted domain * * @param domain Domain to query - * @param *dinfo Pointer to returned domain_info struct + * @param *info Pointer to returned domain_info struct * * @return #wbcErr **/ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1042-g27a3118
The branch, master has been updated via 27a3118bcf6105848e8200c15ebab910831f73c6 (commit) from 48f14949b1b9a377c2af489032de02a0fe4d118b (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 27a3118bcf6105848e8200c15ebab910831f73c6 Author: Jeremy Allison j...@samba.org Date: Tue Apr 14 12:23:22 2009 -0700 Make talloc_stack threadsafe using TLS. Volker please check. Passes make test and basic valgrind testing. Jeremy. --- Summary of changes: lib/util/config.mk |1 + lib/util/smb_threads.c | 19 +++- lib/util/smb_threads_internal.h |5 +- lib/util/talloc_stack.c | 93 ++ 4 files changed, 93 insertions(+), 25 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/config.mk b/lib/util/config.mk index 7835fed..1b620d1 100644 --- a/lib/util/config.mk +++ b/lib/util/config.mk @@ -27,6 +27,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \ become_daemon.o \ rbtree.o \ talloc_stack.o \ + smb_threads.o \ params.o) PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \ diff --git a/lib/util/smb_threads.c b/lib/util/smb_threads.c index 84dec4d..8e0e1cd 100644 --- a/lib/util/smb_threads.c +++ b/lib/util/smb_threads.c @@ -50,8 +50,19 @@ int smb_thread_set_functions(const struct smb_thread_functions *tf) global_tfp = tf; +#if defined(PARANOID_MALLOC_CHECKER) +#ifdef malloc +#undef malloc +#endif +#endif + /* Here we initialize any static locks we're using. */ - global_lock_array = (void **)SMB_MALLOC_ARRAY(void *, NUM_GLOBAL_LOCKS); + global_lock_array = (void **)malloc(sizeof(void *) *NUM_GLOBAL_LOCKS); + +#if defined(PARANOID_MALLOC_CHECKER) +#define malloc(s) __ERROR_DONT_USE_MALLOC_DIRECTLY +#endif + if (global_lock_array == NULL) { return ENOMEM; } @@ -62,9 +73,11 @@ int smb_thread_set_functions(const struct smb_thread_functions *tf) SAFE_FREE(global_lock_array); return ENOMEM; } - global_tfp-create_mutex(name, + if (global_tfp-create_mutex(name, global_lock_array[i], - __location__); + __location__)) { + smb_panic(smb_thread_set_functions: create mutexes failed); + } SAFE_FREE(name); } diff --git a/lib/util/smb_threads_internal.h b/lib/util/smb_threads_internal.h index 3208bc2..ad05aae 100644 --- a/lib/util/smb_threads_internal.h +++ b/lib/util/smb_threads_internal.h @@ -44,9 +44,10 @@ } while (0) #define SMB_THREAD_SET_TLS(key, val) \ - (global_tfp ? global_tfp-set_tls((key),(val),__location__) : 0) + (global_tfp ? global_tfp-set_tls((key),(val),__location__) : \ + ((key) = (val), 0)) #define SMB_THREAD_GET_TLS(key) \ - (global_tfp ? global_tfp-get_tls((key), __location__) : NULL) + (global_tfp ? global_tfp-get_tls((key), __location__) : (key)) #endif diff --git a/lib/util/talloc_stack.c b/lib/util/talloc_stack.c index 2f3ea11..a9b6e03 100644 --- a/lib/util/talloc_stack.c +++ b/lib/util/talloc_stack.c @@ -2,6 +2,7 @@ Unix SMB/CIFS implementation. Implement a stack of talloc contexts Copyright (C) Volker Lendecke 2007 + Copyright (C) Jeremy Allison 2009 - made thread safe. 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 @@ -38,22 +39,65 @@ #include includes.h -static int talloc_stacksize; -static int talloc_stack_arraysize; -static TALLOC_CTX **talloc_stack; +struct talloc_stackframe { + int talloc_stacksize; + int talloc_stack_arraysize; + TALLOC_CTX **talloc_stack; +}; + +/* + * In the single threaded case this is a pointer + * to the global talloc_stackframe. In the MT-case + * this is the pointer to the thread-specific key + * used to look up the per-thread talloc_stackframe + * pointer. + */ + +static void *global_ts; + +static struct talloc_stackframe *talloc_stackframe_init(void) +{ +#if defined(PARANOID_MALLOC_CHECKER) +#ifdef malloc +#undef malloc +#endif +#endif + struct talloc_stackframe *ts = + (struct talloc_stackframe *)malloc(sizeof(struct talloc_stackframe)); +#if defined(PARANOID_MALLOC_CHECKER) +#define malloc(s) __ERROR_DONT_USE_MALLOC_DIRECTLY +#endif + + if (!ts) { + smb_panic(talloc_stackframe_init malloc failed); + } + + ZERO_STRUCTP(ts); + + if (SMB_THREAD_CREATE_TLS(talloc_stackframe, global_ts)) { + smb_panic(talloc_stackframe_init
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1043-g0f1b402
The branch, master has been updated via 0f1b402848d987f691d6376a624373380e7e2ce6 (commit) from 27a3118bcf6105848e8200c15ebab910831f73c6 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0f1b402848d987f691d6376a624373380e7e2ce6 Author: Jeremy Allison j...@samba.org Date: Tue Apr 14 13:02:29 2009 -0700 Try and fix the S4 build - include thread includes. Jeremy. --- Summary of changes: source4/include/includes.h |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/include/includes.h b/source4/include/includes.h index d9b7759..4862a62 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -64,6 +64,10 @@ /* String routines */ #include ../lib/util/safe_string.h +/* Thread functions. */ +#include ../lib/util/smb_threads.h +#include ../lib/util/smb_threads_internal.h + #if 0 /* darn, we can't do this now that we don't link the ldb tools to all the smb libs */ #define TALLOC_ABORT(reason) smb_panic(reason) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1044-gca3de01
The branch, master has been updated via ca3de0103b545c86c8507dfc7d042f1838d5dfb2 (commit) from 0f1b402848d987f691d6376a624373380e7e2ce6 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ca3de0103b545c86c8507dfc7d042f1838d5dfb2 Author: Günther Deschner g...@samba.org Date: Tue Apr 14 22:39:36 2009 +0200 netdomjoin-gui: make sure to grey out change fields when not running as root. Guenther --- Summary of changes: .../examples/netdomjoin-gui/netdomjoin-gui.c | 15 +++ 1 files changed, 15 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c index 40a6e41..8164b74 100644 --- a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c +++ b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c @@ -78,6 +78,7 @@ typedef struct join_state { gboolean hostname_changed; uint32_t stored_num_ous; char *target_hostname; + uid_t uid; } join_state; static void debug(const char *format, ...) @@ -1440,6 +1441,10 @@ static int draw_main_window(struct join_state *state) /* Entry */ entry = gtk_entry_new(); gtk_entry_set_max_length(GTK_ENTRY(entry), 256); + + if (state-uid != 0) { + gtk_widget_set_sensitive(GTK_WIDGET(entry), FALSE); + } g_signal_connect(G_OBJECT(entry), changed, G_CALLBACK(callback_enter_computer_description_and_unlock), state); @@ -1526,6 +1531,9 @@ static int draw_main_window(struct join_state *state) G_CALLBACK(callback_do_change), (gpointer)state); gtk_box_pack_start(GTK_BOX(bbox), button, TRUE, TRUE, 0); + if (state-uid != 0) { + gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE); + } gtk_widget_show(button); /* Label (hidden) */ @@ -1533,6 +1541,11 @@ static int draw_main_window(struct join_state *state) gtk_label_set_line_wrap(GTK_LABEL(state-label_reboot), TRUE); gtk_misc_set_alignment(GTK_MISC(state-label_reboot), 0, 0); gtk_box_pack_start(GTK_BOX(vbox), state-label_reboot, TRUE, TRUE, 0); + if (state-uid != 0) { + gtk_label_set_text(GTK_LABEL(state-label_reboot), + You cannot change computer description as you're not running with root permissions); + } + gtk_widget_show(state-label_reboot); #if 0 @@ -1763,6 +1776,8 @@ static int initialize_join_state(struct join_state *state, return -1; } + state-uid = geteuid(); + state-ctx = ctx; return 0; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-752-gcb96e70
The branch, v3-4-test has been updated via cb96e70a1d9112d9e4fff1fda4cf64abc7985347 (commit) from f2b3fbf0c04a6f9484853da263174a472eb6bb6d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit cb96e70a1d9112d9e4fff1fda4cf64abc7985347 Author: Günther Deschner g...@samba.org Date: Tue Apr 14 22:39:36 2009 +0200 netdomjoin-gui: make sure to grey out change fields when not running as root. Guenther (cherry picked from commit ca3de0103b545c86c8507dfc7d042f1838d5dfb2) --- Summary of changes: .../examples/netdomjoin-gui/netdomjoin-gui.c | 15 +++ 1 files changed, 15 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c index 40a6e41..8164b74 100644 --- a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c +++ b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c @@ -78,6 +78,7 @@ typedef struct join_state { gboolean hostname_changed; uint32_t stored_num_ous; char *target_hostname; + uid_t uid; } join_state; static void debug(const char *format, ...) @@ -1440,6 +1441,10 @@ static int draw_main_window(struct join_state *state) /* Entry */ entry = gtk_entry_new(); gtk_entry_set_max_length(GTK_ENTRY(entry), 256); + + if (state-uid != 0) { + gtk_widget_set_sensitive(GTK_WIDGET(entry), FALSE); + } g_signal_connect(G_OBJECT(entry), changed, G_CALLBACK(callback_enter_computer_description_and_unlock), state); @@ -1526,6 +1531,9 @@ static int draw_main_window(struct join_state *state) G_CALLBACK(callback_do_change), (gpointer)state); gtk_box_pack_start(GTK_BOX(bbox), button, TRUE, TRUE, 0); + if (state-uid != 0) { + gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE); + } gtk_widget_show(button); /* Label (hidden) */ @@ -1533,6 +1541,11 @@ static int draw_main_window(struct join_state *state) gtk_label_set_line_wrap(GTK_LABEL(state-label_reboot), TRUE); gtk_misc_set_alignment(GTK_MISC(state-label_reboot), 0, 0); gtk_box_pack_start(GTK_BOX(vbox), state-label_reboot, TRUE, TRUE, 0); + if (state-uid != 0) { + gtk_label_set_text(GTK_LABEL(state-label_reboot), + You cannot change computer description as you're not running with root permissions); + } + gtk_widget_show(state-label_reboot); #if 0 @@ -1763,6 +1776,8 @@ static int initialize_join_state(struct join_state *state, return -1; } + state-uid = geteuid(); + state-ctx = ctx; return 0; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5210-g64c0c6c
The branch, v3-3-test has been updated via 64c0c6cfc6d44a9bb8ea13e56ed6c3d1eee3861e (commit) from f3ec61a77973781ca1f39c345d5e03a9ba9e43ae (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 64c0c6cfc6d44a9bb8ea13e56ed6c3d1eee3861e Author: Günther Deschner g...@samba.org Date: Tue Apr 14 22:39:36 2009 +0200 netdomjoin-gui: make sure to grey out change fields when not running as root. Guenther (cherry picked from commit ca3de0103b545c86c8507dfc7d042f1838d5dfb2) (cherry picked from commit cb96e70a1d9112d9e4fff1fda4cf64abc7985347) --- Summary of changes: .../examples/netdomjoin-gui/netdomjoin-gui.c | 15 +++ 1 files changed, 15 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c index 40a6e41..8164b74 100644 --- a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c +++ b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c @@ -78,6 +78,7 @@ typedef struct join_state { gboolean hostname_changed; uint32_t stored_num_ous; char *target_hostname; + uid_t uid; } join_state; static void debug(const char *format, ...) @@ -1440,6 +1441,10 @@ static int draw_main_window(struct join_state *state) /* Entry */ entry = gtk_entry_new(); gtk_entry_set_max_length(GTK_ENTRY(entry), 256); + + if (state-uid != 0) { + gtk_widget_set_sensitive(GTK_WIDGET(entry), FALSE); + } g_signal_connect(G_OBJECT(entry), changed, G_CALLBACK(callback_enter_computer_description_and_unlock), state); @@ -1526,6 +1531,9 @@ static int draw_main_window(struct join_state *state) G_CALLBACK(callback_do_change), (gpointer)state); gtk_box_pack_start(GTK_BOX(bbox), button, TRUE, TRUE, 0); + if (state-uid != 0) { + gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE); + } gtk_widget_show(button); /* Label (hidden) */ @@ -1533,6 +1541,11 @@ static int draw_main_window(struct join_state *state) gtk_label_set_line_wrap(GTK_LABEL(state-label_reboot), TRUE); gtk_misc_set_alignment(GTK_MISC(state-label_reboot), 0, 0); gtk_box_pack_start(GTK_BOX(vbox), state-label_reboot, TRUE, TRUE, 0); + if (state-uid != 0) { + gtk_label_set_text(GTK_LABEL(state-label_reboot), + You cannot change computer description as you're not running with root permissions); + } + gtk_widget_show(state-label_reboot); #if 0 @@ -1763,6 +1776,8 @@ static int initialize_join_state(struct join_state *state, return -1; } + state-uid = geteuid(); + state-ctx = ctx; return 0; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1045-g4721be4
The branch, master has been updated via 4721be488ceb8229d564e4b63ca9937603394e51 (commit) from ca3de0103b545c86c8507dfc7d042f1838d5dfb2 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 4721be488ceb8229d564e4b63ca9937603394e51 Author: Günther Deschner g...@samba.org Date: Tue Apr 14 23:19:25 2009 +0200 s3-spoolss: Fix format of description string in spoolss_PrinterInfo1. This is what windows does and should get us closer to show the appropriate printer location string in explorer. Guenther --- Summary of changes: source3/rpc_server/srv_spoolss_nt.c | 16 ++-- 1 files changed, 6 insertions(+), 10 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 effbb92..d114152 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -4128,25 +4128,21 @@ static WERROR construct_printer_info1(TALLOC_CTX *mem_ctx, struct spoolss_PrinterInfo1 *r, int snum) { - char *chaine = NULL; r-flags= flags; + r-description = talloc_asprintf(mem_ctx, %s,%s,%s, + ntprinter-info_2-printername, + ntprinter-info_2-drivername, + ntprinter-info_2-location); + W_ERROR_HAVE_NO_MEMORY(r-description); + if (*ntprinter-info_2-comment == '\0') { r-comment = talloc_strdup(mem_ctx, lp_comment(snum)); - chaine = talloc_asprintf(mem_ctx, - %s,%s,%s, ntprinter-info_2-printername, - ntprinter-info_2-drivername, lp_comment(snum)); } else { r-comment = talloc_strdup(mem_ctx, ntprinter-info_2-comment); /* saved comment */ - chaine = talloc_asprintf(mem_ctx, - %s,%s,%s, ntprinter-info_2-printername, - ntprinter-info_2-drivername, ntprinter-info_2-comment); } - W_ERROR_HAVE_NO_MEMORY(chaine); W_ERROR_HAVE_NO_MEMORY(r-comment); - r-description = talloc_strdup(mem_ctx, chaine); - W_ERROR_HAVE_NO_MEMORY(r-description); r-name = talloc_strdup(mem_ctx, ntprinter-info_2-printername); W_ERROR_HAVE_NO_MEMORY(r-name); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-753-g90643d5
The branch, v3-4-test has been updated via 90643d5d5457959cf18a4b99f6ecb1bb6fe0 (commit) from cb96e70a1d9112d9e4fff1fda4cf64abc7985347 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 90643d5d5457959cf18a4b99f6ecb1bb6fe0 Author: Günther Deschner g...@samba.org Date: Tue Apr 14 23:19:25 2009 +0200 s3-spoolss: Fix format of description string in spoolss_PrinterInfo1. This is what windows does and should get us closer to show the appropriate printer location string in explorer. Guenther (cherry picked from commit 4721be488ceb8229d564e4b63ca9937603394e51) --- Summary of changes: source3/rpc_server/srv_spoolss_nt.c | 16 ++-- 1 files changed, 6 insertions(+), 10 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 effbb92..d114152 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -4128,25 +4128,21 @@ static WERROR construct_printer_info1(TALLOC_CTX *mem_ctx, struct spoolss_PrinterInfo1 *r, int snum) { - char *chaine = NULL; r-flags= flags; + r-description = talloc_asprintf(mem_ctx, %s,%s,%s, + ntprinter-info_2-printername, + ntprinter-info_2-drivername, + ntprinter-info_2-location); + W_ERROR_HAVE_NO_MEMORY(r-description); + if (*ntprinter-info_2-comment == '\0') { r-comment = talloc_strdup(mem_ctx, lp_comment(snum)); - chaine = talloc_asprintf(mem_ctx, - %s,%s,%s, ntprinter-info_2-printername, - ntprinter-info_2-drivername, lp_comment(snum)); } else { r-comment = talloc_strdup(mem_ctx, ntprinter-info_2-comment); /* saved comment */ - chaine = talloc_asprintf(mem_ctx, - %s,%s,%s, ntprinter-info_2-printername, - ntprinter-info_2-drivername, ntprinter-info_2-comment); } - W_ERROR_HAVE_NO_MEMORY(chaine); W_ERROR_HAVE_NO_MEMORY(r-comment); - r-description = talloc_strdup(mem_ctx, chaine); - W_ERROR_HAVE_NO_MEMORY(r-description); r-name = talloc_strdup(mem_ctx, ntprinter-info_2-printername); W_ERROR_HAVE_NO_MEMORY(r-name); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1046-g8e06e94
The branch, master has been updated via 8e06e945b6b03db825862f2f057f0dfe13ade3a2 (commit) from 4721be488ceb8229d564e4b63ca9937603394e51 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8e06e945b6b03db825862f2f057f0dfe13ade3a2 Author: Jeremy Allison j...@samba.org Date: Tue Apr 14 15:19:39 2009 -0700 Ensure a tls key is only generated once - wrap create destroy in a mutex. Change the function names to add _once to the tls_create tls_destroy to make this obvious. Jeremy. --- Summary of changes: lib/util/smb_threads.c |9 +++- lib/util/smb_threads.h | 84 --- lib/util/smb_threads_internal.h | 16 ++-- lib/util/talloc_stack.c |2 +- 4 files changed, 71 insertions(+), 40 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/smb_threads.c b/lib/util/smb_threads.c index 8e0e1cd..fa2d8da 100644 --- a/lib/util/smb_threads.c +++ b/lib/util/smb_threads.c @@ -25,8 +25,6 @@ #include includes.h -#define NUM_GLOBAL_LOCKS 1 - /* Functions to vector the locking primitives used internally by libsmbclient. @@ -94,14 +92,18 @@ int smb_thread_set_functions(const struct smb_thread_functions *tf) SMB_THREADS_DEF_PTHREAD_IMPLEMENTATION(tf); +void *pkey = NULL; + /* Test function. */ int test_threads(void) { int ret; void *plock = NULL; - smb_thread_set_functions(tf); + if ((ret = SMB_THREAD_CREATE_TLS_ONCE(test_tls, pkey)) != 0) { + printf(Create tls once error: %d\n, ret); + } if ((ret = SMB_THREAD_CREATE_MUTEX(test, plock)) != 0) { printf(Create lock error: %d\n, ret); } @@ -112,6 +114,7 @@ int test_threads(void) printf(unlock error: %d\n, ret); } SMB_THREAD_DESTROY_MUTEX(plock); + SMB_THREAD_DESTROY_TLS_ONCE(pkey); return 0; } diff --git a/lib/util/smb_threads.h b/lib/util/smb_threads.h index 2ca163b..945e938 100644 --- a/lib/util/smb_threads.h +++ b/lib/util/smb_threads.h @@ -36,10 +36,10 @@ struct smb_thread_functions { const char *location); /* Thread local storage. */ - int (*create_tls)(const char *keyname, + int (*create_tls_once)(const char *keyname, void **ppkey, const char *location); - void (*destroy_tls)(void *pkey, + void (*destroy_tls_once)(void **pkey, const char *location); int (*set_tls)(void *pkey, const void *pval, const char *location); void *(*get_tls)(void *pkey, const char *location); @@ -53,49 +53,69 @@ extern const struct smb_thread_functions *global_tfp; \ static int smb_create_mutex_pthread(const char *lockname, void **pplock, const char *location) \ { \ -pthread_mutex_t *pmut = (pthread_mutex_t *)malloc(sizeof(pthread_mutex_t)); \ -if (!pmut) { \ -return ENOMEM; \ -} \ -pthread_mutex_init(pmut, NULL); \ -*pplock = (void *)pmut; \ -return 0; \ + pthread_mutex_t *pmut = (pthread_mutex_t *)malloc(sizeof(pthread_mutex_t)); \ + if (!pmut) { \ + return ENOMEM; \ + } \ + pthread_mutex_init(pmut, NULL); \ + *pplock = (void *)pmut; \ + return 0; \ } \ \ static void smb_destroy_mutex_pthread(void *plock, const char *location) \ { \ -pthread_mutex_destroy((pthread_mutex_t *)plock); \ + pthread_mutex_destroy((pthread_mutex_t *)plock); \ free(plock); \ } \ \ static int smb_lock_pthread(void *plock, enum smb_thread_lock_type lock_type, const char *location) \ { \ -if (lock_type == SMB_THREAD_UNLOCK) { \ -return pthread_mutex_unlock((pthread_mutex_t *)plock); \ -} else { \ -return pthread_mutex_lock((pthread_mutex_t *)plock); \ -} \ + if (lock_type == SMB_THREAD_UNLOCK) { \ + return pthread_mutex_unlock((pthread_mutex_t *)plock); \ + } else { \ + return pthread_mutex_lock((pthread_mutex_t *)plock); \ + } \ } \ \ -static int smb_create_tls_pthread(const char *keyname, void **ppkey, const char *location) \ +static pthread_mutex_t create_tls_mutex = PTHREAD_MUTEX_INITIALIZER; \ + \ +static int smb_create_tls_once_pthread(const char *keyname, void **ppkey, const char *location) \ { \ -int ret; \ -pthread_key_t *pkey = (pthread_key_t *)malloc(sizeof(pthread_key_t)); \ -if (!pkey) { \ -return ENOMEM; \ -} \ -ret = pthread_key_create(pkey, NULL); \ -if (ret) { \ -return ret; \ -} \ -*ppkey = (void *)pkey; \ -return 0;
Build status as of Wed Apr 15 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-04-14 00:00:12.0 + +++ /home/build/master/cache/broken_results.txt 2009-04-15 00:00:18.0 + @@ -1,9 +1,9 @@ -Build status as of Tue Apr 14 00:00:01 2009 +Build status as of Wed Apr 15 00:00:02 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 28 6 0 +ccache 30 6 0 distcc 0 0 0 ldb 30 30 0 libreplace 30 12 0 @@ -13,9 +13,10 @@ rsync30 12 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 28 18 0 -samba_3_master 28 21 0 -samba_4_0_test 30 29 3 +samba_3_current 28 19 0 +samba_3_master 28 22 0 +samba_3_next 20 14 0 +samba_4_0_test 30 29 5 talloc 30 30 0 tdb 28 10 0
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1047-g92d3210
The branch, master has been updated via 92d321006d1748ac47cf9b52330212f4ae03f502 (commit) from 8e06e945b6b03db825862f2f057f0dfe13ade3a2 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 92d321006d1748ac47cf9b52330212f4ae03f502 Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de Date: Tue Apr 14 10:08:42 2009 +1000 Enable software rollout through AD This enables the sofware rollout feature in Samba4 Signed-off-by: Andrew Bartlett abart...@samba.org --- Summary of changes: source4/setup/provision_group_policy.ldif | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/setup/provision_group_policy.ldif b/source4/setup/provision_group_policy.ldif index 0f3e1f1..98c09b9 100644 --- a/source4/setup/provision_group_policy.ldif +++ b/source4/setup/provision_group_policy.ldif @@ -1,3 +1,13 @@ +dn: CN=Default Domain Policy,CN=System,${DOMAINDN} +objectClass: top +objectClass: domainPolicy +isCriticalSystemObject: TRUE + +dn: CN=AppCategories,CN=Default Domain Policy,CN=System,${DOMAINDN} +objectClass: top +objectClass: classStore +isCriticalSystemObject: TRUE + dn: CN={${POLICYGUID}},CN=Policies,CN=System,${DOMAINDN} objectClass: top objectClass: container -- Samba Shared Repository