Re: [Samba] Samba unable to bind to LDAP server
Steve Brown writes: I've spent the last several days trying to get Samba to bind to our OpenDirectory server for user authentication with no success. Whenever I try start Samba, it complains that the connection to the LDAP server failed with invalid credentials. I am authenticating other services against the LDAP server through NSS, so I am a bit at a loss as to why Samba won't run. I'm also a bit at a loss as to why I can't just tell Samba to use the same PAM modules that the other servers are using and just have authentication chug happily along through existing mechanisms. My guess is that you can when you use pam - only you would need another passdb backend the (for example tdbsam). Samba 3.0.26a built with ./configure --prefix=/usr/local --enable-fhs --with-ldap --with-pam --with-configdir=/etc/samba --with-logfilebase=/var/log/samba Looks good. $ cat /etc/samba/smb.conf [global] workgroup = WORKGROUP netbios name = Samuel security = user passdb backend =ldapsam:ldap://192.168.19.1/ ldap suffix = dc=vpn,dc=a3dauto,dc=com ldap admin dn = dc=vpn,dc=a3dauto,dc=com ldap user suffix = cn=users ldap group suffix = cn=groups It strikes me as strange that your ldap suffix and ldap admin dn are identical. I'm not familiar with OpenDirectory, but do they have a 'root dn' like OpenLDAP does or are you authenticating against an entry in the database itself? I am able to query the LDAP server using ldapsearch -x just fine, which tells me that my settings in /etc/openldap/ldap.conf are correct. Settings in /etc/openldap/ldap.conf are not used by samba, AFAIK. I assumed that I could just duplicate the same settings in smb.conf, add my admin password through smbpasswd -W and everything would Just Work (tm), but that is obviously not the case. Well, it should be. :) You say you can use ldapsearch; can you also do authenticated binds with it? E.g. does this work: ldapsearch -h 192.168.19.1 -D dc=vpn,dc=a3dauto,dc=com -w mypass -x objectClass=* and this: ldapsearch -h 192.168.19.1 -D uid=diradmin,dc=vpn,dc=a3dauto,dc=com -w mypass -x objectClass=* Is your nss config authenticated or not? (You can set the bindpw flag in /etc/ldap.conf, but you can also leave it out.) That might give you a clue to whether your authenticated setup is working. 1) Is there anything that I am missing in the configuration that would make everything roll over? It looks good - apart from the fact that your admin dn might be incorrect - but that may also be caused by your testing, like you mention in another message. 2) Is there a way to make Samba use the PAM / NSS mechanism that is already working? Yes, but you would need another passdb backend then. Additionally, you cannot configure it to do an anonymous bind. Samba needs access to private information in the ldap server (passwords and such) and to grant this access to anonymous users is not recommended. Regards, roel -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] NMBD Segfault on Ubuntu 6.06
Hello after the last samba update all of my Ubuntu Servers do segfault on nmbd: [2007/11/16 08:36:09, 0] nmbd/nmbd.c:main(727) Netbios nameserver version 3.0.22 started. Copyright Andrew Tridgell and the Samba Team 1992-2006 [2007/11/16 08:36:09, 1] param/loadparm.c:lp_do_parameter(3400) WARNING: The printer admin option is deprecated [2007/11/16 08:36:09, 0] nmbd/nmbd.c:main(746) standard input is not a socket, assuming -D option [2007/11/16 08:36:09, 2] nmbd/nmbd.c:main(751) Becoming a daemon. [2007/11/16 08:36:09, 2] lib/tallocmsg.c:register_msg_pool_usage(61) Registered MSG_REQ_POOL_USAGE [2007/11/16 08:36:09, 2] lib/dmallocmsg.c:register_dmalloc_msgs(71) Registered MSG_REQ_DMALLOC_MARK and LOG_CHANGED [2007/11/16 08:36:09, 2] lib/interface.c:add_interface(81) added interface ip=127.0.0.1 bcast=127.255.255.255 nmask=255.0.0.0 [2007/11/16 08:36:09, 2] lib/interface.c:add_interface(81) added interface ip=192.168.2.254 bcast=192.168.2.255 nmask=255.255.255.0 [2007/11/16 08:36:09, 2] nmbd/nmbd_subnetdb.c:make_subnet(173) making subnet name:192.168.2.254 Broadcast address:192.168.2.255 Subnet mask:255.255.255.0 [2007/11/16 08:36:09, 2] nmbd/nmbd_subnetdb.c:create_subnets(246) create_subnets: Ignoring loopback interface. [2007/11/16 08:36:09, 2] nmbd/nmbd_subnetdb.c:make_subnet(173) making subnet name:UNICAST_SUBNET Broadcast address:0.0.0.0 Subnet mask:0.0.0.0 [2007/11/16 08:36:09, 2] nmbd/nmbd_subnetdb.c:make_subnet(173) making subnet name:REMOTE_BROADCAST_SUBNET Broadcast address:0.0.0.0 Subnet mask:0.0.0.0 [2007/11/16 08:36:09, 0] lib/util.c:smb_panic2(1544) smb_panic(): calling panic action [/usr/share/samba/panic-action 4346] [2007/11/16 08:36:09, 0] lib/util.c:smb_panic2(1552) smb_panic(): action returned status 0 [2007/11/16 08:36:09, 0] lib/util.c:smb_panic2(1554) PANIC: push_ascii - dest_len == -1 [2007/11/16 08:36:09, 0] lib/util.c:smb_panic2(1562) BACKTRACE: 9 stack frames: #0 nmbd(smb_panic2+0x78) [0x80cc328] #1 nmbd(smb_panic+0x19) [0x80cc525] #2 nmbd(push_ascii+0xca) [0x80b8624] #3 nmbd [0x8073c63] #4 nmbd [0x8073e2a] #5 nmbd(announce_my_server_names+0xbc) [0x8074167] #6 nmbd(main+0x4ec) [0x8062b7d] #7 /lib/tls/i686/cmov/libc.so.6(__libc_start_main+0xd2) [0xb7cc4ea2] #8 nmbd [0x80614a1] Anybody an idea? Thanks, Thomas -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Strange NT_STATUS_PASSWORD errors after upgrade to 3.0.26a
Setting the User Account Flags to [UX] on the LDAP server allows the
user to log in,
Previous to this pdbedit was reporting 'Password must change: 0' should
that have been -1?
Any way to get back to what seemed to be default behaviour prior to 3.0.25 ?
Cheers,
Duncan
Duncan Brannen wrote:
Thanks John,
Setting this to 0 (Zero) or not having it present seems to
work with 3.0.23c but with
3.0.26a I still get the NT_STATUS_PASSWORD_MUST_CHANGE error.
Looking at the code the log points to (auth/auth_sam.c) line 172
There is a change
between 23c and 26a which may or may not point to the answer. It
doesn't look
obvious to me.
3.0.26a
if (!(pdb_get_acct_ctrl(sampass) ACB_PWNOEXP)
!(pdb_get_acct_ctrl(sampass) ACB_PWNOTREQ)) {
time_t must_change_time =
pdb_get_pass_must_change_time(sampass);
time_t last_set_time =
pdb_get_pass_last_set_time(sampass);
/* check for immediate expiry must change at next
logon */
if (last_set_time == 0) {
DEBUG(1,(sam_account_ok: Account for user
'%s' password must change!.\n, pdb_get_username(sampass)));
return NT_STATUS_PASSWORD_MUST_CHANGE;
}
# diff samba-3.0.26a/source/auth/auth_sam.c
samba-3.0.23c/source/auth/auth_sam.c
166c166
if (!(pdb_get_acct_ctrl(sampass) ACB_PWNOEXP)
!(pdb_get_acct_ctrl(sampass) ACB_PWNOTREQ)) {
---
if (!(pdb_get_acct_ctrl(sampass) ACB_PWNOEXP)) {
171c171
if (last_set_time == 0) {
---
if (must_change_time == 0 last_set_time != 0) {
Cheers,
Duncan
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Mac client
Good tip. I'm posting it to lists.samba.org so it will end up in the archives.
Thanks
Adam
Ryan Bair on 15/11/07 18:32, wrote:
As a side note, there is an option for the Mac clients to disable the
.DS_Store files from being created on network volumes. I always use
this on my clients because the .DS_Store creation will update the
modtime on the directory every single time a user goes to the
directory. It also causes the directory to open in the same view that
the last person was using, which tends to irritate users.
The command is defaults write com.apple.desktopservices
DSDontWriteNetworkStores true in the terminal.
--Ryan
On Nov 15, 2007 3:34 AM, Adam Hardy [EMAIL PROTECTED] wrote:
Mikko Suomi on 14/11/07 16:48, wrote:
Adam Hardy wrote:
I'm trying to copy files to a Samba share that I have set up on a
linux debian machine from a Mac running OS X, using samba 3.0.24.
The Mac complains that there is something wrong with the file name,
and then refuses to copy, and the operation leaves a zero-byte file
with the same name on the samba share.
I had similiar problems with Mac's when I had veto files = /.*/ in samba
share to pervent users from deleting their linux profile files from
Windows workstations. (OSx likes to create .DS_Store -files to it's
folders) For some reason files could be written to samba from Macs
terminal window. Chancing veto files to /.bash*/ fixed problem for me.
Thanks for the tip.
I had veto = /*.{*}/.*/mail/bin
- put in there by default by SWAT!
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba PDC issue
Hi List, As i m new to this list. i have some issue with my Samba PDC. Main problem is user's roaming profile is not working. NTUSER.DAT --- DENY_WRITE. this is coming . can not load you profile . loading default profile... Please guide me is there any changes has to made. Here is my smb.conf file. Version 2.2 OS Redhat 9 [global] workgroup = LK netbios name = HOBBES server string = Domain Controller encrypt passwords = Yes pam password change = Yes passwd program = /usr/bin/passwd %u passwd chat = *New*password* %n\n *Retype*new*password* %n\n *passwd:*all*authentication*tokens*updated*successfully* unix password sync = Yes log file = /var/log/samba-log.%m max log size = 0 socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 printcap name = cups domain admin group = @admin add user script = /usr/sbin/useradd -d /dev/null -g 100 -s /bin/false -M %u domain logons = Yes os level = 64 preferred master = Yes domain master = Yes dns proxy = No lock dir = /var/lock/samba printing = cups [homes] comment = Home Directories read only = No [netlogon] comment = Network Logon Service path = /usr/local/samba/lib/netlogon guest ok = Yes browseable = No share modes = No [Profiles] # path = /usr/local/samba/profiles path = /home write list = @smbusers @root read only = No create mask = 0600 directory mask = 0700 preserve case = No short preserve case = No hide files = /desktop.ini/ntuser.ini/NTUSER.*/ browseable = No [pdfprinter] comment = Print to PDF path = /tmp create mask = 0700 printable = Yes postscript = Yes print command = /usr/local/bin/print2pdf %s %m %U queuepause command = /bin/true queueresume command = /bin/true printer driver = HP Color LaserJet PS [Softwares] comment = Software path = /var/softwares write list = @admin create mask = 0765 guest ok = Yes [HR_DESK] comment = Human Resource path = /home1/hr write list = seeja read only = No guest ok = Yes [QA_Repository] path = /var/QA_Repo valid users = padma rabindra kiran thomas akula bhargavi anoel nathan shreesha amit noor read only = No [printers] comment = All Printers path = /var/spool/samba create mask = 0700 guest ok = Yes printable = Yes browseable = No -- Thanks Warm Regards, _ Tarak Ranjan Mukherjee IS-Team Liqwid Krystal India Pvt Ltd T#: 91 80 2509 1790 Ext. 107 E@: [EMAIL PROTECTED] IM: [EMAIL PROTECTED] Online Learning|Certifications|Learning Solutions : www.liqwidkrystal.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Fileserver integrated into windows domain, plus linux clients needed
Ben Ladd wrote: This is a two part question regarding the setup of the samba server at my school. I am a student working as an IT tech and the support team is in dire need of help! We have: 1. a windows 2003 server for a PDC with a full active directory. 2. a fedora core samba fileserver 3. lots of windows XP workstations. My problem: Each time we set up a new user on the system, passwords need changing on the AD and the samba server. Is there a way to set permissions for the samba from the AD so that we do not need to go through this rigmarole? (most problematic at the start of a new school year). My aim is to also have some linux (probably k/ubuntu) boxes that authenticate on the network using standard AD credentials. I have tried in vain to find a way to introduce a single point of authentication, I have looked at kerberos, winbind and LDAP. I consider myself a good network technician, but the introduction of linux into a domain has thrown me. Is there a an easy way to integrate a linux fileserver with a windows controlled domain with both linux and windows clients? I have read through countless this is a way it could be done and even tested kerberos/winbind/samba installs without result. I feel there is a way forward buy my lack of knowledge of linux services is letting me down. Regards, Ben IT Tech Springfield School, Portsmouth, UK If your using Windows Server 2003 R2 read this link (and comments) http://blog.scottlowe.org/2007/01/15/linux-ad-integration-version-4/ If your not running R2 read this link (and comments). In fact it would be good to read both anyway and understand the differences. http://blog.scottlowe.org/2005/12/22/complete-linux-ad-authentication-de tails/ The instructions work fine with CentOS. Dean -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] RE: configure: error: C compiler cannot create executables
On Thu, Nov 15, 2007 at 01:00:19PM -0800, Morimoto, Mark K wrote: I get this when I run ./configure. I have searched for other problems and others who had the problem say its due to cc not being installed. Well its not but I have gcc. So I saw where someone put define CC=gcc and then ran the ./configure command. I tried it but still the same error. So what is the solution? Should I install C? I am running this on a solaris 9 on x86. What does the 'config.log' say? Does it indicate exactly what it is trying to do or which compiler it is trying to use? I've seen this error (C compiler cannot create executables) when someone has attempted to use the Intel compilers when they don't have a license for them. I think that you might also see it if you are missing some libraries. But the log should provide at least some hints. # ./configure SAMBA VERSION: 3.0.26a LIBREPLACE_LOCATION_CHECKS: START checking build system type... i386-pc-solaris2.10 checking host system type... i386-pc-solaris2.10 checking target system type... i386-pc-solaris2.10 LIBREPLACE_LOCATION_CHECKS: END LIBREPLACE_CC_CHECKS: START checking for gcc... gcc checking for C compiler default output file name... configure: error: C compiler cannot create executables See `config.log' for more details. # echo $PATH /bin:/usr/bin:/usr/ucb:/etc:/usr/atria/bin:/usr/dt/bin:/usr/sbin:/usr/ openwin/bin:/opt/gcc/bin instructions: https://lists.samba.org/mailman/listinfo/samba -- greg byshenk - [EMAIL PROTECTED] - Leiden, NL -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Problems mounting a DOMAIN share, rather than a COMPUTER share
FreeBSD 6.2 + Samba 3.0.26a Can Samba mount a DFS share, using \\DOMAIN\dfs, rather than \\COMPUTER\dfs? The following command successfully lists all the shares on a domain controller, the same as \\DOMAIN does on Windows. One of the shares returned is dfs which is the root of my dfs tree: smbclient -U administrator -L domain.example.com | grep Disk So, I tried to mount dfs using the various commands below (errors are in ), none of which work. Is this impossible, or am I missing something? Kind regards, Steve -- mount_smbfs -I domaincontroller.example.com //[EMAIL PROTECTED]/dfs /mnt server name 'example.com' too long mount_smbfs -I domaincontroller.example.com //[EMAIL PROTECTED]/dfs /mnt mount_smbfs: unable to open connection: syserr = Connection reset by peer mount //[EMAIL PROTECTED]/dfs /mnt mount: //[EMAIL PROTECTED]/dfs: No such file or directory mount_smbfs //[EMAIL PROTECTED]/dfs /mnt mount_smbfs: can't get server address: syserr = Operation timed out -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] force ntlm
Hi We have a problem with the one way trusts between the DEV and PROD domains (Windows 2003). Microsoft told me to use NTLM instead of kerberos. Is there a way to force samba to use NTLM (or NTLMv2) instead of kerberos? Regards Urs -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: problem with net rpc vampire
to answer my own question. i had to copy the scripts from the smbldap tools package to another directory, e.g. /opt/IDEALX/sbin. it seems that net rpc vampire doesn't have access to /usr/sbin. i noticed that local groups on the NT4 PDC do not get migrated, is that to be expected? On Nov 15, 2007 6:28 PM, Asgeir Sigurdsson [EMAIL PROTECTED] wrote: when migrating from a NT4 domain using net rpc vampire i get the following error message: Creating unix group: 'Users' sh: /usr/sbin/smbldap-groupadd: No such file or directory [2007/11/15 10:21:31, 0] groupdb/mapping.c:smb_create_group(234) smb_create_group: Running the command `/usr/sbin/smbldap-groupadd 'Users'' gave 127 if i run the same command manually (/usr/sbin/smbldap-groupadd 'Users') the command runs successfully. any hint on why the command fails when using net rpc vampire? cheers, asgeir. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba PDC issue
Bruno Pirajá Moyle wrote: Tarak Ranjan escreveu: Hi List, As i m new to this list. i have some issue with my Samba PDC. Main problem is user's roaming profile is not working. NTUSER.DAT --- DENY_WRITE. this is coming . can not load you profile . loading default profile... Please guide me is there any changes has to made. Here is my smb.conf file. Version 2.2 OS Redhat 9 [global] workgroup = LK netbios name = HOBBES server string = Domain Controller encrypt passwords = Yes pam password change = Yes passwd program = /usr/bin/passwd %u passwd chat = *New*password* %n\n *Retype*new*password* %n\n *passwd:*all*authentication*tokens*updated*successfully* unix password sync = Yes log file = /var/log/samba-log.%m max log size = 0 socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 printcap name = cups domain admin group = @admin add user script = /usr/sbin/useradd -d /dev/null -g 100 -s /bin/false -M %u domain logons = Yes os level = 64 preferred master = Yes domain master = Yes dns proxy = No lock dir = /var/lock/samba printing = cups [homes] comment = Home Directories read only = No [netlogon] comment = Network Logon Service path = /usr/local/samba/lib/netlogon guest ok = Yes browseable = No share modes = No [Profiles] #path = /usr/local/samba/profiles path = /home write list = @smbusers @root read only = No create mask = 0600 directory mask = 0700 preserve case = No short preserve case = No hide files = /desktop.ini/ntuser.ini/NTUSER.*/ browseable = No [pdfprinter] comment = Print to PDF path = /tmp create mask = 0700 printable = Yes postscript = Yes print command = /usr/local/bin/print2pdf %s %m %U queuepause command = /bin/true queueresume command = /bin/true printer driver = HP Color LaserJet PS [Softwares] comment = Software path = /var/softwares write list = @admin create mask = 0765 guest ok = Yes [HR_DESK] comment = Human Resource path = /home1/hr write list = seeja read only = No guest ok = Yes [QA_Repository] path = /var/QA_Repo valid users = padma rabindra kiran thomas akula bhargavi anoel nathan shreesha amit noor read only = No [printers] comment = All Printers path = /var/spool/samba create mask = 0700 guest ok = Yes printable = Yes browseable = No Add the logon home option to the global sections: [global] ... ... logon home = \\%L\Profiles\%U ... Explaining: 1. The %L resolves to the server netbios name; 2. Profiles is the name of the profiles share 3. %U will resolve to the user name that is trying to access the share, for example if the user john is trying to log on, %U will resolve to john You are using the home directory, so you don't need to add any permissions. This should work Hi, As my user's profile store in /home/user/profile if i use logon home = \\%L\home\%U\profile that will fine or not -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Samba PDC issue
On 11/16/2007, Tarak Ranjan ([EMAIL PROTECTED]) wrote: Hi, As my user's profile store in /home/user/profile if i use logon home = \\%L\home\%U\profile that will fine or not As I learned recently, this is not advised. User profiles should always be stored in an entirely separate share, ie: homes in: \server\home\user and profiles in: \server\profiles$\user I use the $ at the end of the profiles share to hide it... -- Best regards, Charles -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Fileserver integrated into windows domain, plus linux clients needed
On Nov 14, 2007 6:39 AM, Ben Ladd [EMAIL PROTECTED] wrote: This is a two part question regarding the setup of the samba server at my school. I am a student working as an IT tech and the support team is in dire need of help! We have: 1. a windows 2003 server for a PDC with a full active directory. 2. a fedora core samba fileserver 3. lots of windows XP workstations. My problem: Each time we set up a new user on the system, passwords need changing on the AD and the samba server. Is there a way to set permissions for the samba from the AD so that we do not need to go through this rigmarole? (most problematic at the start of a new school year). My aim is to also have some linux (probably k/ubuntu) boxes that authenticate on the network using standard AD credentials. I have tried in vain to find a way to introduce a single point of authentication, I have looked at kerberos, winbind and LDAP. I consider myself a good network technician, but the introduction of linux into a domain has thrown me. Is there a an easy way to integrate a linux fileserver with a windows controlled domain with both linux and windows clients? I have read through countless this is a way it could be done and even tested kerberos/winbind/samba installs without result. I feel there is a way forward buy my lack of knowledge of linux services is letting me down. Regards, Ben IT Tech Springfield School, Portsmouth, UK I was able to set up a samba server that authenticated clients from the AD domain. The Ubuntu forums have a step-by-step walk thru found here: http://ubuntuforums.org/showthread.php?t=280702 Hope this helps. ds -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Fileserver integrated into windows domain, plus linux clients needed
My mistake, it works, I didn't realize that the word 'details' at the end of the link had been cutoff and placed on the next line down. Sorry, Guillermo Gutierrez _ (818) 575-2017 (818) 324-0871 [EMAIL PROTECTED] -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Guillermo Gutierrez Sent: Friday, November 16, 2007 7:29 AM To: Plant, Dean; samba@lists.samba.org Subject: RE: [Samba] Fileserver integrated into windows domain,plus linux clients needed It would appear the second link does not work anymore. Guillermo Gutierrez _ (818) 575-2017 (818) 324-0871 [EMAIL PROTECTED] -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Plant, Dean Sent: Friday, November 16, 2007 2:10 AM To: samba@lists.samba.org Subject: RE: [Samba] Fileserver integrated into windows domain,plus linux clients needed Ben Ladd wrote: This is a two part question regarding the setup of the samba server at my school. I am a student working as an IT tech and the support team is in dire need of help! We have: 1. a windows 2003 server for a PDC with a full active directory. 2. a fedora core samba fileserver 3. lots of windows XP workstations. My problem: Each time we set up a new user on the system, passwords need changing on the AD and the samba server. Is there a way to set permissions for the samba from the AD so that we do not need to go through this rigmarole? (most problematic at the start of a new school year). My aim is to also have some linux (probably k/ubuntu) boxes that authenticate on the network using standard AD credentials. I have tried in vain to find a way to introduce a single point of authentication, I have looked at kerberos, winbind and LDAP. I consider myself a good network technician, but the introduction of linux into a domain has thrown me. Is there a an easy way to integrate a linux fileserver with a windows controlled domain with both linux and windows clients? I have read through countless this is a way it could be done and even tested kerberos/winbind/samba installs without result. I feel there is a way forward buy my lack of knowledge of linux services is letting me down. Regards, Ben IT Tech Springfield School, Portsmouth, UK If your using Windows Server 2003 R2 read this link (and comments) http://blog.scottlowe.org/2007/01/15/linux-ad-integration-version-4/ If your not running R2 read this link (and comments). In fact it would be good to read both anyway and understand the differences. http://blog.scottlowe.org/2005/12/22/complete-linux-ad-authentication-de tails/ The instructions work fine with CentOS. Dean -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] 3.0.27a out monday.
On Fri, Nov 16, 2007 at 10:49:47AM -0800, Jeremy Allison wrote:
Just spoke to Jerry, we'll be doing
a 3.0.27a on Monday to fix a regression
that broke smbfs mounts from Linux.
Sorry for the problem.
Here's the fix for smbfs + 3.0.27.
Jeremy.
diff -u -r source-orig/smbd/negprot.c source/smbd/negprot.c
--- source-orig/smbd/negprot.c 2007-11-14 19:15:04.0 -0800
+++ source/smbd/negprot.c 2007-11-16 11:53:31.0 -0800
@@ -346,7 +346,7 @@
SCVAL(outbuf,smb_vwv16+1,8);
p += 8;
}
- p += srvstr_push(outbuf, p, lp_workgroup(), -1,
+ p += srvstr_push(outbuf, p, lp_workgroup(), BUFFER_SIZE -
(p-outbuf),
STR_UNICODE|STR_TERMINATE|STR_NOALIGN);
DEBUG(3,(not using SPNEGO\n));
} else {
diff -u -r source-orig/smbd/reply.c source/smbd/reply.c
--- source-orig/smbd/reply.c2007-11-14 19:15:04.0 -0800
+++ source/smbd/reply.c 2007-11-16 11:56:03.0 -0800
@@ -524,7 +524,7 @@
if (Protocol PROTOCOL_NT1) {
set_message(outbuf,2,0,True);
p = smb_buf(outbuf);
- p += srvstr_push(outbuf, p, server_devicetype, -1,
+ p += srvstr_push(outbuf, p, server_devicetype, BUFFER_SIZE - (p
- outbuf),
STR_TERMINATE|STR_ASCII);
set_message_end(outbuf,p);
} else {
@@ -554,9 +554,9 @@
}
p = smb_buf(outbuf);
- p += srvstr_push(outbuf, p, server_devicetype, -1,
+ p += srvstr_push(outbuf, p, server_devicetype, BUFFER_SIZE - (p
- outbuf),
STR_TERMINATE|STR_ASCII);
- p += srvstr_push(outbuf, p, fstype, -1,
+ p += srvstr_push(outbuf, p, fstype, BUFFER_SIZE - (p - outbuf),
STR_TERMINATE);
set_message_end(outbuf,p);
@@ -1766,7 +1766,7 @@
thing in the byte section. JRA */
SSVALS(p, 0, -1); /* what is this? not in spec */
#endif
- namelen = srvstr_push(outbuf, p, s, -1, STR_ASCII|STR_TERMINATE);
+ namelen = srvstr_push(outbuf, p, s, BUFFER_SIZE - (p - outbuf),
STR_ASCII|STR_TERMINATE);
p += namelen;
outsize = set_message_end(outbuf, p);
diff -u -r source-orig/smbd/srvstr.c source/smbd/srvstr.c
--- source-orig/smbd/srvstr.c 2007-11-14 19:15:04.0 -0800
+++ source/smbd/srvstr.c2007-11-16 11:41:16.0 -0800
@@ -28,17 +28,10 @@
const char *base_ptr, void *dest,
const char *src, int dest_len, int flags)
{
- size_t buf_used = PTR_DIFF(dest, base_ptr);
- if (dest_len == -1) {
- if (((ptrdiff_t)dest (ptrdiff_t)base_ptr) || (buf_used
(size_t)max_send)) {
-#if 0
- DEBUG(0, (Pushing string of 'unlimited' length into
non-SMB buffer!\n));
-#endif
- return push_string_fn(function, line, base_ptr, dest,
src, -1, flags);
- }
- return push_string_fn(function, line, base_ptr, dest, src,
max_send - buf_used, flags);
+ if (dest_len 0) {
+ return 0;
}
-
+
/* 'normal' push into size-specified buffer */
return push_string_fn(function, line, base_ptr, dest, src, dest_len,
flags);
}
diff -u -r source-orig/smbd/trans2.c source/smbd/trans2.c
--- source-orig/smbd/trans2.c 2007-11-14 19:15:04.0 -0800
+++ source/smbd/trans2.c2007-11-16 11:47:47.0 -0800
@@ -1283,7 +1283,7 @@
p += 23;
nameptr = p;
p += align_string(outbuf, p, 0);
- len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE);
+ len = srvstr_push(outbuf, p, fname, space_remaining -
(p - pdata), STR_TERMINATE);
if (SVAL(outbuf, smb_flg2) FLAGS2_UNICODE_STRINGS) {
if (len 2) {
SCVAL(nameptr, -1, len - 2);
@@ -1318,7 +1318,7 @@
}
p += 27;
nameptr = p - 1;
- len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE |
STR_NOALIGN);
+ len = srvstr_push(outbuf, p, fname, space_remaining -
(p - pdata), STR_TERMINATE | STR_NOALIGN);
if (SVAL(outbuf, smb_flg2) FLAGS2_UNICODE_STRINGS) {
if (len 2) {
len -= 2;
@@ -1372,9 +1372,9 @@
}
/* Push the ea_data followed by the name. */
- p += fill_ea_buffer(ea_ctx, p, space_remaining, conn,
name_list);
+ p += fill_ea_buffer(ea_ctx, p, space_remaining - (p -
pdata), conn, name_list);
[Samba] 3.0.27a out monday.
Just spoke to Jerry, we'll be doing a 3.0.27a on Monday to fix a regression that broke smbfs mounts from Linux. Sorry for the problem. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Is there a PAM setup for libsmbclient?
I have a working winbind on my Radados server that let's Ubuntu Gutsy workstartions authenticate from the server. I works great. A user account that exists on the server with a home directory is able to login to Ubuntu with GDM and have a Gnome desktop and their home directory is mounted from the server, all is good. The server has many shares that are being offered to users that are members of select groups. For example there is a group accounting and only users that are members of accounting can access it. Lets say I have a user named lisa and she is a member of accounting. She has rights on the server to the accounting files share because she is a member of accounting. Another server, let's call it SERVER_B, has a share that is also available to members of accounting. SERVER_B has a smb.conf with read and write lists defined like so write list = @MYDOMAIN+accounting. This part works great. Lisa can login to any Gutsy system on the network, her home directory follows her aound and she can login to SERVER_B and access the share for accounting members. Anyone not a member of accounting cannot access the accounting share on SERVER_B. The accounting group is mapped using net groupmap. PAM is used on the Gutsy workstations to authenticate Lisa at login time by using winbind to call a challange to the Radados server for the authentication of the user. PAM is also doing this to mount Lisa's home directory using pam_mount. Lisa then opens nautilus to browes the network to access the accounting share on SERVER_B. Nautilus is linked to libsmbclient to access the SMB protocols. A pop-up dialog asks Lisa to enter her login name, domain name and account password to access the accounting share on SERVER_B. If she enters the data correctly she will be allowed into the share and denied if she does not. PAM already has the authentication information for the user. I want to find a way that I can make libsmbclient look to the PAM system for authentication before asking for the authentication data. I know libsmbclient is not actually showing the pop-up dialog, that comes from nautilus but libsmbclient is looking to see if it can access the share without authentication and if that fails it then asks for authentication information from the application, most likely with a call back function or a returned error code. I want libsmbclient to look for authentication from PAM before going back to the application. I am unable to find any way to do this. I have been looking for a way to make a libsmbclient PAM config file but have not found any such thing. PAM is mostly a service for server side authentication control, meaning that PAM can be used to authenticate for the servers side of an action not the client side. For example PAM could be used for FTPD do authenticate incoming FTP requests but it cannot be setup to provide your authentication details to the FTP client program. PAM is mostly for server side because the documentation says it is for server side, but pam_mount is a client side example of how it can be used for client side authentications. pam_mount is setup to mount the users home directory from the server and it works. I don't know the relationship between PAM and the mounting of SMB shares but at some point it must go through libsmbclient and PAM is holding the authentication data for the user. Once a user has been authenticated and they are into their desktop, they should be able to access all SMB domain services without being asked for their login and password again, unless it is a service that requires a different user name and password. I do not want a fix for nautilus because there are many other filemanagers and other programs that use libsmbclient. It maybe possible to use pam_env to store a global username and password but that would be dangerous. Advice please. -- You need music, music needs you; but the RIAA we'd all be better off without. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Domain server unavailable
Hi all. I'm having a serious problem with my samba/ldap server. It was working well till the last week and today stops definitly. Nothing has changed. Now my network is down and nobody can log in. When I restart samba: invoke-rc.d samba restart * Stopping Samba daemons... start-stop-daemon: warning: failed to kill 4436: No such process [ ok ] * Starting Samba daemons... [ ok ] I try to log into a windows machine and theres no domain available. When I try with smbclient I have: smbclient //192.168.160.100/ Password: Domain=[HIDRAUTRONICA] OS=[Unix] Server=[Samba 3.0.22] tree connect failed: NT_STATUS_BAD_NETWORK_NAME My smb.conf: [global] workgroup = HIDRAUTRONICA server string = %h ( Samba+Ldap ) obey pam restrictions = Yes passdb backend = ldapsam:ldap://127.0.0.1 enable privileges = Yes passwd program = /usr/bin/passwd %u passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n *password\supdated\ssuccessfully* . passwd chat debug = Yes unix password sync = Yes syslog = 0 max log size = 1000 logon path = logon home = domain logons = Yes os level = 100 domain master = Yes dns proxy = No wins support = Yes ldap admin dn = cn=admin,dc=hidrautronica,dc=com,dc=br ldap group suffix = ou=Grupos ldap machine suffix = ou=Computadores ldap suffix = dc=hidrautronica,dc=com,dc=br ldap ssl = no ldap user suffix = ou=Usuarios default service = global panic action = /usr/share/samba/panic-action %d winbind trusted domains only = Yes admin users = root printing = cups cups options = raw print command = lpq command = %p lprm command = [printers] comment = All Printers path = /tmp create mask = 0700 printable = Yes browseable = No [print$] comment = Printer Drivers path = /var/lib/samba/printers Somebody, please, help. And sorry for my bad english. -- []s Atenciosamente Walmiro Muzzi icq: 9861746 msn: [EMAIL PROTECTED] skype: w.muzzi [EMAIL PROTECTED] http://www.cruzeiro.org Seja livre, use Linux!!! ___ Yahoo! Mail - Sempre a melhor opção para você! Experimente já e veja as novidades. http://br.yahoo.com/mailbeta/tudonovo/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Fileserver integrated into windows domain, plus linux clients needed
It would appear the second link does not work anymore. Guillermo Gutierrez _ (818) 575-2017 (818) 324-0871 [EMAIL PROTECTED] -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Plant, Dean Sent: Friday, November 16, 2007 2:10 AM To: samba@lists.samba.org Subject: RE: [Samba] Fileserver integrated into windows domain,plus linux clients needed Ben Ladd wrote: This is a two part question regarding the setup of the samba server at my school. I am a student working as an IT tech and the support team is in dire need of help! We have: 1. a windows 2003 server for a PDC with a full active directory. 2. a fedora core samba fileserver 3. lots of windows XP workstations. My problem: Each time we set up a new user on the system, passwords need changing on the AD and the samba server. Is there a way to set permissions for the samba from the AD so that we do not need to go through this rigmarole? (most problematic at the start of a new school year). My aim is to also have some linux (probably k/ubuntu) boxes that authenticate on the network using standard AD credentials. I have tried in vain to find a way to introduce a single point of authentication, I have looked at kerberos, winbind and LDAP. I consider myself a good network technician, but the introduction of linux into a domain has thrown me. Is there a an easy way to integrate a linux fileserver with a windows controlled domain with both linux and windows clients? I have read through countless this is a way it could be done and even tested kerberos/winbind/samba installs without result. I feel there is a way forward buy my lack of knowledge of linux services is letting me down. Regards, Ben IT Tech Springfield School, Portsmouth, UK If your using Windows Server 2003 R2 read this link (and comments) http://blog.scottlowe.org/2007/01/15/linux-ad-integration-version-4/ If your not running R2 read this link (and comments). In fact it would be good to read both anyway and understand the differences. http://blog.scottlowe.org/2005/12/22/complete-linux-ad-authentication-de tails/ The instructions work fine with CentOS. Dean -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Round-robin DNS and session disconnects
Hello, Our service has multiple Samba servers to serve up the same directories for our users. The users map to a single address, which directs them to a server by round-robin DNS. This hasn't really been a problem until recently. One user in particular complains that he loses his session, often in the middle of editing a document, causing problems with Windows file locking and he says he has to rename files to continue working. I'm suspecting there is a firewall on his network or on his computer that's doing something funny. I'll see the same user shown as having a session on two different servers. I've also seen log messages like this that make me think he's hopping from server to server: Nov 14 23:44:37 rfs-gw2 smbd[30790]: [2007/11/14 23:44:37, 0] lib/util_sock.c:read_socket_data(384) Nov 14 23:44:37 rfs-gw2 smbd[30790]: read_socket_data: recv failure for 4. Error = Connection timed out Nov 14 23:44:37 rfs-gw2 smbd[30790]: [2007/11/14 23:44:37, 0] smbd/service.c:set_current_service(51) Nov 14 23:44:37 rfs-gw2 smbd[30790]: chdir (/home/j/r/jrpierce) failed I am looking for advice on how to make Samba servers play nice in a round-robin environment, or for a way to help the user keep a single server while he's working. Any help would be appreciated. Thanks, Chris -- Eric Chris Garrison | Principal Mass Storage Specialist [EMAIL PROTECTED] | Indiana University - Research Storage W: 317-278-1207 M: 317-250-8649 | Jabber IM: [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Will this binary work on solaris x86?
samba-3.0.23b-1-noads-sunos5.9-sparc.pkg.gz This is the current binary from samba.org. The file name includes sparc so I am not sure this will run on an x86 platform of solaris? Mark -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] force ntlm
Urs Golla wrote: Is there a way to force samba to use NTLM (or NTLMv2) instead of kerberos? While the man page doesn't explicitly say that NTLM is used instead of kerberos; I believe the intent of this setting is to have samba talk with AD using only NT4 domain member style communications (RPC and NTLM) and not ADS style communications (LDAP and kerberos). It's worth trying if you haven't already. From man smb.conf: winbind rpc only (G) Setting this parameter to yes forces winbindd to use RPC instead of LDAP to retrieve information from Domain Controllers. Default: winbind rpc only = no Neal -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Will this binary work on solaris x86?
I am attaching this to the previous email. This is the error I get when trying to start up samba. Does this mean I am trying to run this binary on an x86 platform? # ./samba start ./samba: /opt/samba/sbin/smbd: cannot execute Samba daemon starting ./samba: /opt/samba/sbin/nmbd: cannot execute NetBIOS daemon starting -Original Message- From: Morimoto, Mark K Sent: Friday, November 16, 2007 1:02 PM To: samba@lists.samba.org Subject: [Samba] Will this binary work on solaris x86? samba-3.0.23b-1-noads-sunos5.9-sparc.pkg.gz This is the current binary from samba.org. The file name includes sparc so I am not sure this will run on an x86 platform of solaris? Mark -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Will this binary work on solaris x86?
so the only way is to compile right? I did that but I guess I will try again I get a gcc Problem. Unless you know where I can get x86 binaries? -Original Message- From: simo [mailto:[EMAIL PROTECTED] Sent: Friday, November 16, 2007 3:53 PM To: Morimoto, Mark K Cc: samba@lists.samba.org Subject: RE: [Samba] Will this binary work on solaris x86? Mark, you can't run sparc binaries on an x86. You need x86 binaries. Simo. On Fri, 2007-11-16 at 15:19 -0800, Morimoto, Mark K wrote: I am attaching this to the previous email. This is the error I get when trying to start up samba. Does this mean I am trying to run this binary on an x86 platform? # ./samba start ./samba: /opt/samba/sbin/smbd: cannot execute Samba daemon starting ./samba: /opt/samba/sbin/nmbd: cannot execute NetBIOS daemon starting -Original Message- From: Morimoto, Mark K Sent: Friday, November 16, 2007 1:02 PM To: samba@lists.samba.org Subject: [Samba] Will this binary work on solaris x86? samba-3.0.23b-1-noads-sunos5.9-sparc.pkg.gz This is the current binary from samba.org. The file name includes sparc so I am not sure this will run on an x86 platform of solaris? Mark -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- Simo Sorce Samba Team GPL Compliance Officer [EMAIL PROTECTED] Senior Software Engineer at Red Hat Inc. [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Will this binary work on solaris x86?
Mark, you can't run sparc binaries on an x86. You need x86 binaries. Simo. On Fri, 2007-11-16 at 15:19 -0800, Morimoto, Mark K wrote: I am attaching this to the previous email. This is the error I get when trying to start up samba. Does this mean I am trying to run this binary on an x86 platform? # ./samba start ./samba: /opt/samba/sbin/smbd: cannot execute Samba daemon starting ./samba: /opt/samba/sbin/nmbd: cannot execute NetBIOS daemon starting -Original Message- From: Morimoto, Mark K Sent: Friday, November 16, 2007 1:02 PM To: samba@lists.samba.org Subject: [Samba] Will this binary work on solaris x86? samba-3.0.23b-1-noads-sunos5.9-sparc.pkg.gz This is the current binary from samba.org. The file name includes sparc so I am not sure this will run on an x86 platform of solaris? Mark -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- Simo Sorce Samba Team GPL Compliance Officer [EMAIL PROTECTED] Senior Software Engineer at Red Hat Inc. [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Will this binary work on solaris x86?
You need x86 binaries. And you can likely get them for samba (and many other packages) at http://sunfreeware.com/ or http://blastwave.org/ -- Tim Evans, TKEvans.com, Inc.| 5 Chestnut Court UNIX System Admin Consulting| Owings Mills, MD 21117 http://www.tkevans.com/ | 443-394-3864 http://www.come-here.com/News/ | [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Mounting shares with spaces in names?
Anyone know if it's possible to mount a share with spaces in the name? I'm working on an embedded platform with busybox ash, and a recent (3.0.25a) samba installation. I've tried various combinations of mount.cifs //share/'with space' mount.cifs //share/with\ space mount.cifs //share/with space and a few others I've forgotten and they all fail. I'm not sure if this is a busybox issue with handling whitespace in ash, or a samba problem. Are shares with spaces valid? If so can mount.cifs handle them? And if so, how? Thanks, --Yan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: Samba PDC issue
Charles Marcus wrote: On 11/16/2007, Tarak Ranjan ([EMAIL PROTECTED]) wrote: Hi, As my user's profile store in /home/user/profile if i use logon home = \\%L\home\%U\profile that will fine or not As I learned recently, this is not advised. User profiles should always be stored in an entirely separate share, ie: homes in: \server\home\user and profiles in: \server\profiles$\user I use the $ at the end of the profiles share to hide it... If i want to upgrade from 2.2 to 3.0.26a, and if i have to stores the user's profile into separate location as you mentioned ... so what are the things have to do, -- Thanks Warm Regards, _ Tarak Ranjan Mukherjee E@: [EMAIL PROTECTED] IM: [EMAIL PROTECTED] Online Learning|Certifications|Learning Solutions : www.liqwidkrystal.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] lib/util_str.c:safe_strcpy ERROR: string overflow by 1
Ken Smith wrote: Hi, I've seeing the following error messages recorded in logwatch against samba in two FC6 XA-64 systems with samba 3.0.24-7. lib/util_str.c:safe_strcpy_fn(603) ERROR: string overflow by 1 (24 - 23) in safe_strcpy The main share in use on the first machine is via the guest account with Vista and XP clients, the other has more conventional shares with the Vista PC's as domain members and acl's in use. I've seen some weird behaviour with the Vista clients at the first site. For example a Vista machine can create a folder but can't rename it. Someone using a windows briefcase on their vista pc syncing to the samba share sees very poor performance. nmbd is running and dhcpd is giving wins details to the network. But does Vista take on the Wins info? Any ideas? Thanks in advance Ken Any one got any insight into this?? Thanks Ken -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba r25984 - in branches/SAMBA_4_0/source/lib/ldb: .
Author: metze Date: 2007-11-16 08:35:48 + (Fri, 16 Nov 2007) New Revision: 25984 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25984 Log: ldb: use MDLD macros from libreplace and use results to build share modules metze Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in branches/SAMBA_4_0/source/lib/ldb/configure.ac Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in === --- branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2007-11-16 08:31:42 UTC (rev 25983) +++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2007-11-16 08:35:48 UTC (rev 25984) @@ -47,6 +47,9 @@ $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) \ -DLIBDIR=\$(libdir)\ -DSHLIBEXT=\$(SHLIBEXT)\ -DUSE_MMAP=1 @CFLAGS@ +MDLD = @MDLD@ +MDLD_FLAGS = @MDLD_FLAGS@ + LDB_LIB = $(STATICLIB) LIB_FLAGS=$(LDFLAGS) -Llib $(LDB_LIB) $(LIBS) $(POPT_LIBS) $(TALLOC_LIBS) \ @@ -125,8 +128,8 @@ lib/libnss_ldb.$(SHLIBEXT).2: $(NSS_OBJ) $(SOLIB) $(CC) $(SHLD_FLAGS) -o $@ $(NSS_OBJ) $(LDFLAGS) $(SOLIB) @[EMAIL PROTECTED](SHLIBEXT).2 -sample_module.$(SHLIBEXT): tests/sample_module.o - $(CC) $(SHLD_FLAGS) $(LDFLAGS) -o $@ tests/sample_module.o +sample_module.$(SHLIBEXT): tests/sample_module.o + $(MDLD) $(MDLD_FLAGS) -o $@ tests/sample_module.o bin/ldbadd: tools/ldbadd.o tools/cmdline.o $(LIBS) $(CC) -o bin/ldbadd tools/ldbadd.o tools/cmdline.o $(LIB_FLAGS) $(LD_EXPORT_DYNAMIC) Modified: branches/SAMBA_4_0/source/lib/ldb/configure.ac === --- branches/SAMBA_4_0/source/lib/ldb/configure.ac 2007-11-16 08:31:42 UTC (rev 25983) +++ branches/SAMBA_4_0/source/lib/ldb/configure.ac 2007-11-16 08:35:48 UTC (rev 25984) @@ -72,6 +72,8 @@ AC_LD_SHLDFLAGS AC_LD_SHLIBEXT AC_LD_SONAMEFLAG +AC_LIBREPLACE_MDLD +AC_LIBREPLACE_MDLD_FLAGS m4_include(libldb.m4) AC_OUTPUT(Makefile ldb.pc)
svn commit: samba r25983 - in branches/SAMBA_4_0/source/lib/ldb: .
Author: metze Date: 2007-11-16 08:31:42 + (Fri, 16 Nov 2007) New Revision: 25983 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25983 Log: ldb: link shared library against $(LDAP_LIBS) metze Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in === --- branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2007-11-16 08:30:32 UTC (rev 25982) +++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2007-11-16 08:31:42 UTC (rev 25983) @@ -96,7 +96,7 @@ STATICLIB = lib/libldb.a $(SOLIB): $(OBJS) - $(CC) $(SHLD_FLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) $(TALLOC_LIBS) $(TDB_LIBS) @[EMAIL PROTECTED](SONAME) + $(CC) $(SHLD_FLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) $(TALLOC_LIBS) $(TDB_LIBS) $(LDAP_LIBS) @[EMAIL PROTECTED](SONAME) all: showflags dirs $(OBJS) $(STATICLIB) $(SOLIB) $(BINS) $(EXAMPLES) manpages
Re: [SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-322-g11bcdf7
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Summary of changes: source/configure.in| 12 source/lib/replace/system/capability.h |9 + Hi Michael, if the result of the configure test should be used by lib/replace/ headers, then the configure test should also be in lib/replace/ metze -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iD8DBQFHPU0lm70gjA5TCD8RAgzhAJ4yNHR2CqSXW6AFxxP0vxNPng4lsACgjHd+ H3LgCVOsFXt5+ZXZp6kwffA= =r4oe -END PGP SIGNATURE-
svn commit: samba r25985 - in branches/SAMBA_4_0/source/build/m4: .
Author: metze Date: 2007-11-16 08:38:32 + (Fri, 16 Nov 2007) New Revision: 25985 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25985 Log: build: SHLD_UNDEF_FLAGS isn't used anymore metze Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4 Changeset: Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4 === --- branches/SAMBA_4_0/source/build/m4/check_ld.m4 2007-11-16 08:35:48 UTC (rev 25984) +++ branches/SAMBA_4_0/source/build/m4/check_ld.m4 2007-11-16 08:38:32 UTC (rev 25985) @@ -18,7 +18,6 @@ AC_SUBST(LD) AC_SUBST(LDFLAGS) AC_SUBST(SHLD) -AC_SUBST(SHLD_UNDEF_FLAGS) # Assume non-shared by default and override below # these are the defaults, good for lots of systems @@ -46,7 +45,6 @@ case $host_os in *linux*) BLDSHARED=true - SHLD_UNDEF_FLAGS=-Wl,--allow-shlib-undefined LDFLAGS=$LDFLAGS -Wl,--export-dynamic ;; *solaris*)
svn commit: samba r25993 - in branches/SAMBA_4_0/source/build/m4: .
Author: metze Date: 2007-11-16 10:39:52 + (Fri, 16 Nov 2007) New Revision: 25993 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25993 Log: build: HOSTLD should always match HOSTCC if not specified metze Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4 Changeset: Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4 === --- branches/SAMBA_4_0/source/build/m4/check_ld.m4 2007-11-16 10:21:57 UTC (rev 25992) +++ branches/SAMBA_4_0/source/build/m4/check_ld.m4 2007-11-16 10:39:52 UTC (rev 25993) @@ -29,13 +29,7 @@ # allow for --with-hostld=gcc AC_ARG_WITH(hostld,[ --with-hostld=linkerchoose host linker], [HOSTLD=$withval], -[ -if test z$cross_compiling = yes; then - HOSTLD='$(HOSTCC)' -else - HOSTLD='$(LD)' -fi -]) +[HOSTLD=$HOSTCC]) AC_MSG_CHECKING([whether to try to build shared libraries on $host_os])
svn commit: samba r25990 - in branches/SAMBA_4_0/source/lib/talloc: .
Author: metze
Date: 2007-11-16 10:17:26 + (Fri, 16 Nov 2007)
New Revision: 25990
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25990
Log:
talloc: use AC_LIBREPLACE_SHLD and use it for linking the shared library
metze
Modified:
branches/SAMBA_4_0/source/lib/talloc/Makefile.in
branches/SAMBA_4_0/source/lib/talloc/configure.ac
Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/Makefile.in
===
--- branches/SAMBA_4_0/source/lib/talloc/Makefile.in2007-11-16 10:15:26 UTC
(rev 25989)
+++ branches/SAMBA_4_0/source/lib/talloc/Makefile.in2007-11-16 10:17:26 UTC
(rev 25990)
@@ -17,6 +17,7 @@
PICFLAG = @PICFLAG@
PACKAGE_VERSION = @PACKAGE_VERSION@
SHLIBEXT = @SHLIBEXT@
+SHLD = @SHLD@
SHLD_FLAGS = @SHLD_FLAGS@
.SUFFIXES: .c .o .3 .3.xml .xml .html
@@ -44,7 +45,7 @@
@-ranlib $@
$(SOLIB): $(LIBOBJ)
- $(CC) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @[EMAIL PROTECTED](SONAME)
+ $(SHLD) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @[EMAIL PROTECTED](SONAME)
install: all
${INSTALLCMD} -d $(DESTDIR)$(libdir)
Modified: branches/SAMBA_4_0/source/lib/talloc/configure.ac
===
--- branches/SAMBA_4_0/source/lib/talloc/configure.ac 2007-11-16 10:15:26 UTC
(rev 25989)
+++ branches/SAMBA_4_0/source/lib/talloc/configure.ac 2007-11-16 10:17:26 UTC
(rev 25990)
@@ -18,6 +18,7 @@
AC_LD_PICFLAG
AC_LD_SHLIBEXT
AC_LD_SONAMEFLAG
+AC_LIBREPLACE_SHLD
AC_LIBREPLACE_SHLD_FLAGS
AC_OUTPUT(Makefile talloc.pc)
svn commit: samba r25994 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: metze
Date: 2007-11-16 10:41:35 + (Fri, 16 Nov 2007)
New Revision: 25994
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25994
Log:
build: use HOSTCC, HOSTCC_FLAGS, HOSTLD and HOSTLD_FLAGS
metze
Modified:
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2007-11-16
10:39:52 UTC (rev 25993)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2007-11-16
10:41:35 UTC (rev 25994)
@@ -123,7 +123,7 @@
# Dependencies for host objects
HDEPENDS = \$(CC) -M -MG -MP -MT \$(:.c=.ho) -MT \$@ \\
`\$(PERL) \$(srcdir)/script/cflags.pl [EMAIL PROTECTED] \\
-\$(HOSTCC_CFLAGS) \$(FIRST_PREREQ) -o \$@
+\$(HOSTCC_FLAGS) \$(FIRST_PREREQ) -o \$@
# Dependencies for precompiled headers
PCHDEPENDS = \$(CC) -M -MG -MT include/includes.h.gch -MT \$@ \\
\$(CFLAGS) \$(FIRST_PREREQ) -o \$@
@@ -146,7 +146,7 @@
# Run the compiler for the build host
HCOMPILE = \$(HOSTCC) `\$(PERL) \$(srcdir)/script/cflags.pl [EMAIL PROTECTED]
\\
-\$(HOSTCC_CFLAGS) -c \$(FIRST_PREREQ) -o \$@
+\$(HOSTCC_FLAGS) -c \$(FIRST_PREREQ) -o \$@
# Precompile headers
PCHCOMPILE = @\$(CC) -Ilib/replace \\
@@ -188,17 +188,11 @@
CFLAGS=$self-{config}-{CFLAGS} \$(CPPFLAGS)
PICFLAG=$self-{config}-{PICFLAG}
-HOSTCC=$self-{config}-{HOSTCC}
-HOSTCC_CFLAGS=-D_SAMBA_HOSTCC_ $self-{config}-{CFLAGS} \$(CPPFLAGS)
-
INSTALL_LINK_FLAGS=$extra_link_flags
LD=$self-{config}-{LD}
LDFLAGS=$self-{config}-{LDFLAGS} -L$libdir
-HOSTLD=$self-{config}-{HOSTLD}
-# It's possible that we ought to have HOSTLD_LDFLAGS as well
-
STLD=$self-{config}-{STLD}
STLD_FLAGS=$self-{config}-{STLD_FLAGS}
@@ -210,6 +204,12 @@
SHLIBEXT=$self-{config}-{SHLIBEXT}
+HOSTCC=$self-{config}-{HOSTCC}
+HOSTCC_FLAGS=-D_SAMBA_HOSTCC_ $self-{config}-{CFLAGS} \$(CPPFLAGS)
+
+HOSTLD=$self-{config}-{HOSTLD}
+HOSTLD_FLAGS=$self-{config}-{LDFLAGS}
+
XSLTPROC=$self-{config}-{XSLTPROC}
LEX=$self-{config}-{LEX}
@@ -505,7 +505,7 @@
if (defined($ctx-{USE_HOSTCC}) $ctx-{USE_HOSTCC} eq YES) {
$self-output( __EOD__
- [EMAIL PROTECTED](HOSTLD) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
+ [EMAIL PROTECTED](HOSTLD) \$(HOSTLD_FLAGS) -o \$\@
\$(INSTALL_LINK_FLAGS) \\
\$\($ctx-{TYPE}_$ctx-{NAME}_LINK_FLAGS)
__EOD__
);
svn commit: samba r25986 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze Date: 2007-11-16 09:31:49 + (Fri, 16 Nov 2007) New Revision: 25986 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25986 Log: libreplace: warn about unresolved symbols when link shared libraries On Tru64 and Mac OS X this hopefully works Note: -Wl,--no-allow-shlib-undefined doesn't tests what we want on Linux. metze Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 === --- branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16 08:38:32 UTC (rev 25985) +++ branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16 09:31:49 UTC (rev 25986) @@ -110,8 +110,11 @@ SHLD_FLAGS=-b fi ;; + *osf*) + SHLD_FLAGS=-shared -warning_unresolved + ;; *darwin*) - SHLD_FLAGS=-bundle -flat_namespace -undefined suppress -Wl,-search_paths_first + SHLD_FLAGS=-bundle -flat_namespace -undefined warning -Wl,-search_paths_first ;; esac
svn commit: samba r25989 - in branches/SAMBA_4_0/source/build/m4: .
Author: metze
Date: 2007-11-16 10:15:26 + (Fri, 16 Nov 2007)
New Revision: 25989
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25989
Log:
build: use AC_LIBREPLACE_SHLD
metze
Modified:
branches/SAMBA_4_0/source/build/m4/check_ld.m4
Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_ld.m4 2007-11-16 10:14:48 UTC
(rev 25988)
+++ branches/SAMBA_4_0/source/build/m4/check_ld.m4 2007-11-16 10:15:26 UTC
(rev 25989)
@@ -17,7 +17,6 @@
AC_SUBST(BLDSHARED)
AC_SUBST(LD)
AC_SUBST(LDFLAGS)
-AC_SUBST(SHLD)
# Assume non-shared by default and override below
# these are the defaults, good for lots of systems
@@ -25,7 +24,6 @@
STLD_FLAGS=-rcs
BLDSHARED=false
LD=${CC}
-SHLD=${CC}
PICFLAG=
# allow for --with-hostld=gcc
@@ -68,7 +66,6 @@
;;
*irix*)
BLDSHARED=true
- SHLD=${PROG_LD}
;;
*aix*)
BLDSHARED=true
@@ -112,6 +109,7 @@
AC_LD_EXPORT_DYNAMIC
AC_LD_SHLIBEXT
AC_LD_SONAMEFLAG
+AC_LIBREPLACE_SHLD
AC_LIBREPLACE_SHLD_FLAGS
AC_LIBREPLACE_MDLD
AC_LIBREPLACE_MDLD_FLAGS
svn commit: samba r25988 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze
Date: 2007-11-16 10:14:48 + (Fri, 16 Nov 2007)
New Revision: 25988
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25988
Log:
libreplace: add AC_LIBREPLACE_SHLD
metze
Modified:
branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4
Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4
===
--- branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16
10:10:58 UTC (rev 25987)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16
10:14:48 UTC (rev 25988)
@@ -78,6 +78,19 @@
AC_SUBST(PICFLAG)
])
+AC_DEFUN([AC_LIBREPLACE_SHLD],
+[
+ SHLD=${CC}
+
+ case $host_os in
+ *irix*)
+ SHLD=${PROG_LD}
+ ;;
+ esac
+
+ AC_SUBST(SHLD)
+])
+
AC_DEFUN([AC_LIBREPLACE_SHLD_FLAGS],
[
SHLD_FLAGS=-shared
svn commit: samba r25999 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze
Date: 2007-11-16 11:48:59 + (Fri, 16 Nov 2007)
New Revision: 25999
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25999
Log:
libreplace: add AC_LIBREPLACE_STLD and AC_LIBREPLACE_STLD_FLAGS
metze
Modified:
branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4
Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4
===
--- branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16
11:40:52 UTC (rev 25998)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16
11:48:59 UTC (rev 25999)
@@ -3,6 +3,21 @@
#http://www.fortran-2000.com/ArnaudRecipes/sharedlib.html
#
+AC_DEFUN([AC_LIBREPLACE_STLD],
+[
+ AC_PATH_PROG(PROG_AR, ar)
+
+ STLD=${PROG_AR}
+
+ AC_SUBST(STLD)
+])
+
+AC_DEFUN([AC_LIBREPLACE_STLD_FLAGS],
+[
+ STLD_FLAGS=-rcs
+ AC_SUBST(STLD_FLAGS)
+])
+
AC_DEFUN([AC_LD_EXPORT_DYNAMIC],
[
saved_LDFLAGS=$LDFLAGS
Re: svn commit: samba r25998 - in branches/SAMBA_4_0: . source/lib/replace
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] schrieb: Author: jelmer Date: 2007-11-16 11:40:52 + (Fri, 16 Nov 2007) New Revision: 25998 +AC_DEFUN([AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR], +[ + case $host_os in + *linux*) + LIB_PATH_VAR=LD_LIBRARY_PATH + ;; + *solaris*) + LIB_PATH_VAR=LD_LIBRARY_PATH + ;; + *hpux*) + LIB_PATH_VAR=SHLIB_PATH + ;; + *tru64*) + LIB_PATH_VAR=LD_LIBRARY_PATH tru64 should use *osf* here can you also rename the macro to AC_LIBREPLACE_LIB_PATH_VAR or the exported var to RUNTIME_LIB_PATH_VAR metze -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iD8DBQFHPYMBm70gjA5TCD8RAgkQAJ4/5KCJrj8cCCDACS1tdHSPapBuqgCeOGsv desp48IUrzVYSTAWK3pW5Vg= =i9Ss -END PGP SIGNATURE-
svn commit: samba r25996 - in branches/SAMBA_4_0/source: . build/smb_build
Author: metze
Date: 2007-11-16 11:27:48 + (Fri, 16 Nov 2007)
New Revision: 25996
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25996
Log:
build: rename LD - BNLD and LDFLAGS - BNLD_FLAGS
metze
Modified:
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/main.mk
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2007-11-16
10:53:16 UTC (rev 25995)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2007-11-16
11:27:48 UTC (rev 25996)
@@ -190,8 +190,8 @@
INSTALL_LINK_FLAGS=$extra_link_flags
-LD=$self-{config}-{LD}
-LDFLAGS=$self-{config}-{LDFLAGS} -L$libdir
+BNLD=$self-{config}-{LD}
+BNLD_FLAGS=$self-{config}-{LDFLAGS} -L$libdir
STLD=$self-{config}-{STLD}
STLD_FLAGS=$self-{config}-{STLD_FLAGS}
@@ -511,7 +511,7 @@
);
} else {
$self-output( __EOD__
- [EMAIL PROTECTED](LD) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
+ [EMAIL PROTECTED](BNLD) \$(BNLD_FLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
\$\($ctx-{TYPE}_$ctx-{NAME}_LINK_FLAGS)
__EOD__
Modified: branches/SAMBA_4_0/source/main.mk
===
--- branches/SAMBA_4_0/source/main.mk 2007-11-16 10:53:16 UTC (rev 25995)
+++ branches/SAMBA_4_0/source/main.mk 2007-11-16 11:27:48 UTC (rev 25996)
@@ -77,8 +77,8 @@
@echo ' CC = $(CC)'
@echo ' CFLAGS = $(CFLAGS)'
@echo ' PICFLAG= $(PICFLAG)'
- @echo ' LD = $(LD)'
- @echo ' LDFLAGS= $(LDFLAGS)'
+ @echo ' BNLD = $(BNLD)'
+ @echo ' BNLD_FLAGS = $(BNLD_FLAGS)'
@echo ' STLD = $(STLD)'
@echo ' STLD_FLAGS = $(STLD_FLAGS)'
@echo ' SHLD = $(SHLD)'
svn commit: samba r25995 - in branches/SAMBA_4_0/source: .
Author: metze Date: 2007-11-16 10:53:16 + (Fri, 16 Nov 2007) New Revision: 25995 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25995 Log: build: print out MDLD and MDLD_FLAGS with make showflags metze Modified: branches/SAMBA_4_0/source/main.mk Changeset: Modified: branches/SAMBA_4_0/source/main.mk === --- branches/SAMBA_4_0/source/main.mk 2007-11-16 10:41:35 UTC (rev 25994) +++ branches/SAMBA_4_0/source/main.mk 2007-11-16 10:53:16 UTC (rev 25995) @@ -83,6 +83,8 @@ @echo ' STLD_FLAGS = $(STLD_FLAGS)' @echo ' SHLD = $(SHLD)' @echo ' SHLD_FLAGS = $(SHLD_FLAGS)' + @echo ' MDLD = $(MDLD)' + @echo ' MDLD_FLAGS = $(MDLD_FLAGS)' @echo ' SHLIBEXT = $(SHLIBEXT)' @echo ' srcdir = $(srcdir)' @echo ' builddir = $(builddir)'
svn commit: samba r25987 - in branches/SAMBA_4_0/source: build/m4 lib/ldb lib/replace lib/talloc lib/tdb
Author: metze Date: 2007-11-16 10:10:58 + (Fri, 16 Nov 2007) New Revision: 25987 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25987 Log: libreplace: rename AC_LD_SHLDFLAGS into AC_LIBREPLACE_SHLD_FLAGS metze Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4 branches/SAMBA_4_0/source/lib/ldb/configure.ac branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 branches/SAMBA_4_0/source/lib/talloc/configure.ac branches/SAMBA_4_0/source/lib/tdb/configure.ac Changeset: Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4 === --- branches/SAMBA_4_0/source/build/m4/check_ld.m4 2007-11-16 09:31:49 UTC (rev 25986) +++ branches/SAMBA_4_0/source/build/m4/check_ld.m4 2007-11-16 10:10:58 UTC (rev 25987) @@ -110,9 +110,9 @@ AC_LD_PICFLAG AC_LD_EXPORT_DYNAMIC -AC_LD_SHLDFLAGS AC_LD_SHLIBEXT AC_LD_SONAMEFLAG +AC_LIBREPLACE_SHLD_FLAGS AC_LIBREPLACE_MDLD AC_LIBREPLACE_MDLD_FLAGS Modified: branches/SAMBA_4_0/source/lib/ldb/configure.ac === --- branches/SAMBA_4_0/source/lib/ldb/configure.ac 2007-11-16 09:31:49 UTC (rev 25986) +++ branches/SAMBA_4_0/source/lib/ldb/configure.ac 2007-11-16 10:10:58 UTC (rev 25987) @@ -69,9 +69,9 @@ AC_LD_EXPORT_DYNAMIC AC_LD_PICFLAG -AC_LD_SHLDFLAGS AC_LD_SHLIBEXT AC_LD_SONAMEFLAG +AC_LIBREPLACE_SHLD_FLAGS AC_LIBREPLACE_MDLD AC_LIBREPLACE_MDLD_FLAGS Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 === --- branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16 09:31:49 UTC (rev 25986) +++ branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16 10:10:58 UTC (rev 25987) @@ -78,7 +78,7 @@ AC_SUBST(PICFLAG) ]) -AC_DEFUN([AC_LD_SHLDFLAGS], +AC_DEFUN([AC_LIBREPLACE_SHLD_FLAGS], [ SHLD_FLAGS=-shared Modified: branches/SAMBA_4_0/source/lib/talloc/configure.ac === --- branches/SAMBA_4_0/source/lib/talloc/configure.ac 2007-11-16 09:31:49 UTC (rev 25986) +++ branches/SAMBA_4_0/source/lib/talloc/configure.ac 2007-11-16 10:10:58 UTC (rev 25987) @@ -18,6 +18,6 @@ AC_LD_PICFLAG AC_LD_SHLIBEXT AC_LD_SONAMEFLAG -AC_LD_SHLDFLAGS +AC_LIBREPLACE_SHLD_FLAGS AC_OUTPUT(Makefile talloc.pc) Modified: branches/SAMBA_4_0/source/lib/tdb/configure.ac === --- branches/SAMBA_4_0/source/lib/tdb/configure.ac 2007-11-16 09:31:49 UTC (rev 25986) +++ branches/SAMBA_4_0/source/lib/tdb/configure.ac 2007-11-16 10:10:58 UTC (rev 25987) @@ -8,7 +8,7 @@ AC_LIBREPLACE_ALL_CHECKS AC_LD_SONAMEFLAG AC_LD_PICFLAG -AC_LD_SHLDFLAGS AC_LD_SHLIBEXT +AC_LIBREPLACE_SHLD_FLAGS m4_include(libtdb.m4) AC_OUTPUT(Makefile tdb.pc)
svn commit: samba r25982 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze Date: 2007-11-16 08:30:32 + (Fri, 16 Nov 2007) New Revision: 25982 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25982 Log: libreplace: try to ignore unresolved symbols in modules on Tru64 metze Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 === --- branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16 04:18:22 UTC (rev 25981) +++ branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16 08:30:32 UTC (rev 25982) @@ -223,6 +223,9 @@ MDLD_FLAGS=-b fi ;; + *osf*) + MDLD_FLAGS=-shared -expect_unresolved '*' + ;; *darwin*) MDLD_FLAGS=-bundle -flat_namespace -undefined suppress -Wl,-search_paths_first ;;
svn commit: samba r25991 - in branches/SAMBA_4_0/source/lib/tdb: .
Author: metze Date: 2007-11-16 10:19:46 + (Fri, 16 Nov 2007) New Revision: 25991 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25991 Log: tdb: use AC_LIBREPLACE_SHLD and use it for linking the shared library metze Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in branches/SAMBA_4_0/source/lib/tdb/configure.ac Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in === --- branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2007-11-16 10:17:26 UTC (rev 25990) +++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2007-11-16 10:19:46 UTC (rev 25991) @@ -16,6 +16,7 @@ CFLAGS = $(CPPFLAGS) @CFLAGS@ LDFLAGS = @LDFLAGS@ EXEEXT = @EXEEXT@ +SHLD = @SHLD@ SHLD_FLAGS = @SHLD_FLAGS@ PACKAGE_VERSION = @PACKAGE_VERSION@ PICFLAG = @PICFLAG@ @@ -73,7 +74,7 @@ ln -s $ $@ $(SOLIB): $(TDB_OBJ) - $(CC) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) @[EMAIL PROTECTED](SONAME) + $(SHLD) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) @[EMAIL PROTECTED](SONAME) TDB_LIB = libtdb.a Modified: branches/SAMBA_4_0/source/lib/tdb/configure.ac === --- branches/SAMBA_4_0/source/lib/tdb/configure.ac 2007-11-16 10:17:26 UTC (rev 25990) +++ branches/SAMBA_4_0/source/lib/tdb/configure.ac 2007-11-16 10:19:46 UTC (rev 25991) @@ -9,6 +9,7 @@ AC_LD_SONAMEFLAG AC_LD_PICFLAG AC_LD_SHLIBEXT +AC_LIBREPLACE_SHLD AC_LIBREPLACE_SHLD_FLAGS m4_include(libtdb.m4) AC_OUTPUT(Makefile tdb.pc)
svn commit: samba r25992 - in branches/SAMBA_4_0/source/lib/ldb: .
Author: metze Date: 2007-11-16 10:21:57 + (Fri, 16 Nov 2007) New Revision: 25992 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25992 Log: ldb: use AC_LIBREPLACE_SHLD and use it for linking shared libraries metze Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in branches/SAMBA_4_0/source/lib/ldb/configure.ac Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in === --- branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2007-11-16 10:19:46 UTC (rev 25991) +++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2007-11-16 10:21:57 UTC (rev 25992) @@ -37,6 +37,7 @@ SHLIBEXT = @SHLIBEXT@ LD_EXPORT_DYNAMIC = @LD_EXPORT_DYNAMIC@ +SHLD = @SHLD@ SHLD_FLAGS = @SHLD_FLAGS@ LDFLAGS = @LDFLAGS@ @@ -99,7 +100,7 @@ STATICLIB = lib/libldb.a $(SOLIB): $(OBJS) - $(CC) $(SHLD_FLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) $(TALLOC_LIBS) $(TDB_LIBS) $(LDAP_LIBS) @[EMAIL PROTECTED](SONAME) + $(SHLD) $(SHLD_FLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) $(TALLOC_LIBS) $(TDB_LIBS) $(LDAP_LIBS) @[EMAIL PROTECTED](SONAME) all: showflags dirs $(OBJS) $(STATICLIB) $(SOLIB) $(BINS) $(EXAMPLES) manpages @@ -126,7 +127,7 @@ @-ranlib $@ lib/libnss_ldb.$(SHLIBEXT).2: $(NSS_OBJ) $(SOLIB) - $(CC) $(SHLD_FLAGS) -o $@ $(NSS_OBJ) $(LDFLAGS) $(SOLIB) @[EMAIL PROTECTED](SHLIBEXT).2 + $(SHLD) $(SHLD_FLAGS) -o $@ $(NSS_OBJ) $(LDFLAGS) $(SOLIB) @[EMAIL PROTECTED](SHLIBEXT).2 sample_module.$(SHLIBEXT): tests/sample_module.o $(MDLD) $(MDLD_FLAGS) -o $@ tests/sample_module.o Modified: branches/SAMBA_4_0/source/lib/ldb/configure.ac === --- branches/SAMBA_4_0/source/lib/ldb/configure.ac 2007-11-16 10:19:46 UTC (rev 25991) +++ branches/SAMBA_4_0/source/lib/ldb/configure.ac 2007-11-16 10:21:57 UTC (rev 25992) @@ -71,6 +71,7 @@ AC_LD_PICFLAG AC_LD_SHLIBEXT AC_LD_SONAMEFLAG +AC_LIBREPLACE_SHLD AC_LIBREPLACE_SHLD_FLAGS AC_LIBREPLACE_MDLD AC_LIBREPLACE_MDLD_FLAGS
svn commit: samba r25998 - in branches/SAMBA_4_0: . source/lib/replace
Author: jelmer Date: 2007-11-16 11:40:52 + (Fri, 16 Nov 2007) New Revision: 25998 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25998 Log: Add test for run time library path environment variable. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 === --- branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16 11:29:16 UTC (rev 25997) +++ branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16 11:40:52 UTC (rev 25998) @@ -249,3 +249,32 @@ AC_SUBST(MDLD_FLAGS) ]) + +AC_DEFUN([AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR], +[ + case $host_os in + *linux*) + LIB_PATH_VAR=LD_LIBRARY_PATH + ;; + *solaris*) + LIB_PATH_VAR=LD_LIBRARY_PATH + ;; + *hpux*) + LIB_PATH_VAR=SHLIB_PATH + ;; + *tru64*) + LIB_PATH_VAR=LD_LIBRARY_PATH + ;; + *aix*) + LIB_PATH_VAR=LIB_PATH + ;; + *irix*) + LIB_PATH_VAR=LD_LIBRARY_PATH + ;; + *darwin*) + LIB_PATH_VAR=DYLD_LIBRARY_PATH + ;; + esac + + AC_SUBST(LIB_PATH_VAR) +])
svn commit: samba-web r1154 - in trunk/security: .
Author: jerry
Date: 2007-11-16 14:21:54 + (Fri, 16 Nov 2007)
New Revision: 1154
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1154
Log:
Swap CVE-2007-{4572,5398}
Modified:
trunk/security/CVE-2007-4572.html
trunk/security/CVE-2007-5398.html
Changeset:
Modified: trunk/security/CVE-2007-4572.html
===
--- trunk/security/CVE-2007-4572.html 2007-11-15 23:33:50 UTC (rev 1153)
+++ trunk/security/CVE-2007-4572.html 2007-11-16 14:21:54 UTC (rev 1154)
@@ -8,25 +8,25 @@
body
- H2CVE-2007-5398 - Remote Code Execution in Samba's nmbd/H2
+ H2CVE-2007-4572 - GETDC mailslot processing buffer overrun in nmbd/H2
+
p
pre
==
==
-== Subject: Remote code execution in Samba's WINS
-== server daemon (nmbd) when processing name
-== registration followed name query requests.
+== Subject: Stack buffer overflow in nmbd's logon
+== request processing.
==
-== CVE ID#: CVE-2007-5398
+== CVE ID#: CVE-2007-4572
==
== Versions:Samba 3.0.0 - 3.0.26a (inclusive)
==
-== Summary: When nmbd has been configured as a WINS
-== server, a client can send a series of name
-== registration request followed by a specific
-== name query request packet and execute
-== arbitrary code.
+== Summary: Processing of specially crafted GETDC
+== mailslot requests can result in a buffer
+== overrun in nmbd. It is not believed that
+== that this issues can be exploited to
+== result in remote code execution.
==
==
@@ -34,10 +34,11 @@
Description
===
-Secunia Research reported a vulnerability that allows for
-the execution of arbitrary code in nmbd. This defect may
-only be exploited when the quot;wins supportquot; parameter has
-been enabled in smb.conf.
+Samba developers have discovered what is believed to be
+a non-exploitable buffer over in nmbd during the processing
+of GETDC logon server requests. This code is only used
+when the Samba server is configured as a Primary or Backup
+Domain Controller.
==
@@ -56,24 +57,26 @@
Workaround
==
-Samba administrators may avoid this security issue by
-disabling the quot;wins supportquot; feature in the hosts smb.conf
-file.
+Samba administrators may avoid this security issue by disabling
+both the quot;domain logonsquot; and the quot;domain masterquot; options
in in
+the server's smb.conf file. Note that this will disable all
+domain controller features as well.
===
Credits
===
-This vulnerability was reported to Samba developers by
-Alin Rad Pop, Secunia Research.
+This vulnerability was discovered by Samba developers during
+an internal code audit.
The time line is as follows:
-* Oct 30, 2007: Initial report to [EMAIL PROTECTED]
-* Oct 30, 2007: First response from Samba developers confirming
- the bug along with a proposed patch.
-* Nov 15, 2007: Public security advisory to be made available.
+* Sep 13, 2007: Initial report to [EMAIL PROTECTED] including
+ proposed patch.
+* Sep 14, 2007: Patch review by members of the Josh Bressers
+ (RedHat Security Team) and Simo Sorce (Samba/RedHat developer)
+* Nov 15, 2007: Public security advisory made available.
==
Modified: trunk/security/CVE-2007-5398.html
===
--- trunk/security/CVE-2007-5398.html 2007-11-15 23:33:50 UTC (rev 1153)
+++ trunk/security/CVE-2007-5398.html 2007-11-16 14:21:54 UTC (rev 1154)
@@ -8,25 +8,25 @@
body
- H2CVE-2007-4572 - GETDC mailslot processing buffer overrun in nmbd/H2
+ H2CVE-2007-5398 - Remote Code Execution in Samba's nmbd/H2
-
p
pre
==
==
-== Subject: Stack buffer overflow in nmbd's logon
-== request processing.
+== Subject: Remote code execution in Samba's WINS
+== server daemon (nmbd) when processing name
+== registration followed name query requests.
==
-== CVE ID#: CVE-2007-4572
+== CVE ID#: CVE-2007-5398
==
== Versions:Samba 3.0.0 - 3.0.26a (inclusive)
==
-== Summary: Processing of specially crafted GETDC
-== mailslot requests can result in a buffer
-== overrun in nmbd. It is not believed that
-== that this issues can be exploited to
-== result in remote code execution.
+== Summary: When nmbd has been configured as a WINS
+== server, a client can send a series of name
+== registration request followed by a specific
+== name query request packet and execute
+== arbitrary code.
==
svn commit: samba r26004 - in branches/SAMBA_4_0: . source/auth/credentials source/auth/credentials/tests source/torture/local
Author: jelmer
Date: 2007-11-16 20:54:13 + (Fri, 16 Nov 2007)
New Revision: 26004
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26004
Log:
Add some simple credentials tests.
Added:
branches/SAMBA_4_0/source/auth/credentials/tests/
branches/SAMBA_4_0/source/auth/credentials/tests/simple.c
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/torture/local/config.mk
branches/SAMBA_4_0/source/torture/local/local.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Added: branches/SAMBA_4_0/source/auth/credentials/tests/simple.c
===
--- branches/SAMBA_4_0/source/auth/credentials/tests/simple.c 2007-11-16
20:12:00 UTC (rev 26003)
+++ branches/SAMBA_4_0/source/auth/credentials/tests/simple.c 2007-11-16
20:54:13 UTC (rev 26004)
@@ -0,0 +1,120 @@
+/*
+ Unix SMB/CIFS implementation.
+ Samba utility functions
+ Copyright (C) Jelmer Vernooij [EMAIL PROTECTED] 2007
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ 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, see http://www.gnu.org/licenses/.
+*/
+
+#include includes.h
+#include auth/credentials/credentials.h
+#include torture/torture.h
+
+static bool test_init(struct torture_context *tctx)
+{
+ struct cli_credentials *creds = cli_credentials_init(tctx);
+
+ cli_credentials_set_domain(creds, bla, CRED_SPECIFIED);
+
+ torture_assert_str_equal(tctx, BLA, cli_credentials_get_domain(creds),
+domain);
+
+ cli_credentials_set_username(creds, someuser, CRED_SPECIFIED);
+
+ torture_assert_str_equal(tctx, someuser,
+cli_credentials_get_username(creds),
+username);
+
+ cli_credentials_set_password(creds, p4ssw0rd, CRED_SPECIFIED);
+
+ torture_assert_str_equal(tctx, p4ssw0rd,
+cli_credentials_get_password(creds),
+password);
+
+ return true;
+}
+
+static bool test_init_anonymous(struct torture_context *tctx)
+{
+ struct cli_credentials *creds = cli_credentials_init_anon(tctx);
+
+ torture_assert_str_equal(tctx, cli_credentials_get_domain(creds),
+, domain);
+
+ torture_assert_str_equal(tctx, cli_credentials_get_username(creds),
+, username);
+
+ torture_assert(tctx, cli_credentials_get_password(creds) == NULL,
+password);
+
+ return true;
+}
+
+static bool test_parse_string(struct torture_context *tctx)
+{
+ struct cli_credentials *creds = cli_credentials_init_anon(tctx);
+
+ /* anonymous */
+ cli_credentials_parse_string(creds, %, CRED_SPECIFIED);
+
+ torture_assert_str_equal(tctx, cli_credentials_get_domain(creds),
+, domain);
+
+ torture_assert_str_equal(tctx, cli_credentials_get_username(creds),
+, username);
+
+ torture_assert(tctx, cli_credentials_get_password(creds) == NULL,
+password);
+
+ /* username + password */
+ cli_credentials_parse_string(creds, somebody%secret,
+CRED_SPECIFIED);
+
+ torture_assert_str_equal(tctx, cli_credentials_get_domain(creds),
+, domain);
+
+ torture_assert_str_equal(tctx, cli_credentials_get_username(creds),
+somebody, username);
+
+ torture_assert_str_equal(tctx, cli_credentials_get_password(creds),
+secret, password);
+
+ /* principal */
+ cli_credentials_parse_string(creds, [EMAIL PROTECTED],
+CRED_SPECIFIED);
+
+ torture_assert_str_equal(tctx, cli_credentials_get_realm(creds),
+STYX, realm);
+
+ torture_assert_str_equal(tctx,
+cli_credentials_get_principal(creds, tctx),
+[EMAIL PROTECTED], principal);
+
+ return true;
+}
+
+struct torture_suite *torture_local_credentials(TALLOC_CTX *mem_ctx)
+{
+ struct
svn commit: samba r26001 - in branches/SAMBA_4_0: . source/lib/replace
Author: jelmer
Date: 2007-11-16 20:11:48 + (Fri, 16 Nov 2007)
New Revision: 26001
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26001
Log:
Share some code between macros, add macro specifically for testing the ld flag
that allows undefined symbols.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4
===
--- branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16
11:50:11 UTC (rev 26000)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16
20:11:48 UTC (rev 26001)
@@ -214,54 +214,32 @@
AC_DEFUN([AC_LIBREPLACE_MDLD],
[
- MDLD=${CC}
-
- case $host_os in
- *irix*)
- MDLD=${PROG_LD}
- ;;
- esac
-
+ AC_LIBREPLACE_SHLD()
+ MDLD=$SHLD
AC_SUBST(MDLD)
])
-AC_DEFUN([AC_LIBREPLACE_MDLD_FLAGS],
+AC_DEFUN([AC_LIBREPLACE_LD_ALLOW_SHLIB_UNDEF_FLAG],
[
- MDLD_FLAGS=-shared
-
case $host_os in
*linux*)
- MDLD_FLAGS=-shared -Wl,-Bsymbolic
-Wl,--allow-shlib-undefined
+
SHLD_ALLOW_SHLIB_UNDEF_FLAG=-Wl,--allow-shlib-undefined
;;
- *solaris*)
- MDLD_FLAGS=-G
- if test ${GCC} = no; then
- ## ${CFLAGS} added for building 64-bit shared
- ## libs using Sun's Compiler
- NDLD_FLAGS=-G \${CFLAGS}
- fi
- ;;
- *sunos*)
- MDLD_FLAGS=-G
- ;;
- *aix*)
- MDLD_FLAGS=-Wl,-G,-bexpall,-bbigtoc
- ;;
- *hpux*)
- if test ${GCC} = yes; then
- MDLD_FLAGS=-shared
- else
- MDLD_FLAGS=-b
- fi
- ;;
*osf*)
- MDLD_FLAGS=-shared -expect_unresolved '*'
+ SHLD_ALLOW_SHLIB_UNDEF_FLAG=-expect_unresolved '*'
;;
*darwin*)
- MDLD_FLAGS=-bundle -flat_namespace -undefined suppress
-Wl,-search_paths_first
+ SHLD_ALLOW_SHLIB_UNDEF_FLAG=-undefined suppress
;;
- esac
+ esac
+ AC_SUBST(SHLD_ALLOW_SHLIB_UNDEF_FLAG)
+])
+AC_DEFUN([AC_LIBREPLACE_MDLD_FLAGS],
+[
+ AC_LIBREPLACE_SHLD_FLAGS()
+ AC_LIBREPLACE_LD_ALLOW_SHLIB_UNDEF_FLAG()
+ MDLD_FLAGS=$SHLD_FLAGS $SHLD_ALLOW_SHLIB_UNDEF_FLAG
AC_SUBST(MDLD_FLAGS)
])
svn commit: samba r26003 - in branches/SAMBA_4_0: . source/auth source/auth/credentials source/auth/gensec source/cldap_server source/cluster source/cluster/ctdb source/cluster/ctdb/client source/clus
Author: jelmer Date: 2007-11-16 20:12:00 + (Fri, 16 Nov 2007) New Revision: 26003 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26003 Log: Split up DB_WRAP, as first step in an attempt to sanitize dependencies. Added: branches/SAMBA_4_0/source/lib/ldb_wrap.c branches/SAMBA_4_0/source/lib/ldb_wrap.h branches/SAMBA_4_0/source/lib/tdb_wrap.c branches/SAMBA_4_0/source/lib/tdb_wrap.h branches/SAMBA_4_0/source/lib/util/util_ldb.c branches/SAMBA_4_0/source/lib/util/util_ldb.h Removed: branches/SAMBA_4_0/source/lib/db_wrap.c branches/SAMBA_4_0/source/lib/db_wrap.h branches/SAMBA_4_0/source/lib/gendb.c Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/auth/auth_sam.c branches/SAMBA_4_0/source/auth/config.mk branches/SAMBA_4_0/source/auth/credentials/credentials_files.c branches/SAMBA_4_0/source/auth/gensec/schannel_state.c branches/SAMBA_4_0/source/auth/sam.c branches/SAMBA_4_0/source/cldap_server/cldap_server.c branches/SAMBA_4_0/source/cldap_server/netlogon.c branches/SAMBA_4_0/source/cldap_server/rootdse.c branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c branches/SAMBA_4_0/source/cluster/ctdb/client/ctdb_client.c branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_ltdb.c branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c branches/SAMBA_4_0/source/cluster/ctdb/opendb_ctdb.c branches/SAMBA_4_0/source/cluster/local.c branches/SAMBA_4_0/source/dsdb/common/sidmap.c branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c branches/SAMBA_4_0/source/dsdb/samdb/samdb.c branches/SAMBA_4_0/source/dsdb/samdb/samdb_privilege.c branches/SAMBA_4_0/source/kdc/hdb-ldb.c branches/SAMBA_4_0/source/ldap_server/ldap_backend.c branches/SAMBA_4_0/source/lib/basic.mk branches/SAMBA_4_0/source/lib/dbwrap/dbwrap_tdb.c branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c branches/SAMBA_4_0/source/lib/messaging/config.mk branches/SAMBA_4_0/source/lib/messaging/messaging.c branches/SAMBA_4_0/source/lib/registry/ldb.c branches/SAMBA_4_0/source/lib/util/config.mk branches/SAMBA_4_0/source/libnet/libnet_become_dc.c branches/SAMBA_4_0/source/libnet/libnet_join.c branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c branches/SAMBA_4_0/source/libnet/libnet_unbecome_dc.c branches/SAMBA_4_0/source/nbt_server/dgram/netlogon.c branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c branches/SAMBA_4_0/source/ntptr/simple_ldb/ntptr_simple_ldb.c branches/SAMBA_4_0/source/ntvfs/common/brlock.c branches/SAMBA_4_0/source/ntvfs/common/notify.c branches/SAMBA_4_0/source/ntvfs/common/opendb_tdb.c branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c branches/SAMBA_4_0/source/ntvfs/posix/xattr_tdb.c branches/SAMBA_4_0/source/param/config.mk branches/SAMBA_4_0/source/param/secrets.c branches/SAMBA_4_0/source/param/share_ldb.c branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c branches/SAMBA_4_0/source/rpc_server/lsa/lsa.h branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c branches/SAMBA_4_0/source/scripting/ejs/smbcalls_ldb.c branches/SAMBA_4_0/source/scripting/ejs/smbcalls_reg.c branches/SAMBA_4_0/source/torture/ldap/schema.c branches/SAMBA_4_0/source/torture/ldap/uptodatevector.c branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c branches/SAMBA_4_0/source/torture/local/dbspeed.c branches/SAMBA_4_0/source/torture/rpc/spoolss_notify.c branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c Changeset: Sorry, the patch is too large (1887 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26003
svn commit: samba r26002 - in branches/SAMBA_4_0: . source/lib/replace
Author: jelmer Date: 2007-11-16 20:11:53 + (Fri, 16 Nov 2007) New Revision: 26002 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26002 Log: Use osf rather than tru64 - pointed out by metze. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 === --- branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16 20:11:48 UTC (rev 26001) +++ branches/SAMBA_4_0/source/lib/replace/libreplace_ld.m4 2007-11-16 20:11:53 UTC (rev 26002) @@ -255,7 +255,7 @@ *hpux*) LIB_PATH_VAR=SHLIB_PATH ;; - *tru64*) + *osf*) LIB_PATH_VAR=LD_LIBRARY_PATH ;; *aix*)
svn commit: samba r25997 - in branches/SAMBA_4_0/source/torture: .
Author: metze
Date: 2007-11-16 11:29:16 + (Fri, 16 Nov 2007)
New Revision: 25997
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25997
Log:
torture: fix variables passed by make gcov
metze
Modified:
branches/SAMBA_4_0/source/torture/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/torture/config.mk
===
--- branches/SAMBA_4_0/source/torture/config.mk 2007-11-16 11:27:48 UTC (rev
25996)
+++ branches/SAMBA_4_0/source/torture/config.mk 2007-11-16 11:29:16 UTC (rev
25997)
@@ -366,17 +366,21 @@
# End BINARY locktest
#
-GCOV_FLAGS = -ftest-coverage -fprofile-arcs
-GCOV_LIBS = -lgcov
+GCOV_CFLAGS = -ftest-coverage -fprofile-arcs
+GCOV_LDFLAGS = $(GCOV_CFLAGS) -lgcov
COV_TARGET = test
+COV_VARS = \
+ CFLAGS=$(CFLAGS) $(GCOV_CFLAGS) \
+ BNLD_FLAGS=$(BNLD_FLAGS) $(GCOV_LDFLAGS) \
+ SHLD_FLAGS=$(SHLD_FLAGS) $(GCOV_LDFLAGS) \
+ MDLD_FLAGS=$(MDLD_FLAGS) $(GCOV_LDFLAGS) \
+ HOSTCC_FLAGS=$(HOSTCC_FLAGS) $(GCOV_CFLAGS) \
+ HOSTLD_FLAGS=$(HOSTLD_FLAGS) $(GCOV_LDLAGS)
+
test_cov:
- @$(MAKE) $(COV_TARGET) \
- HOSTCC_CFLAGS=$(HOSTCC_CFLAGS) $(GCOV_FLAGS) \
- CFLAGS=$(CFLAGS) $(GCOV_FLAGS) \
- LDFLAGS=$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS) \
- SHLD_FLAGS=$(SHLD_FLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)
+ @$(MAKE) $(COV_TARGET) $(COV_VARS)
gcov: test_cov
for I in $(sort $(dir $(ALL_OBJS))); \
@@ -385,11 +389,7 @@
lcov-split:
rm -f samba.info
- @$(MAKE) $(COV_TARGET) \
- HOSTCC_CFLAGS=$(HOSTCC_CFLAGS) $(GCOV_FLAGS) \
- CFLAGS=$(CFLAGS) $(GCOV_FLAGS) \
- LDFLAGS=$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS) \
- SHLD_FLAGS=$(SHLD_FLAGS) $(GCOV_FLAGS) $(GCOV_LIBS) \
+ @$(MAKE) $(COV_TARGET) $(COV_VARS) \
TEST_OPTIONS=--analyse-cmd=\lcov --base-directory `pwd`
--directory . --capture --output-file samba.info -t\
-rm heimdal/lib/*/{lex,parse}.{gcda,gcno}
genhtml -o coverage samba.info
svn commit: samba r26000 - in branches/SAMBA_4_0/source/build/m4: .
Author: metze
Date: 2007-11-16 11:50:11 + (Fri, 16 Nov 2007)
New Revision: 26000
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26000
Log:
build: use AC_LIBREPLACE_STLD_* macros
metze
Modified:
branches/SAMBA_4_0/source/build/m4/check_ld.m4
Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_ld.m4 2007-11-16 11:48:59 UTC
(rev 25999)
+++ branches/SAMBA_4_0/source/build/m4/check_ld.m4 2007-11-16 11:50:11 UTC
(rev 26000)
@@ -10,18 +10,13 @@
LD=${PROG_LD}
AC_PROG_LD_GNU
LD=
-AC_PATH_PROG(PROG_AR, ar)
-AC_SUBST(STLD)
-AC_SUBST(STLD_FLAGS)
AC_SUBST(BLDSHARED)
AC_SUBST(LD)
AC_SUBST(LDFLAGS)
# Assume non-shared by default and override below
# these are the defaults, good for lots of systems
-STLD=${PROG_AR}
-STLD_FLAGS=-rcs
BLDSHARED=false
LD=${CC}
PICFLAG=
@@ -94,6 +89,9 @@
AC_SUBST(HOSTLD)
+AC_LIBREPLACE_STLD
+AC_LIBREPLACE_STLD_FLAGS
+
AC_MSG_CHECKING([STLD])
AC_MSG_RESULT([$STLD])
AC_MSG_CHECKING([STLD_FLAGS])
[SCM] Samba Shared Repository - branch v3-0-test updated - initial-v3-0-unstable-21-g183eea4
The branch, v3-0-test has been updated
via 183eea4909d6678ac382eac16a5873a1fa3fd065 (commit)
from 14ecfecbdf3e631f87d83337e06060724deb7756 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit 183eea4909d6678ac382eac16a5873a1fa3fd065
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Nov 16 13:12:51 2007 -0800
Fix smbfs to not trigger our paranoid checker.
Jeremy.
---
Summary of changes:
source/smbd/negprot.c |2 +-
source/smbd/reply.c |8
source/smbd/srvstr.c | 13 +++--
source/smbd/trans2.c | 40
4 files changed, 28 insertions(+), 35 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/negprot.c b/source/smbd/negprot.c
index bc7c75a..a84def0 100644
--- a/source/smbd/negprot.c
+++ b/source/smbd/negprot.c
@@ -346,7 +346,7 @@ static int reply_nt1(char *inbuf, char *outbuf)
SCVAL(outbuf,smb_vwv16+1,8);
p += 8;
}
- p += srvstr_push(outbuf, p, lp_workgroup(), -1,
+ p += srvstr_push(outbuf, p, lp_workgroup(), BUFFER_SIZE -
(p-outbuf),
STR_UNICODE|STR_TERMINATE|STR_NOALIGN);
DEBUG(3,(not using SPNEGO\n));
} else {
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index 55f62a2..54bf888 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -524,7 +524,7 @@ int reply_tcon_and_X(connection_struct *conn, char
*inbuf,char *outbuf,int lengt
if (Protocol PROTOCOL_NT1) {
set_message(outbuf,2,0,True);
p = smb_buf(outbuf);
- p += srvstr_push(outbuf, p, server_devicetype, -1,
+ p += srvstr_push(outbuf, p, server_devicetype, BUFFER_SIZE - (p
- outbuf),
STR_TERMINATE|STR_ASCII);
set_message_end(outbuf,p);
} else {
@@ -554,9 +554,9 @@ int reply_tcon_and_X(connection_struct *conn, char
*inbuf,char *outbuf,int lengt
}
p = smb_buf(outbuf);
- p += srvstr_push(outbuf, p, server_devicetype, -1,
+ p += srvstr_push(outbuf, p, server_devicetype, BUFFER_SIZE - (p
- outbuf),
STR_TERMINATE|STR_ASCII);
- p += srvstr_push(outbuf, p, fstype, -1,
+ p += srvstr_push(outbuf, p, fstype, BUFFER_SIZE - (p - outbuf),
STR_TERMINATE);
set_message_end(outbuf,p);
@@ -1766,7 +1766,7 @@ int reply_ctemp(connection_struct *conn, char *inbuf,char
*outbuf, int dum_size,
thing in the byte section. JRA */
SSVALS(p, 0, -1); /* what is this? not in spec */
#endif
- namelen = srvstr_push(outbuf, p, s, -1, STR_ASCII|STR_TERMINATE);
+ namelen = srvstr_push(outbuf, p, s, BUFFER_SIZE - (p - outbuf),
STR_ASCII|STR_TERMINATE);
p += namelen;
outsize = set_message_end(outbuf, p);
diff --git a/source/smbd/srvstr.c b/source/smbd/srvstr.c
index 409fd30..7dc2567 100644
--- a/source/smbd/srvstr.c
+++ b/source/smbd/srvstr.c
@@ -28,17 +28,10 @@ size_t srvstr_push_fn(const char *function, unsigned int
line,
const char *base_ptr, void *dest,
const char *src, int dest_len, int flags)
{
- size_t buf_used = PTR_DIFF(dest, base_ptr);
- if (dest_len == -1) {
- if (((ptrdiff_t)dest (ptrdiff_t)base_ptr) || (buf_used
(size_t)max_send)) {
-#if 0
- DEBUG(0, (Pushing string of 'unlimited' length into
non-SMB buffer!\n));
-#endif
- return push_string_fn(function, line, base_ptr, dest,
src, -1, flags);
- }
- return push_string_fn(function, line, base_ptr, dest, src,
max_send - buf_used, flags);
+ if (dest_len 0) {
+ return 0;
}
-
+
/* 'normal' push into size-specified buffer */
return push_string_fn(function, line, base_ptr, dest, src, dest_len,
flags);
}
diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index b2ce5b8..4b62343 100644
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -1283,7 +1283,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
p += 23;
nameptr = p;
p += align_string(outbuf, p, 0);
- len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE);
+ len = srvstr_push(outbuf, p, fname, space_remaining -
(p - pdata), STR_TERMINATE);
if (SVAL(outbuf, smb_flg2) FLAGS2_UNICODE_STRINGS) {
if (len 2) {
SCVAL(nameptr, -1, len - 2);
@@
[SCM] Samba Shared Repository - branch v3-0-test updated - initial-v3-0-unstable-22-gea97a10
The branch, v3-0-test has been updated
via ea97a10df5732dfcc931197a01d6446ed92b7658 (commit)
from 183eea4909d6678ac382eac16a5873a1fa3fd065 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit ea97a10df5732dfcc931197a01d6446ed92b7658
Author: Michael Adam [EMAIL PROTECTED]
Date: Fri Nov 16 22:26:26 2007 +0100
Fix for bug #4781: allow cleaning of /etc/mtab by canonicalizing mountpoint.
Canonicalize mountpoint by trimming trailing slashes before unmounting.
This allows for correct cleanup of /etc/mtab after unmounting.
Thanks to Steve Langasek [EMAIL PROTECTED].
Michael
---
Summary of changes:
source/client/umount.cifs.c |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/umount.cifs.c b/source/client/umount.cifs.c
index 3869e34..47ddd1e 100644
--- a/source/client/umount.cifs.c
+++ b/source/client/umount.cifs.c
@@ -342,6 +342,13 @@ int main(int argc, char ** argv)
/* fixup path if needed */
+ /* Trim any trailing slashes */
+ while ((strlen(mountpoint) 1)
+ (mountpoint[strlen(mountpoint)-1] == '/'))
+ {
+ mountpoint[strlen(mountpoint)-1] = '\0';
+ }
+
/* make sure that this is a cifs filesystem */
rc = statfs(mountpoint, statbuf);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-326-g118fd62
The branch, v3-2-test has been updated
via 118fd6213d5f6419f654e9226a41d527c04346f7 (commit)
via d2c7417393e58de12b5747b9d6c19aea3c343ea5 (commit)
from a1725f4ff7ed375808c78ac661b539557748d0a5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 118fd6213d5f6419f654e9226a41d527c04346f7
Author: Michael Adam [EMAIL PROTECTED]
Date: Fri Nov 16 22:26:26 2007 +0100
Fix for bug #4781: allow cleaning of /etc/mtab by canonicalizing mountpoint.
Canonicalize mountpoint by trimming trailing slashes before unmounting.
This allows for correct cleanup of /etc/mtab after unmounting.
Thanks to Steve Langasek [EMAIL PROTECTED].
Michael
commit d2c7417393e58de12b5747b9d6c19aea3c343ea5
Author: Michael Adam [EMAIL PROTECTED]
Date: Fri Nov 16 22:22:05 2007 +0100
Fix an implicit cast warning.
Michael
---
Summary of changes:
source/client/umount.cifs.c |7 +++
source/lib/readline.c |2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/umount.cifs.c b/source/client/umount.cifs.c
index d119575..ab94a20 100644
--- a/source/client/umount.cifs.c
+++ b/source/client/umount.cifs.c
@@ -341,6 +341,13 @@ int main(int argc, char ** argv)
/* fixup path if needed */
+ /* Trim any trailing slashes */
+ while ((strlen(mountpoint) 1)
+ (mountpoint[strlen(mountpoint)-1] == '/'))
+ {
+ mountpoint[strlen(mountpoint)-1] = '\0';
+ }
+
/* make sure that this is a cifs filesystem */
rc = statfs(mountpoint, statbuf);
diff --git a/source/lib/readline.c b/source/lib/readline.c
index 6fed929..7c12781 100644
--- a/source/lib/readline.c
+++ b/source/lib/readline.c
@@ -65,7 +65,7 @@ static char *smb_readline_replacement(const char *prompt,
void (*callback)(void)
}
if (line == NULL) {
- line = SMB_MALLOC(BUFSIZ);
+ line = (char *)SMB_MALLOC(BUFSIZ);
if (!line) {
return NULL;
}
--
Samba Shared Repository
svn commit: samba r26005 - in branches/SAMBA_4_0: . source/build/m4 source/build/smb_build source/dsdb
Author: jelmer
Date: 2007-11-16 21:50:31 + (Fri, 16 Nov 2007)
New Revision: 26005
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26005
Log:
Notice the user about LD_LIBRARY_PATH or equivalent when building with shared
libs.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/build/m4/check_ld.m4
branches/SAMBA_4_0/source/build/smb_build/main.pl
branches/SAMBA_4_0/source/dsdb/config.mk
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_ld.m4 2007-11-16 20:54:13 UTC
(rev 26004)
+++ branches/SAMBA_4_0/source/build/m4/check_ld.m4 2007-11-16 21:50:31 UTC
(rev 26005)
@@ -105,6 +105,7 @@
AC_LIBREPLACE_SHLD_FLAGS
AC_LIBREPLACE_MDLD
AC_LIBREPLACE_MDLD_FLAGS
+AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR
###
# test whether building a shared library actually works
Modified: branches/SAMBA_4_0/source/build/smb_build/main.pl
===
--- branches/SAMBA_4_0/source/build/smb_build/main.pl 2007-11-16 20:54:13 UTC
(rev 26004)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pl 2007-11-16 21:50:31 UTC
(rev 26005)
@@ -54,6 +54,8 @@
$mkenv-Integrated($key) if grep(/INTEGRATED/, @{$key-{OUTPUT_TYPE}});
}
+my $shared_libs_used = 0;
+
foreach my $key (values %$OUTPUT) {
next unless defined $key-{OUTPUT_TYPE};
@@ -62,6 +64,10 @@
and defined($key-{VERSION});
$mkenv-SharedLibrary($key) if $key-{TYPE} eq LIBRARY and
grep(/SHARED_LIBRARY/,
@{$key-{OUTPUT_TYPE}});
+ if ($key-{TYPE} eq LIBRARY and
+ ${$key-{OUTPUT_TYPE}}[0] eq SHARED_LIBRARY) {
+ $shared_libs_used = 1;
+ }
$mkenv-SharedModule($key) if $key-{TYPE} eq MODULE and
grep(/SHARED_LIBRARY/,
@{$key-{OUTPUT_TYPE}});
$mkenv-Binary($key) if grep(/BINARY/, @{$key-{OUTPUT_TYPE}});
@@ -77,7 +83,13 @@
cflags::create_cflags($OUTPUT, $config::config{srcdir},
$config::config{builddir}, extra_cflags.txt);
-
summary::show($OUTPUT, \%config::config);
+if ($shared_libs_used) {
+ print EOF;
+To run binaries without installing, set the following environment variable:
+ $config::config{LIB_PATH_VAR}=$config::config{builddir}/bin/shared
+EOF
+}
+
1;
Modified: branches/SAMBA_4_0/source/dsdb/config.mk
===
--- branches/SAMBA_4_0/source/dsdb/config.mk2007-11-16 20:54:13 UTC (rev
26004)
+++ branches/SAMBA_4_0/source/dsdb/config.mk2007-11-16 21:50:31 UTC (rev
26005)
@@ -9,7 +9,6 @@
PUBLIC_HEADERS = samdb/samdb.h
PUBLIC_DEPENDENCIES = LIBCLI_LDAP HEIMDAL_KRB5
PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS
-LDFLAGS = $(LIBRARY_ldb_OUTPUT)
OBJ_FILES = \
samdb/samdb.o \
samdb/samdb_privilege.o \
[SCM] Samba Shared Repository - branch v3-0-test updated - initial-v3-0-unstable-23-g72be9cc
The branch, v3-0-test has been updated
via 72be9cc495d796d700281c047b152ba909f6fd2b (commit)
from ea97a10df5732dfcc931197a01d6446ed92b7658 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit 72be9cc495d796d700281c047b152ba909f6fd2b
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Nov 16 14:15:56 2007 -0800
Fix for bug 4393 smbclient does not store files with zero filesize in
tar-archives
from Tomasz Ostrowski [EMAIL PROTECTED]
Jeremy.
---
Summary of changes:
source/client/clitar.c |7 +++
1 files changed, 3 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/clitar.c b/source/client/clitar.c
index 7bbb9fc..cf4eb91 100644
--- a/source/client/clitar.c
+++ b/source/client/clitar.c
@@ -609,7 +609,6 @@ static void do_atar(char *rname,char *lname,file_info
*finfo1)
SMB_BIG_UINT nread=0;
char ftype;
file_info2 finfo;
- BOOL close_done = False;
BOOL shallitime=True;
char data[65520];
int read_size = 65520;
@@ -695,7 +694,7 @@ static void do_atar(char *rname,char *lname,file_info
*finfo1)
DEBUG(3,(getting file %s of size %.0f bytes as a tar file %s,
finfo.name, (double)finfo.size, lname));
- while (nread finfo.size !close_done) {
+ do {
DEBUG(3,(nread=%.0f\n,(double)nread));
@@ -734,13 +733,13 @@ static void do_atar(char *rname,char *lname,file_info
*finfo1)
break;
}
- if (datalen == 0) {
+ if ( (datalen == 0) (finfo.size != 0) ) {
DEBUG(0,(Error reading file %s. Got 0
bytes\n, rname));
break;
}
datalen=0;
- }
+ } while ( nread finfo.size );
if (wrote_tar_header) {
/* pad tar file with zero's if we couldn't get entire
file */
--
Samba Shared Repository
svn commit: samba r26006 - in branches/SAMBA_4_0: . source/auth source/dsdb source/librpc source/param source/scripting/ejs source/smbd source/utils
Author: jelmer
Date: 2007-11-16 23:24:23 + (Fri, 16 Nov 2007)
New Revision: 26006
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26006
Log:
Improve some dependencies.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/auth/auth_unix.c
branches/SAMBA_4_0/source/auth/config.mk
branches/SAMBA_4_0/source/dsdb/config.mk
branches/SAMBA_4_0/source/librpc/config.mk
branches/SAMBA_4_0/source/param/config.mk
branches/SAMBA_4_0/source/scripting/ejs/config.mk
branches/SAMBA_4_0/source/smbd/config.mk
branches/SAMBA_4_0/source/utils/config.mk
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/auth/auth_unix.c
===
--- branches/SAMBA_4_0/source/auth/auth_unix.c 2007-11-16 21:50:31 UTC (rev
26005)
+++ branches/SAMBA_4_0/source/auth/auth_unix.c 2007-11-16 23:24:23 UTC (rev
26006)
@@ -236,7 +236,7 @@
pam_error = pam_start(samba, account_name, pconv, pamh);
if (pam_error != PAM_SUCCESS) {
- /* no vaild pamh here, can we reliably call pam_strerror ? */
+ /* no valid pamh here, can we reliably call pam_strerror ? */
DEBUG(4,(smb_pam_start: pam_start failed!\n));
return NT_STATUS_UNSUCCESSFUL;
}
Modified: branches/SAMBA_4_0/source/auth/config.mk
===
--- branches/SAMBA_4_0/source/auth/config.mk2007-11-16 21:50:31 UTC (rev
26005)
+++ branches/SAMBA_4_0/source/auth/config.mk2007-11-16 23:24:23 UTC (rev
26006)
@@ -49,15 +49,11 @@
# End MODULE auth_developer
###
-###
-# Start MODULE auth_unix
[MODULE::auth_unix]
INIT_FUNCTION = auth_unix_init
SUBSYSTEM = auth
OBJ_FILES = auth_unix.o
PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER
-# End MODULE auth_unix
-###
[SUBSYSTEM::PAM_ERRORS]
PRIVATE_PROTO_HEADER = pam_errors.h
Modified: branches/SAMBA_4_0/source/dsdb/config.mk
===
--- branches/SAMBA_4_0/source/dsdb/config.mk2007-11-16 21:50:31 UTC (rev
26005)
+++ branches/SAMBA_4_0/source/dsdb/config.mk2007-11-16 23:24:23 UTC (rev
26006)
@@ -8,7 +8,7 @@
PUBLIC_PROTO_HEADER = samdb/samdb_proto.h
PUBLIC_HEADERS = samdb/samdb.h
PUBLIC_DEPENDENCIES = LIBCLI_LDAP HEIMDAL_KRB5
-PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS
+PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER
OBJ_FILES = \
samdb/samdb.o \
samdb/samdb_privilege.o \
Modified: branches/SAMBA_4_0/source/librpc/config.mk
===
--- branches/SAMBA_4_0/source/librpc/config.mk 2007-11-16 21:50:31 UTC (rev
26005)
+++ branches/SAMBA_4_0/source/librpc/config.mk 2007-11-16 23:24:23 UTC (rev
26006)
@@ -27,7 +27,8 @@
LIBSAMBA-UTIL \
LIBPOPT \
POPT_SAMBA \
- NDR_TABLE
+ NDR_TABLE \
+ LIBSAMBA-ERRORS
MANPAGE = tools/ndrdump.1
# FIXME: ndrdump shouldn't have to depend on RPC...
# End BINARY ndrdump
Modified: branches/SAMBA_4_0/source/param/config.mk
===
--- branches/SAMBA_4_0/source/param/config.mk 2007-11-16 21:50:31 UTC (rev
26005)
+++ branches/SAMBA_4_0/source/param/config.mk 2007-11-16 23:24:23 UTC (rev
26006)
@@ -47,4 +47,4 @@
[SUBSYSTEM::SECRETS]
OBJ_FILES = secrets.o
-PRIVATE_DEPENDENCIES = LDB_WRAP UTIL_TDB
+PRIVATE_DEPENDENCIES = LDB_WRAP TDB_WRAP UTIL_TDB
Modified: branches/SAMBA_4_0/source/scripting/ejs/config.mk
===
--- branches/SAMBA_4_0/source/scripting/ejs/config.mk 2007-11-16 21:50:31 UTC
(rev 26005)
+++ branches/SAMBA_4_0/source/scripting/ejs/config.mk 2007-11-16 23:24:23 UTC
(rev 26006)
@@ -8,11 +8,13 @@
[MODULE::smbcalls_config]
OBJ_FILES = smbcalls_config.o
+OUTPUT_TYPE = INTEGRATED
SUBSYSTEM = smbcalls
INIT_FUNCTION = smb_setup_ejs_config
[MODULE::smbcalls_ldb]
OBJ_FILES = smbcalls_ldb.o
+OUTPUT_TYPE = INTEGRATED
SUBSYSTEM = smbcalls
INIT_FUNCTION = smb_setup_ejs_ldb
PRIVATE_DEPENDENCIES = LIBLDB SAMDB LIBNDR
@@ -20,38 +22,45 @@
[MODULE::smbcalls_reg]
OBJ_FILES = smbcalls_reg.o
SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
INIT_FUNCTION = smb_setup_ejs_reg
PRIVATE_DEPENDENCIES = registry SAMDB LIBNDR
[MODULE::smbcalls_nbt]
OBJ_FILES = smbcalls_nbt.o
SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
INIT_FUNCTION = smb_setup_ejs_nbt
[MODULE::smbcalls_samba3]
OBJ_FILES = smbcalls_samba3.o
SUBSYSTEM = smbcalls
+OUTPUT_TYPE = INTEGRATED
Build status as of Sat Nov 17 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-11-16 00:00:39.0 + +++ /home/build/master/cache/broken_results.txt 2007-11-17 00:00:59.0 + @@ -1,4 +1,4 @@ -Build status as of Fri Nov 16 00:00:02 2007 +Build status as of Sat Nov 17 00:00:02 2007 Build counts: Tree Total Broken Panic @@ -7,19 +7,19 @@ ccache 29 10 0 ctdb 0 0 0 distcc 1 0 0 -ldb 29 10 0 +ldb 29 13 0 libreplace 28 11 0 -lorikeet-heimdal 23 13 0 +lorikeet-heimdal 22 13 0 pidl 16 3 0 ppp 9 7 0 python 0 0 0 -rsync29 15 0 +rsync29 14 0 samba-docs 0 0 0 samba-gtk2 2 0 -samba4 26 19 0 +samba4 25 26 0 samba_3_20 0 0 -samba_3_2_test 28 19 0 +samba_3_2_test 29 19 0 smb-build28 28 0 -talloc 29 10 0 -tdb 29 9 0 +talloc 29 8 0 +tdb 29 6 0
svn commit: samba r26007 - in branches/4.0-python: . source/auth/credentials source/auth/kerberos source/build/smb_build source/dsdb source/dsdb/samdb/ldb_modules source/lib/ldb source/lib/nss_wrapper
Author: jelmer
Date: 2007-11-17 00:18:20 + (Sat, 17 Nov 2007)
New Revision: 26007
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26007
Log:
Fix some dependencies.
Modified:
branches/4.0-python/
branches/4.0-python/source/auth/credentials/config.mk
branches/4.0-python/source/auth/kerberos/config.mk
branches/4.0-python/source/build/smb_build/input.pm
branches/4.0-python/source/build/smb_build/main.pl
branches/4.0-python/source/build/smb_build/makefile.pm
branches/4.0-python/source/dsdb/config.mk
branches/4.0-python/source/dsdb/samdb/ldb_modules/config.mk
branches/4.0-python/source/dsdb/samdb/ldb_modules/entryUUID.c
branches/4.0-python/source/lib/ldb/config.mk
branches/4.0-python/source/lib/nss_wrapper/config.mk
branches/4.0-python/source/lib/samba3/config.mk
branches/4.0-python/source/nbt_server/config.mk
Changeset:
Property changes on: branches/4.0-python
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-python/source/auth/credentials/config.mk
===
--- branches/4.0-python/source/auth/credentials/config.mk 2007-11-16
23:24:23 UTC (rev 26006)
+++ branches/4.0-python/source/auth/credentials/config.mk 2007-11-17
00:18:20 UTC (rev 26007)
@@ -19,6 +19,6 @@
PUBLIC_HEADERS = credentials_krb5.h
OBJ_FILES = credentials_krb5.o
PUBLIC_DEPENDENCIES = \
- HEIMDAL_GSSAPI
+ HEIMDAL_GSSAPI KERBEROS
# End SUBSYSTEM CREDENTIALS
#
Modified: branches/4.0-python/source/auth/kerberos/config.mk
===
--- branches/4.0-python/source/auth/kerberos/config.mk 2007-11-16 23:24:23 UTC
(rev 26006)
+++ branches/4.0-python/source/auth/kerberos/config.mk 2007-11-17 00:18:20 UTC
(rev 26007)
@@ -10,6 +10,6 @@
gssapi_parse.o \
krb5_init_context.o
PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba-socket LIBCLI_RESOLVE
-PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam CREDENTIALS_KRB5
+PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam
# End SUBSYSTEM KERBEROS
#
Modified: branches/4.0-python/source/build/smb_build/input.pm
===
--- branches/4.0-python/source/build/smb_build/input.pm 2007-11-16 23:24:23 UTC
(rev 26006)
+++ branches/4.0-python/source/build/smb_build/input.pm 2007-11-17 00:18:20 UTC
(rev 26007)
@@ -116,7 +116,9 @@
return if ($lib-{ENABLE} ne YES);
- $lib-{OUTPUT_TYPE} = $default_ot;
+ unless (defined($lib-{OUTPUT_TYPE})) {
+ $lib-{OUTPUT_TYPE} = $default_ot;
+ }
if (defined($lib-{VERSION}) and not defined($lib-{SO_VERSION})) {
print $lib-{NAME}: Please specify SO_VERSION when specifying
VERSION\n;
@@ -142,9 +144,6 @@
{
my ($INPUT, $python) = @_;
- return if ($python-{ENABLE} ne YES);
-
- $python-{OUTPUT_TYPE} = [SHARED_LIBRARY];
$python-{INSTALLDIR} = PYTHONDIR;
push (@{$python-{PUBLIC_DEPENDENCIES}}, LIBPYTHON);
if (defined($python-{SWIG_FILE})) {
Modified: branches/4.0-python/source/build/smb_build/main.pl
===
--- branches/4.0-python/source/build/smb_build/main.pl 2007-11-16 23:24:23 UTC
(rev 26006)
+++ branches/4.0-python/source/build/smb_build/main.pl 2007-11-17 00:18:20 UTC
(rev 26007)
@@ -60,7 +60,8 @@
$mkenv-StaticLibrary($key) if grep(/STATIC_LIBRARY/,
@{$key-{OUTPUT_TYPE}});
$mkenv-PkgConfig($key, $OUTPUT) if $key-{TYPE} eq LIBRARY
and defined($key-{VERSION});
- $mkenv-SharedLibrary($key) if $key-{TYPE} eq LIBRARY and
+ $mkenv-SharedLibrary($key) if ($key-{TYPE} eq LIBRARY or
+ $key-{TYPE} eq PYTHON) and
grep(/SHARED_LIBRARY/,
@{$key-{OUTPUT_TYPE}});
$mkenv-SharedModule($key) if $key-{TYPE} eq MODULE and
grep(/SHARED_LIBRARY/,
@{$key-{OUTPUT_TYPE}});
Modified: branches/4.0-python/source/build/smb_build/makefile.pm
===
--- branches/4.0-python/source/build/smb_build/makefile.pm 2007-11-16
23:24:23 UTC (rev 26006)
+++ branches/4.0-python/source/build/smb_build/makefile.pm 2007-11-17
00:18:20 UTC (rev 26007)
@@ -322,9 +322,6 @@
$self-{install_plugins} .= [EMAIL PROTECTED] -fs
$ctx-{LIBRARY_REALNAME}
\$(DESTDIR)\$(MODULESDIR)/$sane_subsystem/$_.\$(SHLIBEXT)\n;
$self-{uninstall_plugins} .= [EMAIL PROTECTED]
\$(DESTDIR)\$(MODULESDIR)/$sane_subsystem/$_.\$(SHLIBEXT)\n;
}
-
svn commit: samba r26008 - in branches/4.0-python: . source source/auth source/auth/credentials source/auth/gensec source/cldap_server source/cluster source/cluster/ctdb source/cluster/ctdb/client sou
Author: jelmer Date: 2007-11-17 00:18:32 + (Sat, 17 Nov 2007) New Revision: 26008 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26008 Log: More work getting the dependencies right. Added: branches/4.0-python/source/lib/ldb_wrap.c branches/4.0-python/source/lib/ldb_wrap.h branches/4.0-python/source/lib/tdb_wrap.h branches/4.0-python/source/lib/util/util_ldb.c branches/4.0-python/source/lib/util/util_ldb.h Removed: branches/4.0-python/source/lib/db_wrap.c branches/4.0-python/source/lib/db_wrap.h branches/4.0-python/source/lib/gendb.c Modified: branches/4.0-python/ branches/4.0-python/source/BRANCH.TODO branches/4.0-python/source/auth/auth_sam.c branches/4.0-python/source/auth/auth_util.c branches/4.0-python/source/auth/config.mk branches/4.0-python/source/auth/credentials/config.mk branches/4.0-python/source/auth/credentials/credentials.c branches/4.0-python/source/auth/credentials/credentials_files.c branches/4.0-python/source/auth/credentials/credentials_krb5.c branches/4.0-python/source/auth/gensec/config.mk branches/4.0-python/source/auth/gensec/schannel_state.c branches/4.0-python/source/auth/sam.c branches/4.0-python/source/cldap_server/cldap_server.c branches/4.0-python/source/cldap_server/netlogon.c branches/4.0-python/source/cldap_server/rootdse.c branches/4.0-python/source/cluster/ctdb/brlock_ctdb.c branches/4.0-python/source/cluster/ctdb/client/ctdb_client.c branches/4.0-python/source/cluster/ctdb/common/ctdb_ltdb.c branches/4.0-python/source/cluster/ctdb/ctdb_cluster.c branches/4.0-python/source/cluster/ctdb/opendb_ctdb.c branches/4.0-python/source/cluster/ctdb/server/ctdb_control.c branches/4.0-python/source/cluster/ctdb/server/ctdb_daemon.c branches/4.0-python/source/cluster/ctdb/server/ctdb_freeze.c branches/4.0-python/source/cluster/ctdb/server/ctdb_lockwait.c branches/4.0-python/source/cluster/ctdb/server/ctdb_ltdb_server.c branches/4.0-python/source/cluster/ctdb/server/ctdb_recover.c branches/4.0-python/source/cluster/ctdb/server/ctdb_traverse.c branches/4.0-python/source/cluster/local.c branches/4.0-python/source/dsdb/common/sidmap.c branches/4.0-python/source/dsdb/config.mk branches/4.0-python/source/dsdb/samdb/cracknames.c branches/4.0-python/source/dsdb/samdb/ldb_modules/config.mk branches/4.0-python/source/dsdb/samdb/ldb_modules/samldb.c branches/4.0-python/source/dsdb/samdb/samdb.c branches/4.0-python/source/dsdb/samdb/samdb_privilege.c branches/4.0-python/source/kdc/hdb-ldb.c branches/4.0-python/source/ldap_server/ldap_backend.c branches/4.0-python/source/lib/basic.mk branches/4.0-python/source/lib/dbwrap/dbwrap_tdb.c branches/4.0-python/source/lib/gencache/gencache.c branches/4.0-python/source/lib/ldb-samba/config.mk branches/4.0-python/source/lib/ldb/tools/cmdline.c branches/4.0-python/source/lib/ldb/tools/config.mk branches/4.0-python/source/lib/messaging/config.mk branches/4.0-python/source/lib/messaging/messaging.c branches/4.0-python/source/lib/registry/config.mk branches/4.0-python/source/lib/registry/ldb.c branches/4.0-python/source/lib/util/config.mk branches/4.0-python/source/libcli/auth/config.mk branches/4.0-python/source/libnet/libnet_become_dc.c branches/4.0-python/source/libnet/libnet_join.c branches/4.0-python/source/libnet/libnet_samsync_ldb.c branches/4.0-python/source/libnet/libnet_unbecome_dc.c branches/4.0-python/source/librpc/config.mk branches/4.0-python/source/nbt_server/dgram/netlogon.c branches/4.0-python/source/nbt_server/wins/winsdb.c branches/4.0-python/source/ntptr/simple_ldb/ntptr_simple_ldb.c branches/4.0-python/source/ntvfs/common/brlock.c branches/4.0-python/source/ntvfs/common/notify.c branches/4.0-python/source/ntvfs/common/opendb_tdb.c branches/4.0-python/source/ntvfs/posix/vfs_posix.c branches/4.0-python/source/ntvfs/posix/xattr_tdb.c branches/4.0-python/source/param/config.mk branches/4.0-python/source/param/secrets.c branches/4.0-python/source/param/share_ldb.c branches/4.0-python/source/rpc_server/netlogon/dcerpc_netlogon.c branches/4.0-python/source/rpc_server/samr/dcesrv_samr.c branches/4.0-python/source/rpc_server/samr/samr_password.c branches/4.0-python/source/torture/ldap/schema.c branches/4.0-python/source/torture/ldap/uptodatevector.c branches/4.0-python/source/torture/libnet/libnet_BecomeDC.c branches/4.0-python/source/torture/local/dbspeed.c branches/4.0-python/source/wrepl_server/wrepl_server.c Changeset: Sorry, the patch is too large (2301 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26008
svn commit: samba r26009 - in branches/4.0-python: . source source/auth source/auth/credentials source/auth/credentials/tests source/auth/gensec source/auth/kerberos source/build/m4 source/build/smb_b
Author: jelmer Date: 2007-11-17 00:18:44 + (Sat, 17 Nov 2007) New Revision: 26009 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26009 Log: Merge upstream. Added: branches/4.0-python/source/auth/credentials/tests/ branches/4.0-python/source/auth/credentials/tests/simple.c branches/4.0-python/source/lib/tdb_wrap.c Modified: branches/4.0-python/ branches/4.0-python/source/auth/auth_sam.c branches/4.0-python/source/auth/config.mk branches/4.0-python/source/auth/credentials/credentials_files.c branches/4.0-python/source/auth/gensec/schannel_state.c branches/4.0-python/source/auth/kerberos/config.mk branches/4.0-python/source/auth/sam.c branches/4.0-python/source/build/m4/check_ld.m4 branches/4.0-python/source/build/smb_build/makefile.pm branches/4.0-python/source/cldap_server/cldap_server.c branches/4.0-python/source/cldap_server/netlogon.c branches/4.0-python/source/cldap_server/rootdse.c branches/4.0-python/source/cluster/ctdb/common/ctdb_ltdb.c branches/4.0-python/source/cluster/ctdb/opendb_ctdb.c branches/4.0-python/source/dsdb/common/sidmap.c branches/4.0-python/source/dsdb/samdb/cracknames.c branches/4.0-python/source/dsdb/samdb/ldb_modules/linked_attributes.c branches/4.0-python/source/dsdb/samdb/samdb.c branches/4.0-python/source/dsdb/samdb/samdb_privilege.c branches/4.0-python/source/kdc/hdb-ldb.c branches/4.0-python/source/lib/ldb/Makefile.in branches/4.0-python/source/lib/ldb/configure.ac branches/4.0-python/source/lib/replace/libreplace_ld.m4 branches/4.0-python/source/lib/talloc/Makefile.in branches/4.0-python/source/lib/talloc/configure.ac branches/4.0-python/source/lib/tdb/Makefile.in branches/4.0-python/source/lib/tdb/configure.ac branches/4.0-python/source/libnet/libnet_join.c branches/4.0-python/source/libnet/libnet_samsync_ldb.c branches/4.0-python/source/main.mk branches/4.0-python/source/nbt_server/dgram/netlogon.c branches/4.0-python/source/ntvfs/posix/vfs_posix.c branches/4.0-python/source/ntvfs/posix/xattr_tdb.c branches/4.0-python/source/param/config.mk branches/4.0-python/source/param/secrets.c branches/4.0-python/source/rpc_server/lsa/dcesrv_lsa.c branches/4.0-python/source/rpc_server/lsa/lsa.h branches/4.0-python/source/rpc_server/netlogon/dcerpc_netlogon.c branches/4.0-python/source/rpc_server/samr/dcesrv_samr.c branches/4.0-python/source/torture/config.mk branches/4.0-python/source/torture/libnet/libnet_BecomeDC.c branches/4.0-python/source/torture/local/config.mk branches/4.0-python/source/torture/local/dbspeed.c branches/4.0-python/source/torture/local/local.c branches/4.0-python/source/torture/rpc/spoolss_notify.c Changeset: Sorry, the patch is too large (1273 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26009
svn commit: samba r26011 - in branches/4.0-python: . source/auth source/dsdb source/dsdb/common source/dsdb/repl source/dsdb/samdb source/dsdb/samdb/ldb_modules source/dsdb/schema
Author: jelmer Date: 2007-11-17 00:18:56 + (Sat, 17 Nov 2007) New Revision: 26011 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26011 Log: samdb: move some common functions into a separate file. Added: branches/4.0-python/source/dsdb/samdb/util.c Modified: branches/4.0-python/ branches/4.0-python/.bzrignore branches/4.0-python/source/auth/auth_unix.c branches/4.0-python/source/dsdb/common/sidmap.c branches/4.0-python/source/dsdb/config.mk branches/4.0-python/source/dsdb/repl/drepl_partitions.c branches/4.0-python/source/dsdb/repl/drepl_service.c branches/4.0-python/source/dsdb/samdb/cracknames.c branches/4.0-python/source/dsdb/samdb/ldb_modules/extended_dn.c branches/4.0-python/source/dsdb/samdb/ldb_modules/linked_attributes.c branches/4.0-python/source/dsdb/samdb/ldb_modules/local_password.c branches/4.0-python/source/dsdb/samdb/ldb_modules/password_hash.c branches/4.0-python/source/dsdb/samdb/ldb_modules/samldb.c branches/4.0-python/source/dsdb/samdb/samdb.c branches/4.0-python/source/dsdb/schema/schema.h branches/4.0-python/source/dsdb/schema/schema_constructed.c branches/4.0-python/source/dsdb/schema/schema_init.c branches/4.0-python/source/dsdb/schema/schema_syntax.c Changeset: Sorry, the patch is too large (831 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26011
svn commit: samba r26010 - in branches/4.0-python: . source/auth source/build/m4 source/build/smb_build source/dsdb source/librpc source/param source/smbd source/utils
Author: jelmer
Date: 2007-11-17 00:18:51 + (Sat, 17 Nov 2007)
New Revision: 26010
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26010
Log:
Merge upstream.
Modified:
branches/4.0-python/
branches/4.0-python/source/auth/auth_unix.c
branches/4.0-python/source/auth/config.mk
branches/4.0-python/source/build/m4/check_ld.m4
branches/4.0-python/source/build/smb_build/main.pl
branches/4.0-python/source/dsdb/config.mk
branches/4.0-python/source/librpc/config.mk
branches/4.0-python/source/param/config.mk
branches/4.0-python/source/smbd/config.mk
branches/4.0-python/source/utils/config.mk
Changeset:
Property changes on: branches/4.0-python
___
Name: bzr:revision-info
...skipped...
Name: bzr:ancestry:v3-trunk0
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-python/source/auth/auth_unix.c
===
--- branches/4.0-python/source/auth/auth_unix.c 2007-11-17 00:18:44 UTC (rev
26009)
+++ branches/4.0-python/source/auth/auth_unix.c 2007-11-17 00:18:51 UTC (rev
26010)
@@ -236,7 +236,7 @@
pam_error = pam_start(samba, account_name, pconv, pamh);
if (pam_error != PAM_SUCCESS) {
- /* no vaild pamh here, can we reliably call pam_strerror ? */
+ /* no valid pamh here, can we reliably call pam_strerror ? */
DEBUG(4,(smb_pam_start: pam_start failed!\n));
return NT_STATUS_UNSUCCESSFUL;
}
Modified: branches/4.0-python/source/auth/config.mk
===
--- branches/4.0-python/source/auth/config.mk 2007-11-17 00:18:44 UTC (rev
26009)
+++ branches/4.0-python/source/auth/config.mk 2007-11-17 00:18:51 UTC (rev
26010)
@@ -50,15 +50,11 @@
# End MODULE auth_developer
###
-###
-# Start MODULE auth_unix
[MODULE::auth_unix]
INIT_FUNCTION = auth_unix_init
SUBSYSTEM = auth
OBJ_FILES = auth_unix.o
PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER
-# End MODULE auth_unix
-###
[SUBSYSTEM::PAM_ERRORS]
PRIVATE_PROTO_HEADER = pam_errors.h
Modified: branches/4.0-python/source/build/m4/check_ld.m4
===
--- branches/4.0-python/source/build/m4/check_ld.m4 2007-11-17 00:18:44 UTC
(rev 26009)
+++ branches/4.0-python/source/build/m4/check_ld.m4 2007-11-17 00:18:51 UTC
(rev 26010)
@@ -105,6 +105,7 @@
AC_LIBREPLACE_SHLD_FLAGS
AC_LIBREPLACE_MDLD
AC_LIBREPLACE_MDLD_FLAGS
+AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR
###
# test whether building a shared library actually works
Modified: branches/4.0-python/source/build/smb_build/main.pl
===
--- branches/4.0-python/source/build/smb_build/main.pl 2007-11-17 00:18:44 UTC
(rev 26009)
+++ branches/4.0-python/source/build/smb_build/main.pl 2007-11-17 00:18:51 UTC
(rev 26010)
@@ -54,6 +54,8 @@
$mkenv-Integrated($key) if grep(/INTEGRATED/, @{$key-{OUTPUT_TYPE}});
}
+my $shared_libs_used = 0;
+
foreach my $key (values %$OUTPUT) {
next unless defined $key-{OUTPUT_TYPE};
@@ -63,6 +65,10 @@
$mkenv-SharedLibrary($key) if ($key-{TYPE} eq LIBRARY or
$key-{TYPE} eq PYTHON) and
grep(/SHARED_LIBRARY/,
@{$key-{OUTPUT_TYPE}});
+ if ($key-{TYPE} eq LIBRARY and
+ ${$key-{OUTPUT_TYPE}}[0] eq SHARED_LIBRARY) {
+ $shared_libs_used = 1;
+ }
$mkenv-SharedModule($key) if $key-{TYPE} eq MODULE and
grep(/SHARED_LIBRARY/,
@{$key-{OUTPUT_TYPE}});
$mkenv-Binary($key) if grep(/BINARY/, @{$key-{OUTPUT_TYPE}});
@@ -80,4 +86,11 @@
summary::show($OUTPUT, \%config::config);
+if ($shared_libs_used) {
+ print EOF;
+To run binaries without installing, set the following environment variable:
+ $config::config{LIB_PATH_VAR}=$config::config{builddir}/bin/shared
+EOF
+}
+
1;
Modified: branches/4.0-python/source/dsdb/config.mk
===
--- branches/4.0-python/source/dsdb/config.mk 2007-11-17 00:18:44 UTC (rev
26009)
+++ branches/4.0-python/source/dsdb/config.mk 2007-11-17 00:18:51 UTC (rev
26010)
@@ -7,9 +7,8 @@
PUBLIC_PROTO_HEADER = samdb/samdb_proto.h
PUBLIC_HEADERS = samdb/samdb.h
PUBLIC_DEPENDENCIES = LIBCLI_LDAP HEIMDAL_KRB5
-PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS \
+PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \
auth_util UTIL_LDB
-LDFLAGS = $(LIBRARY_ldb_OUTPUT)
OBJ_FILES = \
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-331-g977dc3a
The branch, v3-2-test has been updated
via 977dc3accb3d440e5fd19591c425da7dc3718d94 (commit)
via a90ef69350c5efcf8dcf95d4853cbe3c662d1ba3 (commit)
via f3bd5e828af04f33178a66f9f332199f7d395b7b (commit)
via 01e85f146b32d3ec91f2affb070bfd3516a28333 (commit)
via 629406cbe77a5d56a258ac414ab47f3e89183e52 (commit)
from 118fd6213d5f6419f654e9226a41d527c04346f7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 977dc3accb3d440e5fd19591c425da7dc3718d94
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Nov 16 17:07:11 2007 -0800
Remove pstring from modules directory.
Jeremy.
commit a90ef69350c5efcf8dcf95d4853cbe3c662d1ba3
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Nov 16 17:06:57 2007 -0800
Ensure we use PATH_MAX for symlinks.
Jeremy.
commit f3bd5e828af04f33178a66f9f332199f7d395b7b
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Nov 16 17:06:36 2007 -0800
Fix bug #4393 smbclient does not store files with zero filesize in
tar-archives
from [EMAIL PROTECTED]
Jeremy.
commit 01e85f146b32d3ec91f2affb070bfd3516a28333
Merge: 629406cbe77a5d56a258ac414ab47f3e89183e52
118fd6213d5f6419f654e9226a41d527c04346f7
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Nov 16 13:29:42 2007 -0800
Merge branch 'v3-2-test' of ssh://[EMAIL PROTECTED]/data/git/samba into
v3-2-test
commit 629406cbe77a5d56a258ac414ab47f3e89183e52
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Nov 16 13:14:24 2007 -0800
Match the 3.0.27a version of this function.
Jeremy.
---
Summary of changes:
source/client/clitar.c|7 +-
source/modules/vfs_afsacl.c | 14 +-
source/modules/vfs_cap.c | 489 +
source/modules/vfs_catia.c| 269
source/modules/vfs_expand_msdfs.c | 89 ---
source/modules/vfs_full_audit.c | 38 ++-
source/smbd/srvstr.c | 18 +-
source/smbd/trans2.c |4 +-
8 files changed, 598 insertions(+), 330 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/clitar.c b/source/client/clitar.c
index 4ce92c6..cb7a5de 100644
--- a/source/client/clitar.c
+++ b/source/client/clitar.c
@@ -608,7 +608,6 @@ static void do_atar(char *rname,char *lname,file_info
*finfo1)
SMB_BIG_UINT nread=0;
char ftype;
file_info2 finfo;
- bool close_done = False;
bool shallitime=True;
char data[65520];
int read_size = 65520;
@@ -694,7 +693,7 @@ static void do_atar(char *rname,char *lname,file_info
*finfo1)
DEBUG(3,(getting file %s of size %.0f bytes as a tar file %s,
finfo.name, (double)finfo.size, lname));
- while (nread finfo.size !close_done) {
+ do {
DEBUG(3,(nread=%.0f\n,(double)nread));
@@ -733,13 +732,13 @@ static void do_atar(char *rname,char *lname,file_info
*finfo1)
break;
}
- if (datalen == 0) {
+ if ( (datalen == 0) (finfo.size != 0) ) {
DEBUG(0,(Error reading file %s. Got 0
bytes\n, rname));
break;
}
datalen=0;
- }
+ } while ( nread finfo.size );
if (wrote_tar_header) {
/* pad tar file with zero's if we couldn't get entire
file */
diff --git a/source/modules/vfs_afsacl.c b/source/modules/vfs_afsacl.c
index eac70f4..3e57a88 100644
--- a/source/modules/vfs_afsacl.c
+++ b/source/modules/vfs_afsacl.c
@@ -891,7 +891,7 @@ static NTSTATUS afs_set_nt_acl(vfs_handle_struct *handle,
files_struct *fsp,
char acl_string[2049];
struct afs_iob iob;
int ret = -1;
- pstring name;
+ char *name = NULL;
const char *fileacls;
fileacls = lp_parm_const_string(SNUM(handle-conn), afsacl,
fileacls,
@@ -904,7 +904,10 @@ static NTSTATUS afs_set_nt_acl(vfs_handle_struct *handle,
files_struct *fsp,
ZERO_STRUCT(dir_acl);
ZERO_STRUCT(file_acl);
- pstrcpy(name, fsp-fsp_name);
+ name = talloc_strdup(talloc_tos(), fsp-fsp_name);
+ if (!name) {
+ return NT_STATUS_NO_MEMORY;
+ }
if (!fsp-is_directory) {
/* We need to get the name of the directory containing the
@@ -913,7 +916,10 @@ static NTSTATUS afs_set_nt_acl(vfs_handle_struct *handle,
files_struct *fsp,
if (p != NULL) {
*p = '\0';
} else {
- pstrcpy(name, .);
+ name =
