[Samba] smbd using 99.9% CPU with MS Office docs
I made a post a few weeks ago regarding this but was unable to find a solution. This is the situation: + I'm attempting to upgrade from samba 3.0.23a (Fedora core package 3.0.23a-1.fc4.1) to the latest version compiled from Samba source. + When using the latest version (or 3.0.25b), Win clients can authenticate access shares fine, but attempting to open any kind of MS Office doc (not just word docs as I originally thought) causes the associated smbd process to leap to 99.5% CPU utilisation remain there. The effect of this on the production system is a DOS the smbd processes in question need a -KILL signal to terminate them. These are the compile options I'm using: ./configure \ --with-piddir=/var/run \ --with-logfilebase=/var/log/samba \ --with-quotas \ --with-smbmount \ --enable-cups \ --with-configdir=/usr/local/samba/etc \ This is my testparm output: http://www.redcircleit.com/public/misc/testparm.out.txt (The smb.conf is based on the one used by the Fedora pkg, although with the addition of msdfs root = yes as I understand this changed between the two versions. Inverting the value doesn't help). This is an strace: http://www.redcircleit.com/public/misc/smbd.strace.txt And this is a level 10 log (not recommended for slow connections): http://www.redcircleit.com/public/misc/smbd.debug.log.gz This problem is 100% reproducible so severe that clearly it's either something specific to the system in question or some silly error or omission on my part. Unfortunately I'm stuck as to what this might be any pointers to further debugging would be very much appreciated. -- Ben Tisdall -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba on Debian with shares on nfs-filesystem
On Tuesday 21 August 2007 19:52:08 Volker Lendecke wrote: On Tue, Aug 21, 2007 at 06:31:52PM +0200, Bernd Schubert wrote: On debian Sarge samba-3.0.22 worked fine, also with posix locking = no, on Etch windows has problems to store cached data on the end of the session unless posix locking = no is set. So far we never understood what makes the difference. Samba is still the same version, and kernel is also still the same customized 2.6.20. Only the libc and other libraries did change. Essentially it is the fact that we have seen too many problems with broken NFS locking implementations. If you can make it work, fine, but Windows and thus Samba use byte range locking a lot more than a typical Unix app does. So you will hit potential problems with NFS locking much quicker. Hmm, interesting. If the problem is only byte range locking what about 'translating' byte range locking into entire file locking? Do you know if there is already some testing tool to stress test unix locking? If not, shouldn't be difficult to write it. Thanks, Bernd -- Bernd Schubert Q-Leap Networks GmbH -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba on Debian with shares on nfs-filesystem
Hello, Am Dienstag, 21. August 2007 17:57 schrieb Volker Lendecke: On Tue, Aug 21, 2007 at 05:25:21PM +0200, Thomas Flaig wrote: I would like to have some samba-shares on a nfs-filesystem. This is not supported. Is this documented? Or better: Where is this documented? I have not found hints to this limitation on the samba-webpage. (I even did not find this limitation by searching for inurl:samba.org nfs on googel or just ignored that result). You should install Samba on the NFS server, and possibly redirect your users using MS-DFS. For the moment that would be a solution. Acctualy nfs is running on an rather old (and slow) linux server, there I could install (and configure) samba. But this server was only reactivated because of some problems with our NAS. The NAS crashed several times when we used samba and nfs (nfs3) at the same time. Acctually we do not knowwhy it crashed, but it seems safer to use only nfs (x)or smb. One potential workaround (no guarantees!) is to say posix locking = no on the relevant shares. Here this did not solve the problem (neither with nfs3 nor with nfs4). :( But on the web there are many reports where this was the solution. Thomas -- Thomas Flaig mailto: [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] Samba on Debian with shares on nfs-filesystem
On Wed, Aug 22, 2007 at 11:43:47AM +0200, Thomas Flaig wrote: Is this documented? Or better: Where is this documented? I don't know if this is documented, sorry. Where would you expect it to be documented? It's the same with reiserfs: Where would you document that reiserfs eats tdb files for breakfast? Volker pgpn1kHxqRfJB.pgp Description: PGP signature -- 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 18GB file Transfer
Hmm.. this is windows to linux, the file however does copy across to a windows system just fine. does anyone have experience with copying large files using samba? On 8/22/07, Derek Croxton [EMAIL PROTECTED] wrote: Brad C wrote: Hello Guys, Having a bit of trouble transferring an 18GB file for backup purposes to a Samba Server. I think the 2GB limit issue was resolved a long time ago? Running Version: Version 3.0.23c-SerNet-SuSE The error on the windows client side ( this is done in some type of bat script ) file creation error the network connection was aborted by the local system. tailing the samba logs, I think the part in bold is where things go wrong, though i cant find anything on it. Any advice would be really welcome: [2007/08/20 13:13:20, 3] smbd/sesssetup.c:reply_sesssetup_and_X_spnego(691) NativeOS=[Windows Server 2003 R2 3790 Service Pack 1] NativeLanMan=[] PrimaryDomain=[Windows Server 2003 R2 5.2] [2007/08/20 13:13:20, 3] libsmb/ntlmssp.c:ntlmssp_server_auth(672) Got user=[root] domain=[ARCH-SERVER] workstation=[ARCH-SERVER] len1=24 len2=24 [2007/08/20 13:19:26, 3] smbd/oplock.c:init_oplocks(862) open_oplock_ipc: initializing messages. [2007/08/20 13:19:26, 3] smbd/oplock_linux.c:linux_init_kernel_oplocks(260) Linux kernel oplocks enabled [2007/08/20 13:19:26, 3] smbd/process.c:process_smb(1110) Transaction 0 of length 137 [2007/08/20 13:19:26, 3] smbd/process.c:switch_message(914) switch message SMBnegprot (pid 30689) conn 0x0 [2007/08/20 13:19:26, 3] smbd/sec_ctx.c:set_sec_ctx(241) setting sec ctx (0, 0) - sec_ctx_stack_ndx = 0 [2007/08/20 13:19:26, 3] smbd/negprot.c:reply_negprot(487) Requested protocol [PC NETWORK PROGRAM 1.0] [2007/08/20 13:19:26, 3] smbd/negprot.c:reply_negprot(487) Requested protocol [LANMAN1.0] [2007/08/20 13:19:26, 3] smbd/negprot.c:reply_negprot(487) Requested protocol [Windows for Workgroups 3.1a] [2007/08/20 13:19:26, 3] smbd/negprot.c:reply_negprot(487) Requested protocol [LM1.2X002] [2007/08/20 13:19:26, 3] smbd/negprot.c:reply_negprot(487) Requested protocol [LANMAN2.1] [2007/08/20 13:19:26, 3] smbd/negprot.c:reply_negprot(487) Requested protocol [NT LM 0.12] [2007/08/20 13:19:26, 3] smbd/negprot.c:reply_nt1(357) using SPNEGO [2007/08/20 13:19:26, 3] smbd/negprot.c:reply_negprot(580) Selected protocol NT LM 0.12 [2007/08/20 13:19:26, 3] smbd/process.c:process_smb(1110) Transaction 1 of length 282 [2007/08/20 13:19:26, 3] smbd/process.c:switch_message(914) switch message SMBsesssetupX (pid 30689) conn 0x0 [2007/08/20 13:19:26, 3] smbd/sec_ctx.c:set_sec_ctx(241) setting sec ctx (0, 0) - sec_ctx_stack_ndx = 0 [2007/08/20 13:19:26, 3] smbd/sesssetup.c:reply_sesssetup_and_X(849) wct=12 flg2=0xc807 [2007/08/20 13:19:26, 2] smbd/sesssetup.c:setup_new_vc_session(799) setup_new_vc_session: New VC == 0, if NT4.x compatible we would close all old resources. [2007/08/20 13:19:26, 3] smbd/sesssetup.c:reply_sesssetup_and_X_spnego(660) Doing spnego session setup [2007/08/20 13:19:26, 3] smbd/sesssetup.c:reply_sesssetup_and_X_spnego(691) NativeOS=[Windows Server 2003 R2 3790 Service Pack 1] NativeLanMan=[] PrimaryDomain=[Windows Server 2003 R2 5.2] [2007/08/20 13:19:26, 3] smbd/sesssetup.c:reply_spnego_negotiate(551) Got OID 1 3 6 1 4 1 311 2 2 10 [2007/08/20 13:19:26, 3] smbd/sesssetup.c:reply_spnego_negotiate(554) Got secblob of size 40 [2007/08/20 13:19:26, 3] libsmb/ntlmssp.c:debug_ntlmssp_flags(63) Got NTLMSSP neg_flags=0xe2088297 [2007/08/20 13:19:26, 3] smbd/process.c:process_smb(1110) Transaction 2 of length 408 [2007/08/20 13:19:26, 3] smbd/process.c:switch_message(914) switch message SMBsesssetupX (pid 30689) conn 0x0 [2007/08/20 13:19:26, 3] smbd/sec_ctx.c:set_sec_ctx(241) setting sec ctx (0, 0) - sec_ctx_stack_ndx = 0 [2007/08/20 13:19:26, 3] smbd/sesssetup.c:reply_sesssetup_and_X(849) wct=12 flg2=0xc807 [2007/08/20 13:19:26, 2] smbd/sesssetup.c:setup_new_vc_session(799) setup_new_vc_session: New VC == 0, if NT4.x compatible we would close all old resources. [2007/08/20 13:19:26, 3] smbd/sesssetup.c:reply_sesssetup_and_X_spnego(660) Doing spnego session setup [2007/08/20 13:19:26, 3] smbd/sesssetup.c:reply_sesssetup_and_X_spnego(691) NativeOS=[Windows Server 2003 R2 3790 Service Pack 1] NativeLanMan=[] PrimaryDomain=[Windows Server 2003 R2 5.2] [2007/08/20 13:19:26, 3] libsmb/ntlmssp.c:ntlmssp_server_auth(672) Got user=[root] domain=[ARCH-SERVER] workstation=[ARCH-SERVER] len1=24 len2=24 When mounting in Linux, I found I had to use -o lfs at the end to get around the 2GB limit. But I don't know from a Windows client. -- Sincerely, Derek -- To unsubscribe from this list go to the
Re: [Samba] Samba on Debian with shares on nfs-filesystem
On Wednesday 22 August 2007 11:43:47 Thomas Flaig wrote: One potential workaround (no guarantees!) is to say posix locking = no on the relevant shares. Here this did not solve the problem (neither with nfs3 nor with nfs4). :( But on the web there are many reports where this was the solution. Can you try locking = no? Cheers, Bernd -- Bernd Schubert Q-Leap Networks GmbH -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba on Debian with shares on nfs-filesystem
Am Mittwoch, 22. August 2007 12:03 schrieb Volker Lendecke: On Wed, Aug 22, 2007 at 11:43:47AM +0200, Thomas Flaig wrote: Is this documented? Or better: Where is this documented? I don't know if this is documented, sorry. Where would you expect it to be documented? It's the same with reiserfs: Where would you document that reiserfs eats tdb files for breakfast? Somwhere in a section or file with a title such as limitations or known bugs[0] or just don't do it!. It's the same with reiserfs: Where would you document that reiserfs eats tdb files for breakfast? In the same file/section. Thomas - [0] Even if it is not a samba bug. -- Thomas Flaig mailto: [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] Samba on Debian with shares on nfs-filesystem
On Wed, Aug 22, 2007 at 01:15:18PM +0200, Thomas Flaig wrote: Somwhere in a section or file with a title such as limitations or known bugs[0] or just don't do it!. Can you send in a patch to the docs? This way you make sure that it gets in the place where you would expect it. Thanks, Volker pgpJ3IQ372kNX.pgp Description: PGP signature -- 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.25b problems, was: Offline files enabled clients are loosing network drives
Hello, FYI: Samba 3.0.25a is running again here for two days after the downgrade from 3.0.25b, no problems any more so far. In fact quite the different: I got backfeed from users that the network is now a lot faster. Regards, Henry On Tue, Aug 21, 2007 at 08:51:55AM +, Henry Jensen wrote: The problems I had here with samba 3.0.25b are significant. It all began after the upgrade: - Notebook-Clients which had offline files enabled are losing network drives. - MS-Office complains that it can not safe files. The error messages are variantly (translated from german Windows XP Prof. and MS-Office 2003) No space left on device (which is a network share) and Too many open files. Unfortunatley this is erradic and not reproducible, and I have no time to debug, because this is a production system which must simply work. I can't find any messages regarding this problems in the samba log. I have now downgraded to Samba 3.0.25a again which was running with no problems for two month before the upgrade to 3.0.25b. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] ldap and computer accounts
On Tue, 2007-08-21 at 21:17 +0200, Markus Baertschi wrote:
I'm attemtping to configure a Ubuntu server for a bunch of windows clients.
I'd like the authentication information to be in ldap.So far the stuff
works,
I can authenticate users in LDAP just fine.
But when I want a windows machine to join the domain I get the
error 'The user name could not be found'. The computer account
gets created (via smbldap-tools) and I can see it in the ldap.
The samba log shows what's happening, when id can not find
the account it creates it and fails when it can not find the freshly
created account. Unfortunately the log is net very helpful to point
find out what is wrong:
---
[2007/08/20 20:28:55, 5] lib/username.c:Get_Pwnam_internals(108)
Get_Pwnam_internals didn't find user [WINXP1$]!
[2007/08/20 20:28:56, 3] passdb/pdb_interface.c:pdb_default_create_user(368)
_samr_create_user: Running the command `/usr/sbin/smbldap-useradd -t 0 -w
winxp1$' gave 0
[2007/08/20 20:28:56, 5] lib/username.c:Get_Pwnam_alloc(131)
Finding user WINXP1$
[2007/08/20 20:28:56, 5] lib/username.c:Get_Pwnam_internals(75)
Trying _Get_Pwnam(), username as lowercase is winxp1$
[2007/08/20 20:28:56, 5] lib/username.c:Get_Pwnam_internals(83)
Trying _Get_Pwnam(), username as given is WINXP1$
[2007/08/20 20:28:56, 5] lib/username.c:Get_Pwnam_internals(102)
Checking combinations of 0 uppercase letters in winxp1$
[2007/08/20 20:28:56, 5] lib/username.c:Get_Pwnam_internals(108)
Get_Pwnam_internals didn't find user [WINXP1$]!
[2007/08/20 20:28:56, 3] passdb/pdb_interface.c:pdb_default_create_user(384)
pdb_default_create_user: failed to create a new user structure:
NT_STATUS_NO_SUCH_USER
[2007/08/20 20:28:56, 5] rpc_parse/parse_prs.c:prs_debug(84)
00 samr_io_r_create_user
--
How can I debug and fix this situation ?
Markus
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
Hi Markus,
I create subtrees under an Accounts ou for computers and users - it's
nice to keep them separate.
smb.conf:
ldap suffix = dc=ifa,dc=net
ldap machine suffix = ou=Computers,ou=Accounts
ldap user suffix = ou=People,ou=Accounts
ldap group suffix = ou=Groups
ldap idmap suffix = ou=Idmap
add user script = /opt/IDEALX/sbin/smbldap-useradd -m '%u'
delete user script = /opt/IDEALX/sbin/smbldap-userdel %u
add group script = /opt/IDEALX/sbin/smbldap-groupadd -p '%g'
delete group script = /opt/IDEALX/sbin/smbldap-groupdel '%g'
add user to group script = /opt/IDEALX/sbin/smbldap-groupmod -m '%u' '%
g'
delete user from group script = /opt/IDEALX/sbin/smbldap-groupmod -x '%
u' '%g'
enable privileges = Yes
set primary group script = /opt/IDEALX/sbin/smbldap-usermod -g '%g' '%u'
add machine script = /opt/IDEALX/sbin/smbldap-useradd -w '%u'
/etc/ldap.conf
nss_base_passwd ou=Accounts,dc=ifa,dc=net?sub
nss_base_shadow ou=Accounts,dc=ifa,dc=net?sub
nss_base_group ou=Groups,dc=ifa,dc=net?one
notice the ?sub at the end.
smbldap.conf
# Where are stored Users
# Ex: usersdn=ou=Users,dc=IDEALX,dc=ORG
usersdn=ou=People,ou=Accounts,${suffix}
# Where are stored Computers
# Ex: computersdn=ou=Computers,dc=IDEALX,dc=ORG
computersdn=ou=Computers,ou=Accounts,${suffix}
This works transparently from windows without having to add accounts in
another tool.
Cheers
Alex
--
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba using linux root under ADS mode
hi all am having a problem connecting to my samba server on linux using the host's root account. I have created a local smbpassword for root but am unable to connect to any shares with it. my primary reason is that am trying to get cupsaddsmb program to copy up driver. so I tested with smb client and my smbd is not allowing root connections any advice? thanks Damien -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] read_data: read failure for 4 bytes
Hello, I 've messages in my log...it's regular...but I don’t know if this is a serious problem ! My conf : Samba 3.0.24 and Debian Etch Security Events =-=-=-=-=-=-=-= Aug 20 17:17:08 dios smbd[9051]: read_data: read failure for 4 bytes to client 10.x.x.x. Error = Aucun chemin d'accès pour atteindre l'hôte cible System Events =-=-=-=-=-=-= Aug 20 17:17:08 dios smbd[9051]: [2007/08/20 17:17:08, 0] lib/util_sock.c:read_data(534) Extract smb.conf : [global] security = ads realm = BUREAUTIQUE.FR.AUF password server = 10.x.x.x workgroup = BUREAUTIQUE idmap uid = 1-2 idmap gid = 1-2 winbind enum users = yes winbind enum groups = yes template homedir = /home/%D/%U template shell = /bin/bash client use spnego = yes client ntlmv2 auth = yes encrypt passwords = yes winbind use default domain = yes restrict anonymous = 2 domain master = no local master = no preferred master = no os level = 0 smb ports = 445 #msdfs racine DFS Microsoft host msdfs = No msdfs root = No # Gestion des logs. Attention à partir de level 3 : ralentissement de perf log file = /var/log/samba/%m.log log level = 3 max log size = 1000 #Permission inherit acls = Yes map acl inherit = Yes #Print Cups printing = cups printcap name = cups load printers = yes printer admin = root, @admins du domaine cups options = raw #Optimisation socket options = IPTOS_LOWDELAY TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 [Intranet_Save$] path = /srv/public/intranet browseable=yes writeable=yes Thank you, --- Alexander -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] winbindd starts, works, then fails soon
Hello, I recently installed samba 3.0.25b-33, in order to connect some RHEL 4 workstations to our AD servers using SFU. I am a Linux sysadmin but not very used to Samba. I succeeded configuring Samba, and when the smb and winbind services are started, everything is fine, I get my Linux users as I configured them in AD/SFU : wbinfo -u is correct, logins are possible, samba shares are reachable from a Windows desktop Alas, very quickly (less than one hour ?) winbind uses to fail, and the connection with AD is lost; the logs are full of ads_connect for domain ddd failed: No logon servers (...) ad_idmap_init: failed to connect to AD (...) NT_STATUS_UNSUCCESSFUL Can anybody give some help ? Here is my smb.conf [global] workgroup = xxx realm = yyy server string = Samba Server - ccc hosts allow = 192.168. 127. #printcap name = /etc/printcap printcap name = cups load printers = yes printing = cups cups options = raw log level = 1 log file = /var/log/samba/%m.log max log size = 50 security = ADS encrypt passwords = yes socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 preferred master = no name resolve order = wins bcast dns proxy = yes idmap domains = ALLDOMAINS idmap config ALLDOMAINS:backend = ad idmap config ALLDOMAINS:default = yes idmap config ALLDOMAINS:schema_mode = sfu template homedir = /home/%U winbind use default domain = yes winbind separator = + winbind enum users = yes winbind enum groups = yes winbind nss info = template sfu winbind offline logon = true winbind refresh tickets = true [xxx] path = /home/xxx writeable = yes valid users = ddd+xxx ddd+yyy create mask = 0755 map archive = yes [zzz] path = /home/zzz writeable = yes valid users = ddd+zzz ddd+yyy create mask = 0755 map archive = yes --- Robert GRASSO System Engineer CEDRAT 15, Chemin de Malacher - Inovallée - 38246 MEYLAN Cedex - FRANCE Tel: +33 (0)4 76 90 50 45 Fax: +33 (0)4 76 90 16 09 mailto:[EMAIL PROTECTED] --- Support service : mailto:[EMAIL PROTECTED] Commercial service : mailto:[EMAIL PROTECTED] Web site : http://www.cedrat.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] PDF file not getting deleted in File Share Folder!
Hi We are facing an issue with Samba3.0.25b. Some pdf files are not getting deleted from Samba fileshare. The sequence to reproduce this bug is as follows. Copy 150 PDF files in a shared folder. Open the file share (FILE_SHARE) from Windows XP+SP2. 1. open 1.pdf file then close 1.pdf file 2. Delete the 1.pdf file. 3. now, open 2.pdf file then close 2.pdf file 4. Delete the 2.pdf file. Repeat the same procedure for all the 150 files. When every thing is done, do a F5 in the shared folder (FILE_SHARE). We can see some of the files remaining which we have already deleted. These files will not get deleted till we restart smbd and nmbd. This issue has happened since some of the file Fd's not getting closed and we can able to see the opened Fd's in the corresponding path /proc/PID/fd. We couldn't able to delete the file for which the Fd's are still opened. We want to know the reason for the Fd's not getting closed sometimes. Here are the Smb.conf parameters that we used [global] private dir = /usr/local/samba/samba/3.0.25b/tdbstore security = user map to guest = Bad User use spnego = yes client use spnego = Yes dos charset = CP932 unix charset = CP932 display charset = CP932 debuglevel = 0 netbios name = 234567 workgroup = workgroup client signing = auto server signing = auto server string = SMB Server encrypt passwords = Yes socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 printer admin = @root,root log file = /usr/local/samba/samba/3.0.25b/log/common.log max connections = 13 local master = no stat cache = no oplocks = no kernel oplocks = no level2 oplocks = no default devmode = yes print command = PrintJobSubmit %s lppause command = PrintJobPause %j lpresume command = PrintJobResume %j lprm command = PrintJobDelete %j lpq command = PrintQueueGet [FILE_SHARE] comment = For all users loggin in path = /usr/local/samba/samba/3.0.25b/file_share writable = yes printable = no create mask = 0777 guest ok = yes guest only = yes posix locking = no oplocks = no level2 oplocks = no Kindly help us the reason for the Fd's not getting closed for some PDF files.And, this issue was seen both in Win XP SP2 as well Vista. regards Gomathi The information contained in this electronic message and any attachments to this message are intended for the exclusive use of the addressee(s) and may contain proprietary, confidential or privileged information. If you are not the intended recipient, you should not disseminate, distribute or copy this e-mail. Please notify the sender immediately and destroy all copies of this message and any attachments. WARNING: Computer viruses can be transmitted via email. The recipient should check this email and any attachments for the presence of viruses. The company accepts no liability for any damage caused by any virus transmitted by this email. www.wipro.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] How Can I Stop Certain Passwords from Expiring?
I recently started using pdbedit to set the maximum password age policy on v3.0.25a. How can I set certain passwords so they don't expire? I have been trying the folowing command but I can't see that it is doing anything: pdbedit -cX -u root It returns the stats for the root user, but the password appears to still be set to expire? How can I accomplish this and how can I verify that it worked? Thank you in advance. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] php includes lost
We have a windows network and the server is running mysql and php. If I access our web app via firefox from a windows box the app works fine. However, if I connect to it thru my laptop which is running Debian Etch and using samba I can access the web page but it doesn't function properly because the include statments in the php code aren't functioning properly. I have a feeling it is either a problem with my samba configuration or perhaps it is because I'm not entering the correct workgroup in the password dialog. When I use another windoze machine it doesn't ask me for a workgroup. I'm having trouble discovering what ones are defined if any on our system. Any suggestions for this problem are appreciated. Thanks, Phill -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] winbindd starts, works, then fails soon
Add-on : having seen on the list some troubles with v3.0.25b, I just upgraded to v3.0.25c - no change - well, with the config below it failed to resolve some group IDs at service startup - setting our AD servers IPs into wins server = ... seems to help at service startup, now it looks like it used to be in v3.0.25b : simply correct (at startup) For the time being I am restarting winbindd every 5 minutes - not really a good service management ... --- Robert GRASSO System Engineer CEDRAT 15, Chemin de Malacher - Inovallée - 38246 MEYLAN Cedex - FRANCE Tel: +33 (0)4 76 90 50 45 Fax: +33 (0)4 76 90 16 09 mailto:[EMAIL PROTECTED] --- Support service : mailto:[EMAIL PROTECTED] Commercial service : mailto:[EMAIL PROTECTED] Web site : http://www.cedrat.com -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Behalf Of Robert Grasso Sent: Wednesday, August 22, 2007 3:02 PM To: samba@lists.samba.org Subject: [Samba] winbindd starts, works, then fails soon Hello, I recently installed samba 3.0.25b-33, in order to connect some RHEL 4 workstations to our AD servers using SFU. I am a Linux sysadmin but not very used to Samba. I succeeded configuring Samba, and when the smb and winbind services are started, everything is fine, I get my Linux users as I configured them in AD/SFU : wbinfo -u is correct, logins are possible, samba shares are reachable from a Windows desktop Alas, very quickly (less than one hour ?) winbind uses to fail, and the connection with AD is lost; the logs are full of ads_connect for domain ddd failed: No logon servers (...) ad_idmap_init: failed to connect to AD (...) NT_STATUS_UNSUCCESSFUL Can anybody give some help ? Here is my smb.conf [global] workgroup = xxx realm = yyy server string = Samba Server - ccc hosts allow = 192.168. 127. #printcap name = /etc/printcap printcap name = cups load printers = yes printing = cups cups options = raw log level = 1 log file = /var/log/samba/%m.log max log size = 50 security = ADS encrypt passwords = yes socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 preferred master = no name resolve order = wins bcast dns proxy = yes idmap domains = ALLDOMAINS idmap config ALLDOMAINS:backend = ad idmap config ALLDOMAINS:default = yes idmap config ALLDOMAINS:schema_mode = sfu template homedir = /home/%U winbind use default domain = yes winbind separator = + winbind enum users = yes winbind enum groups = yes winbind nss info = template sfu winbind offline logon = true winbind refresh tickets = true [xxx] path = /home/xxx writeable = yes valid users = ddd+xxx ddd+yyy create mask = 0755 map archive = yes [zzz] path = /home/zzz writeable = yes valid users = ddd+zzz ddd+yyy create mask = 0755 map archive = yes --- Robert GRASSO System Engineer CEDRAT 15, Chemin de Malacher - Inovallée - 38246 MEYLAN Cedex - FRANCE Tel: +33 (0)4 76 90 50 45 Fax: +33 (0)4 76 90 16 09 mailto:[EMAIL PROTECTED] --- Support service : mailto:[EMAIL PROTECTED] Commercial service : mailto:[EMAIL PROTECTED] Web site : http://www.cedrat.com -- 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] remove group mappings manually?
On 16/08/07, Paddy O'Herlihy [EMAIL PROTECTED] wrote: Hi, We have a os x server here with duplicate groupmappings unfortunately the net groupmap functions are broken due to apple modifications. Can I manually delete the groupmapping from the database? I assumed the group mappings were stored in ldap but can't find any reference there. The group_mapping tdb also seems empty so asides rom looking at the source I am at a loss. The right way to manipulate group mappings on OS X server is to use Workgroup Manager. You can add SMBSID or SMBRID attributes to groups to force them to be mapped to particular absolute or domain-relative SIDs. -- James Peach | [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Can't ping samba box after a while
We've got Samba running on a CentOS box. The rest of the network is Windows, controlled by a Small Business Server (Windows 2003). The Samba box gets an IP using DHCP. The Windows 2003 server is the DHCP server. When I reboot the samba box, I can ping it by name for a while. ping myservername works fine. After a few hours, though, I get Ping request could not find host errors. I can still ping the server using the IP address. What could cause this? Is it a problem with my samba configuration, or with the Windows server? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: smbd using 99.9% CPU with MS Office docs
Ben Tisdall wrote: I made a post a few weeks ago regarding this but was unable to find a solution. This is the situation: + I'm attempting to upgrade from samba 3.0.23a (Fedora core package 3.0.23a-1.fc4.1) to the latest version compiled from Samba source. Just a thought. Instead of compiling from source, have you tried downloading the fedora src file from samba.org and doing a rpmbuild --rebuild? That is the way I do it since it seems easier to me. The resulting rpm file is clever enough to move your samba files from redhat's locations (/var/cache/samba) to the default ones (/var/lib/samba). It will also tell you if you need additional packages installed in order to compile. Mark -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] SID
Hi, i`ve searched a lot, but i haven´t found a solution to it.. I have the this: One Server with samba 3.0.14a-3sarge1 on Debian Sarge. This Samba use Ldap as passdb backend... everything works great until this point. I have other samba 3.0.24-6etch4 On Debian Etch. The samba 3.0.14a-3sarge1 has: security = user passdb backend = ldapsam:ldap://127.0.0.1/ The Samba 3.0.24-6etch4 On Debian Etch security = server password server = name_of_the_other_samba_with_ldap So the thing is that in the Samba 3.0.14a-3sarge1 i can map share volumes from Windows Vista in other hand on Samba 3.0.24-6etch4 i cannot map the share volumes with Windows vista. it works great form any other windows auntil windows 2003. So i tried change the configuration in Samba 3.0.24-6etch4 to: security = user passdb backend = ldapsam:ldap://ip.of.samba.with.ldap/ and also add the other necesary stuff and after the changes when i try to map the shares on the Samba 3.0.24-6etch4 from windows vista i have this error: User mf with invalid SID S-1-5-21-3688588122-661306053-2264363457-21150 in passdb However in the linux box i try: smbclient -L //localhost -Umf it`s connect and can see the shares... but: smbclient -L //localhost/dat -Umf i write the passwd and get the same error. so, tried to put the SID of the server samba with the ldap tree... with: net setdomainsid S-1-5-21-3688588122-661306053-2264363457 net setdomainsid -W domain S-1-5-21-3688588122-661306053-2264363457 and when i do: SID for domain LINUX_14NORTE is: S-1-5-21-4042076608-3156973157-4245816591 i still got the another one... So, i read that some guys tried to modify the secrets.tdb... but it does not work for me.. Somebody have any idea about how to put or change the SID? Thanks in advance.!!! Michael.- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] php includes lost
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Phill Atwood wrote, On 22-08-2007 11:56: We have a windows network and the server is running mysql and php. If I access our web app via firefox from a windows box the app works fine. However, if I connect to it thru my laptop which is running Debian Etch and using samba I can access the web page but it doesn't function properly because the include statments in the php code aren't functioning properly. I have a feeling it is either a problem with my samba configuration or perhaps it is because I'm not entering the correct workgroup in the password dialog. When I use another windoze machine it doesn't ask me for a workgroup. I'm having trouble discovering what ones are defined if any on our system. Any suggestions for this problem are appreciated. If you don't access your PHP files using a web browser then you are not accessing the HTTP server that handles the PHP dynamic content and this is the expected behaviour. It is not clear to me how you are accessing the pages, but if you use IceWeasel (firefox without brand) in Debian it should work just fine. If you use a file browser in a samba mount point, it shouldn't work. Kind regards, - -- Felipe Augusto van de Wiel [EMAIL PROTECTED] Coordenadoria de Tecnologia da Informação (CTI) - SEDU/PARANACIDADE http://www.paranacidade.org.br/ Phone: (+55 41 3350 3300) -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGzHp0Cj65ZxU4gPQRCO1OAKCa2mFQVOjd5AjuPAW8t1texS5OigCdH4Ly CV9m/2Bvj8uOi76JkabEmcM= =ft/h -END PGP SIGNATURE- -- 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 18GB file Transfer
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Brad C wrote: Hmm.. this is windows to linux, the file however does copy across to a windows system just fine. does anyone have experience with copying large files using samba? You are using mount -t cifs ? If you're using -t smbfs that could explain your issues. Regards, Doug -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iD8DBQFGzIC5FqWysr/jOHMRAnTXAJ4m3w01z/7EpDpePgZjbexngBaVcACgxc6+ s90UBIwPtHkGiWOk5LyLWLk= =cMdz -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] php includes lost
On Wed, 2007-22-08 at 15:03 -0300, Felipe Augusto van de Wiel wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Phill Atwood wrote, On 22-08-2007 11:56: We have a windows network and the server is running mysql and php. If I access our web app via firefox from a windows box the app works fine. However, if I connect to it thru my laptop which is running Debian Etch and using samba I can access the web page but it doesn't function properly because the include statments in the php code aren't functioning properly. I have a feeling it is either a problem with my samba configuration or perhaps it is because I'm not entering the correct workgroup in the password dialog. When I use another windoze machine it doesn't ask me for a workgroup. I'm having trouble discovering what ones are defined if any on our system. Any suggestions for this problem are appreciated. If you don't access your PHP files using a web browser then you are not accessing the HTTP server that handles the PHP dynamic content and this is the expected behaviour. It is not clear to me how you are accessing the pages, but if you use IceWeasel (firefox without brand) in Debian it should work just fine. If you use a file browser in a samba mount point, it shouldn't work. Yes, I'm using IceWeasel. My url is smb://server/wwwroot/repository/index.php If I try: http://server/wwwroot/repository/index.php I get redirected to www.server.com Phill -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba on Debian with shares on nfs-filesystem
On Wed, Aug 22, 2007 at 10:58:25AM +0200, Bernd Schubert wrote: Hmm, interesting. If the problem is only byte range locking what about 'translating' byte range locking into entire file locking? No. This doesn't have the desired effect and would break most CIFS client access. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Strange directory creation behaviour
Greetings, I'm having a really hard time getting this to work the way I want it to. I have a Samba file server (3.0.25b-2) on Fedora 7 which serves around 20 clients (mostly WinXP but a couple of Macs). They all login via a single shared samba user which has full read/write permissions for the entire served directory. Unfortunately, I have two major problems: 1.) On an XP client, when copying a directory over to the server via Explorer, it is created with the read-only flag set. My immediate assumption was a permissions problem, BUT if I use XCOPY via the command prompt, then directories copy across fine. This is not an acceptable solution, however, since the average end-user doesn't even know what a command prompt is! If I manually create a folder on the server via Explorer (right click - new folder) then it will be created WITHOUT the read-only flag set, so why this is only happening when copying pre-created directories is really beyond me :( 2.) More directory creation woe with Mac users. When they create a directory on the server via Finder, it doesn't create properly. If you refresh the folder it appears, but if you try to click on it so you can open it, then it just disappears. Refreshing again will make it re-appear, but you can never get in to it. They can use any pre-existing folders no problem, however. I do not purport to be a Samba expert, so if there's something obvious that I'm missing here I apologise in advance. Thank you for assistance, Edward -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] winbind problem, have workaround but...
Greetings list, I have a member server in a w2k3 AD domain that has been happily spinning for a couple of years. As of yesterday morning, we've been having some issues with it. I've had it configured correctly, and haven't touched it. I'll provide the configs if needed. I've kept it updated as time's gone on for security updates etc.. the wonkyness seems to rear is head when winbindd gets restartes. In the log.winbindd file I get a tremendous amount of these 2007/08/22 10:23:42, 0] rpc_client/cli_pipe.c:cli_nt_setup_netsec(1622) Could not initialise \PIPE\NETLOGON [2007/08/22 10:23:42, 0] rpc_client/cli_pipe.c:cli_nt_setup_netsec(1622) Could not initialise \PIPE\NETLOGON [2007/08/22 10:23:42, 0] rpc_client/cli_pipe.c:cli_nt_setup_netsec(1622) Could not initialise \PIPE\NETLOGON [2007/08/22 10:23:42, 0] rpc_client/cli_pipe.c:cli_nt_setup_netsec(1622) Could not initialise \PIPE\NETLOGON but they stop as soon as I issue # net ads changetrustpw then it seems to connect and all is well until winbind gets restarted. I was following a lot of logs at lev3 yesterday, and some users were able to authenticate, on one machine but not on others..etc.. it was all very wonky until I did the net ads changetrustpw I can provide any information needed. I'm running mandriva corp server 3 with samba 3.014a. patched up to (CVE-2007-2444) (I think that's post 3.023d) I'm perplexed, and not sure what the proper permanent fix for it is. I'm thinking about removing it from the domain, and re-joining it, but I'm not sure what precisely is needed. (what files to delete, which ones to copy off etc..) I don't want to lose the winbindd_idmap.tdb or anything important. (I do back these up...) any help would be greatly appreciated. Kindest regards, Fred dussault -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Can't ping samba box after a while
Sounds like it has nothing to do with Samba at all. Sounds like a DNS issue. Examine how your DNS is configured. On Wed, 2007-08-22 at 11:14 -0500, Chris wrote: We've got Samba running on a CentOS box. The rest of the network is Windows, controlled by a Small Business Server (Windows 2003). The Samba box gets an IP using DHCP. The Windows 2003 server is the DHCP server. When I reboot the samba box, I can ping it by name for a while. ping myservername works fine. After a few hours, though, I get Ping request could not find host errors. I can still ping the server using the IP address. What could cause this? Is it a problem with my samba configuration, or with the Windows server? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Build error on 3.0.25c using Tru64
Has anyone built this on Tru64 Unix? I downloaded and attempted to build today and received this, # /usr/sbin/sizer -v HP Tru64 UNIX V5.1B (Rev. 2650); Tue Mar 20 15:08:40 CDT 2007 # # make Using FLAGS = -O -D_SAMBA_BUILD_=3 -I/usr/local/include -I/spi/opensource /samba-3.0.25c/source/iniparser/src -Iinclude -I./include -I. -I. -I./lib/repla ce -I./lib/talloc -I./tdb/include -I./libaddns -I./librpc -DHAVE_CONFIG_H -I /spi/opensource/samba-3.0.25c/source/lib -D_SAMBA_BUILD_=3 PICFLAG= -fPIC LIBS = -lproplist -lsecurity -lresolv -lresolv LDFLAGS= -pie -L/usr/local/lib DYNEXP = LDSHFLAGS = -shared -L/usr/local/lib SHLIBEXT = so SONAMEFLAG = -Wl,-soname, Compiling smbd/posix_acls.c smbd/posix_acls.c: In function `append_ugw_ace': smbd/posix_acls.c:3110: error: syntax error before '.' token smbd/posix_acls.c:3139: error: `acl_common' undeclared (first use in this functi on) smbd/posix_acls.c:3139: error: (Each undeclared identifier is reported only once smbd/posix_acls.c:3139: error: for each function it appears in.) The following command failed: gcc -I. -I/spi/opensource/samba-3.0.25c/source -O -D_SAMBA_BUILD_=3 -I/usr/loca l/include -I/spi/opensource/samba-3.0.25c/source/iniparser/src -Iinclude -I./in clude -I. -I. -I./lib/replace -I./lib/talloc -I./tdb/include -I./libaddns -I./l ibrpc -DHAVE_CONFIG_H -I/spi/opensource/samba-3.0.25c/source/lib -D_SAMBA_BU ILD_=3 -fPIC -c smbd/posix_acls.c -o smbd/posix_acls.o make: *** [smbd/posix_acls.o] Error 1 This was a continuation compile (make) where every previous program above this compiled okay. Now I can't even find a true acl_common and naturally no '.' token on line 3110 +/- a few dozen lines. I've withheld posting the ./configure run because of size. Available to anyone with some thoughts on how to fix this. I'm using TWW (The Written Word) builds of GCC and GNU tools. Previous Samba have built. Thanks in advance. -- Robert -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] gencache.tdb going missing
Hi everyone, I'm having an odd issue with a Samba install - it starts SIGABORTing complaining that gencache.tdb has gone missing.. ie [2007/08/09 12:52:50, 0] lib/util_tdb.c:tdb_log(662) tdb(/var/db/samba/gencache.tdb): tdb_reopen: open failed (No such file or directory) [2007/08/09 12:52:50, 0] smbd/server.c:open_sockets_smbd(572) tdb_reopen_all failed. If I recreate it and restart Samba it is happy (until it goes missing again..) This is on FreeBSD 6.2 with the latest Samba port (samba-3.0.25a_1,1). I have a FreeBSD 6.2 box running samba-3.0.24,1 without issue. I have the CUPS, Windbind, popt utmp options set in the port. I'm trying to catch it in the act but I wasn't working yesterday when it happened and the log rolled over (argh.. ) Does anyone else see this? -- Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au The nice thing about standards is that there are so many of them to choose from. -- Andrew Tanenbaum GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba tuning - ldapsam:trusted
Hey everybody... I have a samba configured as PDC and LDAP installed in the same machine. Ok. Everything is working correctly, but I want to enhance the performance. So, I read that if I set the ldapsam:trusted option, samba will directly communicate to ldap to get informations (not using NSS anymore). So, I decided to put ldapsam:trusted = yes and guest account = nobody in my config file. Therefore, everytime that I start/restart samba server it complains about it (and remains stopped). So, I don't know what should I do... because I already tried these steps: # userdel nobody # groupdel nobody # smbldap-groupadd -g 65534 -o nobody # smbldap-useradd -a -u 65534 -g 65534 -n -s /bin/false -d / nobody and I still can't start samba. The user account nobody is used for a several applications as dhcpd and others services in my box. Can I use another account to set this?! I can post my config file if it's necessary... just ask me :) Please, help me. Thanks in Advance, Guilherme _Machado_ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] php includes lost
On Wed, 2007-08-22 at 14:34 -0400, Phill Atwood wrote: On Wed, 2007-22-08 at 15:03 -0300, Felipe Augusto van de Wiel wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Phill Atwood wrote, On 22-08-2007 11:56: We have a windows network and the server is running mysql and php. If I access our web app via firefox from a windows box the app works fine. However, if I connect to it thru my laptop which is running Debian Etch and using samba I can access the web page but it doesn't function properly because the include statments in the php code aren't functioning properly. I have a feeling it is either a problem with my samba configuration or perhaps it is because I'm not entering the correct workgroup in the password dialog. When I use another windoze machine it doesn't ask me for a workgroup. I'm having trouble discovering what ones are defined if any on our system. Any suggestions for this problem are appreciated. If you don't access your PHP files using a web browser then you are not accessing the HTTP server that handles the PHP dynamic content and this is the expected behaviour. It is not clear to me how you are accessing the pages, but if you use IceWeasel (firefox without brand) in Debian it should work just fine. If you use a file browser in a samba mount point, it shouldn't work. Yes, I'm using IceWeasel. My url is smb://server/wwwroot/repository/index.php If I try: http://server/wwwroot/repository/index.php I get redirected to www.server.com You need to ensure that 'server' is a valid name in your local DNS, or an entry in /etc/hosts. Most non-samba tools on a unix system won't do a netbios name lookup, hence not finding the server. (You could configure nss_wins with a wins server if you really want...). Andrew Bartlett -- Andrew Bartlett http://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org Samba Developer, Red Hat Inc. signature.asc Description: This is a digitally signed message part -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Make: rc command not found
Hi, I also faced the same issue as you. A colleague showed me the 'way' :) .1 Check Makefile for AR= (not sure why it is blank, but that's the reason why all references to it with '-rc' are not found) .2 Add the path to the 'ar' command (#which ar) Hope this helps, James Tan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba r24614 - in branches/SAMBA_4_0/source: . heimdal/kdc heimdal/kuser heimdal/lib/asn1 heimdal/lib/gssapi/mech heimdal/lib/gssapi/spnego heimdal/lib/hcrypto heimdal/lib/hx509 heimdal/li
Author: abartlet Date: 2007-08-22 06:46:34 + (Wed, 22 Aug 2007) New Revision: 24614 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24614 Log: Merge with current lorikeet-heimdal. This brings us one step closer to an alpha release. Andrew Bartlett Added: branches/SAMBA_4_0/source/heimdal/lib/krb5/krb_err.et Modified: branches/SAMBA_4_0/source/heimdal/kdc/default_config.c branches/SAMBA_4_0/source/heimdal/kdc/digest.c branches/SAMBA_4_0/source/heimdal/kdc/kaserver.c branches/SAMBA_4_0/source/heimdal/kdc/kerberos4.c branches/SAMBA_4_0/source/heimdal/kdc/kerberos5.c branches/SAMBA_4_0/source/heimdal/kdc/kx509.c branches/SAMBA_4_0/source/heimdal/kuser/kinit.c branches/SAMBA_4_0/source/heimdal/lib/asn1/asn1_err.et branches/SAMBA_4_0/source/heimdal/lib/asn1/der_get.c branches/SAMBA_4_0/source/heimdal/lib/asn1/gen.c branches/SAMBA_4_0/source/heimdal/lib/asn1/gen_decode.c branches/SAMBA_4_0/source/heimdal/lib/asn1/gen_encode.c branches/SAMBA_4_0/source/heimdal/lib/asn1/gen_length.c branches/SAMBA_4_0/source/heimdal/lib/asn1/k5.asn1 branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c branches/SAMBA_4_0/source/heimdal/lib/asn1/parse.c branches/SAMBA_4_0/source/heimdal/lib/asn1/parse.h branches/SAMBA_4_0/source/heimdal/lib/asn1/rfc2459.asn1 branches/SAMBA_4_0/source/heimdal/lib/asn1/test.asn1 branches/SAMBA_4_0/source/heimdal/lib/asn1/timegm.c branches/SAMBA_4_0/source/heimdal/lib/gssapi/mech/gss_acquire_cred.c branches/SAMBA_4_0/source/heimdal/lib/gssapi/mech/gss_add_cred.c branches/SAMBA_4_0/source/heimdal/lib/gssapi/mech/gss_canonicalize_name.c branches/SAMBA_4_0/source/heimdal/lib/gssapi/mech/gss_compare_name.c branches/SAMBA_4_0/source/heimdal/lib/gssapi/mech/gss_duplicate_name.c branches/SAMBA_4_0/source/heimdal/lib/gssapi/mech/gss_init_sec_context.c branches/SAMBA_4_0/source/heimdal/lib/gssapi/mech/gss_mech_switch.c branches/SAMBA_4_0/source/heimdal/lib/gssapi/mech/gss_names.c branches/SAMBA_4_0/source/heimdal/lib/gssapi/mech/gss_oid_to_str.c branches/SAMBA_4_0/source/heimdal/lib/gssapi/mech/name.h branches/SAMBA_4_0/source/heimdal/lib/gssapi/spnego/accept_sec_context.c branches/SAMBA_4_0/source/heimdal/lib/gssapi/spnego/spnego.asn1 branches/SAMBA_4_0/source/heimdal/lib/hcrypto/hmac.c branches/SAMBA_4_0/source/heimdal/lib/hx509/ca.c branches/SAMBA_4_0/source/heimdal/lib/hx509/cert.c branches/SAMBA_4_0/source/heimdal/lib/hx509/hx509-private.h branches/SAMBA_4_0/source/heimdal/lib/hx509/ks_p11.c branches/SAMBA_4_0/source/heimdal/lib/hx509/peer.c branches/SAMBA_4_0/source/heimdal/lib/hx509/print.c branches/SAMBA_4_0/source/heimdal/lib/krb5/cache.c branches/SAMBA_4_0/source/heimdal/lib/krb5/changepw.c branches/SAMBA_4_0/source/heimdal/lib/krb5/get_cred.c branches/SAMBA_4_0/source/heimdal/lib/krb5/init_creds.c branches/SAMBA_4_0/source/heimdal/lib/krb5/init_creds_pw.c branches/SAMBA_4_0/source/heimdal/lib/krb5/krb5-private.h branches/SAMBA_4_0/source/heimdal/lib/krb5/krb5-protos.h branches/SAMBA_4_0/source/heimdal/lib/krb5/krb5-v4compat.h branches/SAMBA_4_0/source/heimdal/lib/krb5/krb5.h branches/SAMBA_4_0/source/heimdal/lib/krb5/krb5_locl.h branches/SAMBA_4_0/source/heimdal/lib/krb5/krbhst.c branches/SAMBA_4_0/source/heimdal/lib/krb5/pkinit.c branches/SAMBA_4_0/source/heimdal/lib/krb5/plugin.c branches/SAMBA_4_0/source/heimdal/lib/krb5/rd_priv.c branches/SAMBA_4_0/source/heimdal/lib/krb5/v4_glue.c branches/SAMBA_4_0/source/heimdal/lib/ntlm/ntlm.c branches/SAMBA_4_0/source/heimdal_build/config.mk branches/SAMBA_4_0/source/static_deps.mk Changeset: Sorry, the patch is too large (4353 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24614
Rev 593: merge from volker in http://samba.org/~tridge/ctdb
revno: 593
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Wed 2007-08-22 17:18:55 +1000
message:
merge from volker
modified:
common/system_linux.c system.c-20070525071636-a5n1ihghjtppy08r-3
doc/ctdb.1.xml ctdb.1.xml-20070608070258-bjuf7701h1qc1b05-2
doc/ctdbd.1.xmlctdbd.1.xml-20070610004256-jh1qq0ws5zidbmbq-1
=== modified file 'common/system_linux.c'
--- a/common/system_linux.c 2007-08-15 02:34:41 +
+++ b/common/system_linux.c 2007-08-22 07:18:55 +
@@ -161,8 +161,10 @@
{
uint32_t sum = uint16_checksum(data, n);
uint16_t sum2;
- sum += uint16_checksum((uint16_t *)ip-saddr, sizeof(ip-saddr));
- sum += uint16_checksum((uint16_t *)ip-daddr, sizeof(ip-daddr));
+ sum += uint16_checksum((uint16_t *)(void *)ip-saddr,
+ sizeof(ip-saddr));
+ sum += uint16_checksum((uint16_t *)(void *)ip-daddr,
+ sizeof(ip-daddr));
sum += ip-protocol + n;
sum = (sum 0x) + (sum 16);
sum = (sum 0x) + (sum 16);
=== modified file 'doc/ctdb.1.xml'
--- a/doc/ctdb.1.xml2007-08-02 21:53:52 +
+++ b/doc/ctdb.1.xml2007-08-22 07:18:55 +
@@ -59,7 +59,7 @@
varlistentryterm-Y/term
listitem
para
-Produce output in machinereadable form for easier parsing by
scripts. Not all commands support this option.
+Produce output in machine readable form for easier parsing by
scripts. Not all commands support this option.
/para
/listitem
/varlistentry
@@ -132,7 +132,7 @@
OK - This node is fully functional.
/para
para
- DISCONNECTED - This node could not be connected through the network
and is currently not parcipitating in the cluster. If there is a public IP
address associated with this node it should have been taken over by a different
node. No services are running on this node.
+ DISCONNECTED - This node could not be connected through the network
and is currently not participating in the cluster. If there is a public IP
address associated with this node it should have been taken over by a different
node. No services are running on this node.
/para
para
DISABLED - This node has been administratively disabled. This node
is still functional and participates in the CTDB cluster but its IP addresses
have been taken over by a different node and no services are currently being
hosted.
@@ -156,7 +156,7 @@
refsect3titleVNNMAP/title
para
The list of Virtual Node Numbers. This is a list of all nodes that
actively participates in the cluster and that share the workload of hosting the
Clustered TDB database records.
- Only nodes that are parcipitating in the vnnmap can become lmaster
or dmaster for a database record.
+ Only nodes that are participating in the vnnmap can become lmaster
or dmaster for a database record.
/para
/refsect3
=== modified file 'doc/ctdbd.1.xml'
--- a/doc/ctdbd.1.xml 2007-07-10 05:46:05 +
+++ b/doc/ctdbd.1.xml 2007-08-22 07:18:55 +
@@ -319,7 +319,7 @@
para
DISCONNECTED - This node could not be connected through the network
- and is currently not parcipitating in the cluster. If there is a
+ and is currently not particpating in the cluster. If there is a
public IP address associated with this node it should have been taken
over by a different node. No services are running on this node.
/para
Rev 592: merge from volker in http://samba.org/~tridge/ctdb
revno: 592
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Wed 2007-08-22 17:16:01 +1000
message:
merge from volker
modified:
Makefile.inmakefile.in-20061117234101-o3qt14umlg9en8z0-1
tests/rb_test.crb_test.c-20070808012115-zxl6646v2t2axezt-1
utils/smnotify/smnotify.c smnotify.c-20070803001844-k0ekeu031hzlt8bg-3
=== modified file 'Makefile.in'
--- a/Makefile.in 2007-08-15 05:01:31 +
+++ b/Makefile.in 2007-08-22 07:16:01 +
@@ -135,6 +135,7 @@
clean:
rm -f *.o */*.o */*/*.o */*~
+ rm -f utils/smnotify/gen_xdr.c
rm -f $(BINS) $(SBINS) $(TEST_BINS)
distclean: clean
=== modified file 'tests/rb_test.c'
--- a/tests/rb_test.c 2007-08-15 00:57:21 +
+++ b/tests/rb_test.c 2007-08-22 07:16:01 +
@@ -134,7 +134,7 @@
printf(testing trbt_insert32_callback for %d records\n, num_records);
memctx = talloc_new(NULL);
- u32array = talloc_array(memctx, uint32_t, num_records);
+ u32array = talloc_array(memctx, uint32_t *, num_records);
tree = trbt_create(memctx, 0);
for (i=0; inum_records; i++) {
u32array[i] = talloc(u32array, uint32_t);
@@ -175,7 +175,7 @@
printf(testing trbt_insertarray32_callback\n);
memctx = talloc_new(NULL);
tree = trbt_create(memctx, 0);
- u32array = talloc_array(memctx, uint32_t, 4);
+ u32array = talloc_array(memctx, uint32_t *, 4);
for (i=0;i4;i++) {
u32array[i] = talloc(u32array, uint32_t);
*u32array[i] = 0;
=== modified file 'utils/smnotify/smnotify.c'
--- a/utils/smnotify/smnotify.c 2007-08-03 00:47:37 +
+++ b/utils/smnotify/smnotify.c 2007-08-22 07:16:01 +
@@ -28,7 +28,7 @@
static char *client = NULL;
static const char *ip = NULL;
-static const char *server = NULL;
+static char *server = NULL;
static int stateval = 0;
static int clientport = 0;
static int sendport = 0;
svn commit: samba r24615 - in branches: SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch
Author: gd
Date: 2007-08-22 09:32:37 + (Wed, 22 Aug 2007)
New Revision: 24615
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24615
Log:
Say for which domain the getdcname request failed.
Guenther
Modified:
branches/SAMBA_3_2/source/nsswitch/winbindd_misc.c
branches/SAMBA_3_2_0/source/nsswitch/winbindd_misc.c
Changeset:
Modified: branches/SAMBA_3_2/source/nsswitch/winbindd_misc.c
===
--- branches/SAMBA_3_2/source/nsswitch/winbindd_misc.c 2007-08-22 06:46:34 UTC
(rev 24614)
+++ branches/SAMBA_3_2/source/nsswitch/winbindd_misc.c 2007-08-22 09:32:37 UTC
(rev 24615)
@@ -253,7 +253,8 @@
cli_set_timeout(netlogon_pipe-cli, orig_timeout);
if (!W_ERROR_IS_OK(werr)) {
- DEBUG(5, (Error requesting DCname: %s\n, dos_errstr(werr)));
+ DEBUG(5, (Error requesting DCname for domain %s: %s\n,
+ state-request.domain_name, dos_errstr(werr)));
return WINBINDD_ERROR;
}
Modified: branches/SAMBA_3_2_0/source/nsswitch/winbindd_misc.c
===
--- branches/SAMBA_3_2_0/source/nsswitch/winbindd_misc.c2007-08-22
06:46:34 UTC (rev 24614)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbindd_misc.c2007-08-22
09:32:37 UTC (rev 24615)
@@ -253,7 +253,8 @@
cli_set_timeout(netlogon_pipe-cli, orig_timeout);
if (!W_ERROR_IS_OK(werr)) {
- DEBUG(5, (Error requesting DCname: %s\n, dos_errstr(werr)));
+ DEBUG(5, (Error requesting DCname for domain %s: %s\n,
+ state-request.domain_name, dos_errstr(werr)));
return WINBINDD_ERROR;
}
svn commit: samba r24616 - in branches: SAMBA_3_2/source/param SAMBA_3_2_0/source/param
Author: obnox
Date: 2007-08-22 10:47:32 + (Wed, 22 Aug 2007)
New Revision: 24616
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24616
Log:
In set_boolean(), only pass the result back to the caller
if parsing of the boolean string was successful.
Also, initialize the local result variable
(although not strictly necessary anymore, now.)
Modified:
branches/SAMBA_3_2/source/param/loadparm.c
branches/SAMBA_3_2_0/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_2/source/param/loadparm.c
===
--- branches/SAMBA_3_2/source/param/loadparm.c 2007-08-22 09:32:37 UTC (rev
24615)
+++ branches/SAMBA_3_2/source/param/loadparm.c 2007-08-22 10:47:32 UTC (rev
24616)
@@ -3090,6 +3090,7 @@
BOOL value;
bRetval = True;
+ value = False;
if (strwicmp(pszParmValue, yes) == 0 ||
strwicmp(pszParmValue, true) == 0 ||
strwicmp(pszParmValue, 1) == 0)
@@ -3105,7 +3106,7 @@
bRetval = False;
}
- if (pb != NULL) {
+ if ((pb != NULL) (bRetval != False)) {
*pb = value;
}
Modified: branches/SAMBA_3_2_0/source/param/loadparm.c
===
--- branches/SAMBA_3_2_0/source/param/loadparm.c2007-08-22 09:32:37 UTC
(rev 24615)
+++ branches/SAMBA_3_2_0/source/param/loadparm.c2007-08-22 10:47:32 UTC
(rev 24616)
@@ -3095,6 +3095,7 @@
BOOL value;
bRetval = True;
+ value = False;
if (strwicmp(pszParmValue, yes) == 0 ||
strwicmp(pszParmValue, true) == 0 ||
strwicmp(pszParmValue, 1) == 0)
@@ -3110,7 +3111,7 @@
bRetval = False;
}
- if (pb != NULL) {
+ if ((pb != NULL) (bRetval != False)) {
*pb = value;
}
svn commit: samba r24617 - in branches/SAMBA_3_0_25/source/modules: .
Author: vlendec Date: 2007-08-22 11:23:24 + (Wed, 22 Aug 2007) New Revision: 24617 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24617 Log: Revert -r24035. No idea what this was. Sorry for breaking the build of the aixacl2 module. Modified: branches/SAMBA_3_0_25/source/modules/nfs4_acls.h Changeset: Modified: branches/SAMBA_3_0_25/source/modules/nfs4_acls.h === --- branches/SAMBA_3_0_25/source/modules/nfs4_acls.h2007-08-22 10:47:32 UTC (rev 24616) +++ branches/SAMBA_3_0_25/source/modules/nfs4_acls.h2007-08-22 11:23:24 UTC (rev 24617) @@ -138,7 +138,7 @@ * when applicable */ typedef BOOL (*set_nfs4acl_native_fn_t)(files_struct *, SMB4ACL_T *); -NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp, +BOOL smb_set_nt_acl_nfs4(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd, set_nfs4acl_native_fn_t set_nfs4_native);
svn commit: samba r24618 - in branches/SAMBA_3_2/source/lib: .
Author: metze
Date: 2007-08-22 11:55:48 + (Wed, 22 Aug 2007)
New Revision: 24618
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24618
Log:
move printing out the version string and exit()
into the popt _POST processing.
Now 'smbd -V --bla' complains about an unknown option
metze
Modified:
branches/SAMBA_3_2/source/lib/popt_common.c
Changeset:
Modified: branches/SAMBA_3_2/source/lib/popt_common.c
===
--- branches/SAMBA_3_2/source/lib/popt_common.c 2007-08-22 11:23:24 UTC (rev
24617)
+++ branches/SAMBA_3_2/source/lib/popt_common.c 2007-08-22 11:55:48 UTC (rev
24618)
@@ -57,6 +57,8 @@
lp_set_logfile(logfile);
}
+static BOOL PrintSambaVersionString;
+
static void popt_common_callback(poptContext con,
enum poptCallbackReason reason,
const struct poptOption *opt,
@@ -68,6 +70,14 @@
return;
}
+ if (reason == POPT_CALLBACK_REASON_POST) {
+ if (!PrintSambaVersionString) return;
+
+ printf( Version %s\n, SAMBA_VERSION_STRING);
+ exit(0);
+ return;
+ }
+
switch(opt-val) {
case 'd':
if (arg) {
@@ -77,8 +87,7 @@
break;
case 'V':
- printf( Version %s\n, SAMBA_VERSION_STRING);
- exit(0);
+ PrintSambaVersionString = True;
break;
case 'O':
@@ -133,7 +142,7 @@
};
struct poptOption popt_common_samba[] = {
- { NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE, (void
*)popt_common_callback },
+ { NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE|POPT_CBFLAG_POST, (void
*)popt_common_callback },
{ debuglevel, 'd', POPT_ARG_STRING, NULL, 'd', Set debug level,
DEBUGLEVEL },
{ configfile, 's', POPT_ARG_STRING, NULL, 's', Use alternate
configuration file, CONFIGFILE },
{ log-basename, 'l', POPT_ARG_STRING, NULL, 'l', Base name for log
files, LOGFILEBASE },
svn commit: samba r24619 - in branches/SAMBA_3_2_0/source/lib: .
Author: metze
Date: 2007-08-22 12:03:13 + (Wed, 22 Aug 2007)
New Revision: 24619
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24619
Log:
move printing out the version string and exit()
into the popt _POST processing.
Now 'smbd -V --bla' complains about an unknown option
metze
Modified:
branches/SAMBA_3_2_0/source/lib/popt_common.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/lib/popt_common.c
===
--- branches/SAMBA_3_2_0/source/lib/popt_common.c 2007-08-22 11:55:48 UTC
(rev 24618)
+++ branches/SAMBA_3_2_0/source/lib/popt_common.c 2007-08-22 12:03:13 UTC
(rev 24619)
@@ -57,6 +57,8 @@
lp_set_logfile(logfile);
}
+static BOOL PrintSambaVersionString;
+
static void popt_common_callback(poptContext con,
enum poptCallbackReason reason,
const struct poptOption *opt,
@@ -68,6 +70,14 @@
return;
}
+ if (reason == POPT_CALLBACK_REASON_POST) {
+ if (!PrintSambaVersionString) return;
+
+ printf( Version %s\n, SAMBA_VERSION_STRING);
+ exit(0);
+ return;
+ }
+
switch(opt-val) {
case 'd':
if (arg) {
@@ -77,8 +87,7 @@
break;
case 'V':
- printf( Version %s\n, SAMBA_VERSION_STRING);
- exit(0);
+ PrintSambaVersionString = True;
break;
case 'O':
@@ -133,7 +142,7 @@
};
struct poptOption popt_common_samba[] = {
- { NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE, (void
*)popt_common_callback },
+ { NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE|POPT_CBFLAG_POST, (void
*)popt_common_callback },
{ debuglevel, 'd', POPT_ARG_STRING, NULL, 'd', Set debug level,
DEBUGLEVEL },
{ configfile, 's', POPT_ARG_STRING, NULL, 's', Use alternate
configuration file, CONFIGFILE },
{ log-basename, 'l', POPT_ARG_STRING, NULL, 'l', Base name for log
files, LOGFILEBASE },
svn commit: samba r24620 - in branches/SAMBA_4_0/source/lib/cmdline: .
Author: metze
Date: 2007-08-22 12:04:42 + (Wed, 22 Aug 2007)
New Revision: 24620
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24620
Log:
move printing out the version string and exit()
into the popt _POST processing.
Now 'smbd -V --bla' complains about an unknown option
metze
Modified:
branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
===
--- branches/SAMBA_4_0/source/lib/cmdline/popt_common.c 2007-08-22 12:03:13 UTC
(rev 24619)
+++ branches/SAMBA_4_0/source/lib/cmdline/popt_common.c 2007-08-22 12:04:42 UTC
(rev 24620)
@@ -39,6 +39,8 @@
struct cli_credentials *cmdline_credentials = NULL;
+static bool PrintSambaVersionString;
+
static void popt_common_callback(poptContext con,
enum poptCallbackReason reason,
const struct poptOption *opt,
@@ -47,6 +49,11 @@
const char *pname;
if (reason == POPT_CALLBACK_REASON_POST) {
+ if (PrintSambaVersionString) {
+ printf( Version %s\n, SAMBA_VERSION_STRING );
+ exit(0);
+ }
+
lp_load();
/* Hook any 'every Samba program must do this, after
* the smb.conf is setup' functions here */
@@ -85,8 +92,7 @@
break;
case 'V':
- printf( Version %s\n, SAMBA_VERSION_STRING );
- exit(0);
+ PrintSambaVersionString = true;
break;
case 'O':
@@ -176,7 +182,7 @@
};
struct poptOption popt_common_version[] = {
- { NULL, 0, POPT_ARG_CALLBACK, (void *)popt_common_callback },
+ { NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_POST, (void
*)popt_common_callback },
{ version, 'V', POPT_ARG_NONE, NULL, 'V', Print version },
{ NULL }
};
svn commit: samba r24621 - in branches/SAMBA_3_2/source: nmbd nsswitch smbd
Author: metze
Date: 2007-08-22 12:06:27 + (Wed, 22 Aug 2007)
New Revision: 24621
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24621
Log:
- deferr calling build_options();exit(0);
- use poptPrintUsage() to give the user more info
metze
Modified:
branches/SAMBA_3_2/source/nmbd/nmbd.c
branches/SAMBA_3_2/source/nsswitch/winbindd.c
branches/SAMBA_3_2/source/smbd/server.c
Changeset:
Modified: branches/SAMBA_3_2/source/nmbd/nmbd.c
===
--- branches/SAMBA_3_2/source/nmbd/nmbd.c 2007-08-22 12:04:42 UTC (rev
24620)
+++ branches/SAMBA_3_2/source/nmbd/nmbd.c 2007-08-22 12:06:27 UTC (rev
24621)
@@ -678,8 +678,9 @@
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
default:
- d_fprintf(stderr, \nInvalid option %s: %s\n,
+ d_fprintf(stderr, \nInvalid option %s: %s\n\n,
poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
exit(1);
}
};
Modified: branches/SAMBA_3_2/source/nsswitch/winbindd.c
===
--- branches/SAMBA_3_2/source/nsswitch/winbindd.c 2007-08-22 12:04:42 UTC
(rev 24620)
+++ branches/SAMBA_3_2/source/nsswitch/winbindd.c 2007-08-22 12:06:27 UTC
(rev 24621)
@@ -1017,8 +1017,9 @@
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
default:
- d_fprintf(stderr, \nInvalid option %s: %s\n,
+ d_fprintf(stderr, \nInvalid option %s: %s\n\n,
poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
exit(1);
}
}
@@ -1036,6 +1037,8 @@
exit(1);
}
+ poptFreeContext(pc);
+
if (!override_logfile) {
pstr_sprintf(logfile, %s/log.winbindd, dyn_LOGFILEBASE);
lp_set_logfile(logfile);
@@ -1167,8 +1170,6 @@
messaging_register(winbind_messaging_context(), NULL,
MSG_DUMP_EVENT_LIST, winbind_msg_dump_event_list);
- poptFreeContext(pc);
-
netsamlogon_cache_init(); /* Non-critical */
/* clear the cached list of trusted domains */
Modified: branches/SAMBA_3_2/source/smbd/server.c
===
--- branches/SAMBA_3_2/source/smbd/server.c 2007-08-22 12:04:42 UTC (rev
24620)
+++ branches/SAMBA_3_2/source/smbd/server.c 2007-08-22 12:06:27 UTC (rev
24621)
@@ -818,6 +818,7 @@
const char *profile_level = NULL;
int opt;
poptContext pc;
+ BOOL print_build_options = False;
enum smb_server_mode server_mode = SERVER_MODE_DAEMON;
@@ -849,21 +850,25 @@
#endif
pc = poptGetContext(smbd, argc, argv, long_options, 0);
-
while((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
case 'b':
- build_options(True); /* Display output to screen as
well as debug */
- exit(0);
+ print_build_options = True;
+ break;
default:
- d_fprintf(stderr, \nInvalid option %s: %s\n,
+ d_fprintf(stderr, \nInvalid option %s: %s\n\n,
poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
exit(1);
}
}
-
poptFreeContext(pc);
+ if (print_build_options) {
+ build_options(True); /* Display output to screen as well as
debug */
+ exit(0);
+ }
+
#ifdef HAVE_SETLUID
/* needed for SecureWare on SCO */
setluid(0);
svn commit: samba r24622 - in branches/SAMBA_3_2_0/source: nmbd nsswitch smbd
Author: metze
Date: 2007-08-22 12:06:54 + (Wed, 22 Aug 2007)
New Revision: 24622
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24622
Log:
- deferr calling build_options();exit(0);
- use poptPrintUsage() to give the user more info
metze
Modified:
branches/SAMBA_3_2_0/source/nmbd/nmbd.c
branches/SAMBA_3_2_0/source/nsswitch/winbindd.c
branches/SAMBA_3_2_0/source/smbd/server.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/nmbd/nmbd.c
===
--- branches/SAMBA_3_2_0/source/nmbd/nmbd.c 2007-08-22 12:06:27 UTC (rev
24621)
+++ branches/SAMBA_3_2_0/source/nmbd/nmbd.c 2007-08-22 12:06:54 UTC (rev
24622)
@@ -681,8 +681,9 @@
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
default:
- d_fprintf(stderr, \nInvalid option %s: %s\n,
+ d_fprintf(stderr, \nInvalid option %s: %s\n\n,
poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
exit(1);
}
};
Modified: branches/SAMBA_3_2_0/source/nsswitch/winbindd.c
===
--- branches/SAMBA_3_2_0/source/nsswitch/winbindd.c 2007-08-22 12:06:27 UTC
(rev 24621)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbindd.c 2007-08-22 12:06:54 UTC
(rev 24622)
@@ -986,8 +986,9 @@
Fork = False;
break;
default:
- d_fprintf(stderr, \nInvalid option %s: %s\n,
+ d_fprintf(stderr, \nInvalid option %s: %s\n\n,
poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
exit(1);
}
}
@@ -998,6 +999,8 @@
exit(1);
}
+ poptFreeContext(pc);
+
if (!override_logfile) {
pstr_sprintf(logfile, %s/log.winbindd, dyn_LOGFILEBASE);
lp_set_logfile(logfile);
@@ -1124,8 +1127,6 @@
messaging_register(winbind_messaging_context(), NULL,
MSG_DUMP_EVENT_LIST, winbind_msg_dump_event_list);
- poptFreeContext(pc);
-
netsamlogon_cache_init(); /* Non-critical */
/* clear the cached list of trusted domains */
Modified: branches/SAMBA_3_2_0/source/smbd/server.c
===
--- branches/SAMBA_3_2_0/source/smbd/server.c 2007-08-22 12:06:27 UTC (rev
24621)
+++ branches/SAMBA_3_2_0/source/smbd/server.c 2007-08-22 12:06:54 UTC (rev
24622)
@@ -861,6 +861,7 @@
static char *profile_level = NULL;
int opt;
poptContext pc;
+ BOOL print_build_options = False;
struct poptOption long_options[] = {
POPT_AUTOHELP
@@ -886,21 +887,25 @@
#endif
pc = poptGetContext(smbd, argc, argv, long_options, 0);
-
while((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
case 'b':
- build_options(True); /* Display output to screen as
well as debug */
- exit(0);
+ print_build_options = True;
+ break;
default:
- d_fprintf(stderr, \nInvalid option %s: %s\n,
+ d_fprintf(stderr, \nInvalid option %s: %s\n\n,
poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
exit(1);
}
}
-
poptFreeContext(pc);
+ if (print_build_options) {
+ build_options(True); /* Display output to screen as well as
debug */
+ exit(0);
+ }
+
#ifdef HAVE_SETLUID
/* needed for SecureWare on SCO */
setluid(0);
svn commit: samba r24623 - in branches/SAMBA_4_0/source/smbd: .
Author: metze
Date: 2007-08-22 12:21:40 + (Wed, 22 Aug 2007)
New Revision: 24623
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24623
Log:
add back '-D' option to smbd
metze
Modified:
branches/SAMBA_4_0/source/smbd/server.c
Changeset:
Modified: branches/SAMBA_4_0/source/smbd/server.c
===
--- branches/SAMBA_4_0/source/smbd/server.c 2007-08-22 12:06:54 UTC (rev
24622)
+++ branches/SAMBA_4_0/source/smbd/server.c 2007-08-22 12:21:40 UTC (rev
24623)
@@ -181,7 +181,8 @@
*/
static int binary_smbd_main(const char *binary_name, int argc, const char
*argv[])
{
- BOOL interactive = False;
+ bool opt_daemon = false;
+ bool opt_interactive = false;
int opt;
poptContext pc;
init_module_fn static_init[] = STATIC_service_MODULES;
@@ -191,11 +192,14 @@
const char *model = standard;
int max_runtime = 0;
enum {
- OPT_INTERACTIVE = 1000,
+ OPT_DAEMON = 1000,
+ OPT_INTERACTIVE,
OPT_PROCESS_MODEL
};
struct poptOption long_options[] = {
POPT_AUTOHELP
+ {daemon, 'D', POPT_ARG_NONE, NULL, OPT_DAEMON,
+Become a daemon (default), NULL },
{interactive, 'i', POPT_ARG_NONE, NULL, OPT_INTERACTIVE,
Run interactive (not a daemon), NULL},
{model, 'M', POPT_ARG_STRING, NULL, OPT_PROCESS_MODEL,
@@ -208,20 +212,38 @@
};
pc = poptGetContext(binary_name, argc, argv, long_options, 0);
-
while((opt = poptGetNextOpt(pc)) != -1) {
switch(opt) {
+ case OPT_DAEMON:
+ opt_daemon = true;
+ break;
case OPT_INTERACTIVE:
- interactive = True;
+ opt_interactive = true;
break;
case OPT_PROCESS_MODEL:
model = poptGetOptArg(pc);
break;
+ default:
+ d_fprintf(stderr, \nInvalid option %s: %s\n\n,
+ poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
}
}
+
+ if (opt_daemon opt_interactive) {
+ d_fprintf(stderr,\nERROR:
+ Option -i|--interactive is not allowed together with
-D|--daemon\n\n);
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
+ } else if (!opt_interactive) {
+ /* default is --daemon */
+ opt_daemon = true;
+ }
+
poptFreeContext(pc);
- setup_logging(binary_name, interactive?DEBUG_STDOUT:DEBUG_FILE);
+ setup_logging(binary_name, opt_interactive?DEBUG_STDOUT:DEBUG_FILE);
setup_signals();
/* we want total control over the permissions on created files,
@@ -238,7 +260,7 @@
exit(1);
}
- if (!interactive) {
+ if (opt_daemon) {
DEBUG(3,(Becoming a daemon.\n));
become_daemon(True);
}
@@ -289,7 +311,7 @@
/* initialise clustering if needed */
cluster_ctdb_init(event_ctx, model);
- if (interactive) {
+ if (opt_interactive) {
/* catch EOF on stdin */
#ifdef SIGTTIN
signal(SIGTTIN, SIG_IGN);
svn commit: samba r24624 - in branches/SAMBA_3_2_0/source/nsswitch: .
Author: metze
Date: 2007-08-22 12:23:18 + (Wed, 22 Aug 2007)
New Revision: 24624
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24624
Log:
add '-D' option to winbindd as we no longer ignore
unknown options.
forbit: '-D -i' together
metze
Modified:
branches/SAMBA_3_2_0/source/nsswitch/winbindd.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/nsswitch/winbindd.c
===
--- branches/SAMBA_3_2_0/source/nsswitch/winbindd.c 2007-08-22 12:21:40 UTC
(rev 24623)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbindd.c 2007-08-22 12:23:18 UTC
(rev 24624)
@@ -932,6 +932,7 @@
int main(int argc, char **argv, char **envp)
{
pstring logfile;
+ static BOOL is_daemon = False;
static BOOL Fork = True;
static BOOL log_stdout = False;
static BOOL no_process_group = False;
@@ -940,6 +941,7 @@
{ stdout, 'S', POPT_ARG_VAL, log_stdout, True, Log to
stdout },
{ foreground, 'F', POPT_ARG_VAL, Fork, False, Daemon in
foreground mode },
{ no-process-group, 0, POPT_ARG_VAL, no_process_group, True,
Don't create a new process group },
+ { daemon, 'D', POPT_ARG_NONE, NULL, 'D', Become a daemon
(default) },
{ interactive, 'i', POPT_ARG_NONE, NULL, 'i', Interactive
mode },
{ no-caching, 'n', POPT_ARG_VAL, opt_nocache, True, Disable
caching },
POPT_COMMON_SAMBA
@@ -980,6 +982,9 @@
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
/* Don't become a daemon */
+ case 'D':
+ is_daemon = True;
+ break;
case 'i':
interactive = True;
log_stdout = True;
@@ -993,8 +998,16 @@
}
}
+ if (is_daemon interactive) {
+ d_fprintf(stderr,\nERROR:
+ Option -i|--interactive is not allowed together with
-D|--daemon\n\n);
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
+ }
+
if (log_stdout Fork) {
- printf(Can't log to stdout (-S) unless daemon is in foreground
+(-F) or interactive (-i)\n);
+ d_fprintf(stderr, \nERROR:
+ Can't log to stdout (-S) unless daemon is in
foreground +(-F) or interactive (-i)\n\n);
poptPrintUsage(pc, stderr, 0);
exit(1);
}
svn commit: samba r24625 - in branches/SAMBA_3_2/source/nsswitch: .
Author: metze
Date: 2007-08-22 12:28:58 + (Wed, 22 Aug 2007)
New Revision: 24625
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24625
Log:
add '-D' option to winbindd
TODO: don't allow '-i -D' and '-D -i' on all
server binaries in the SAMBA_3_2 branch!
The server_mode patch makes this difficult to check...
metze
Modified:
branches/SAMBA_3_2/source/nsswitch/winbindd.c
Changeset:
Modified: branches/SAMBA_3_2/source/nsswitch/winbindd.c
===
--- branches/SAMBA_3_2/source/nsswitch/winbindd.c 2007-08-22 12:23:18 UTC
(rev 24624)
+++ branches/SAMBA_3_2/source/nsswitch/winbindd.c 2007-08-22 12:28:58 UTC
(rev 24625)
@@ -977,6 +977,7 @@
{ stdout, 'S', POPT_ARG_VAL, log_stdout, True, Log to
stdout },
{ foreground, 'F', POPT_ARG_VAL, server_mode,
SERVER_MODE_FOREGROUND, Daemon in foreground mode },
{ no-process-group, 0, POPT_ARG_VAL, no_process_group, True,
Don't create a new process group },
+ { daemon, 'D', POPT_ARG_VAL, server_mode,
SERVER_MODE_DAEMON, Become a daemon (default) },
{ interactive, 'i', POPT_ARG_VAL, server_mode,
SERVER_MODE_INTERACTIVE, Interactive mode },
{ no-caching, 'n', POPT_ARG_VAL, opt_nocache, True, Disable
caching },
POPT_COMMON_SAMBA
svn commit: samba r24626 - in branches/SAMBA_4_0/source/lib/talloc: .
Author: metze
Date: 2007-08-22 12:44:22 + (Wed, 22 Aug 2007)
New Revision: 24626
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24626
Log:
as TALLOC_ABORT() is defined to abort() by default
wrap it into a function so that the function name
in the backtrace shows what happens.
metze
Modified:
branches/SAMBA_4_0/source/lib/talloc/talloc.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.c
===
--- branches/SAMBA_4_0/source/lib/talloc/talloc.c 2007-08-22 12:28:58 UTC
(rev 24625)
+++ branches/SAMBA_4_0/source/lib/talloc/talloc.c 2007-08-22 12:44:22 UTC
(rev 24626)
@@ -115,6 +115,16 @@
#define TC_HDR_SIZE ((sizeof(struct talloc_chunk)+15)~15)
#define TC_PTR_FROM_CHUNK(tc) ((void *)(TC_HDR_SIZE + (char*)tc))
+static void talloc_abort_double_free(void)
+{
+ TALLOC_ABORT(Bad talloc magic value - double free);
+}
+
+static void talloc_abort_unknown_value(void)
+{
+ TALLOC_ABORT(Bad talloc magic value - unknown value);
+}
+
/* panic if we get a bad magic value */
static inline struct talloc_chunk *talloc_chunk_from_ptr(const void *ptr)
{
@@ -122,9 +132,9 @@
struct talloc_chunk *tc = discard_const_p(struct talloc_chunk, pp -
TC_HDR_SIZE);
if (unlikely((tc-flags (TALLOC_FLAG_FREE | ~0xF)) != TALLOC_MAGIC))
{
if (tc-flags TALLOC_FLAG_FREE) {
- TALLOC_ABORT(Bad talloc magic value - double free);
+ talloc_abort_double_free();
} else {
- TALLOC_ABORT(Bad talloc magic value - unknown value);
+ talloc_abort_unknown_value();
}
}
return tc;
svn commit: samba r24627 - in branches/SAMBA_3_2/source/lib/talloc: .
Author: metze
Date: 2007-08-22 12:44:41 + (Wed, 22 Aug 2007)
New Revision: 24627
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24627
Log:
merge from SAMBA_4_0:
as TALLOC_ABORT() is defined to abort() by default
wrap it into a function so that the function name
in the backtrace shows what happens.
metze
Modified:
branches/SAMBA_3_2/source/lib/talloc/talloc.c
Changeset:
Modified: branches/SAMBA_3_2/source/lib/talloc/talloc.c
===
--- branches/SAMBA_3_2/source/lib/talloc/talloc.c 2007-08-22 12:44:22 UTC
(rev 24626)
+++ branches/SAMBA_3_2/source/lib/talloc/talloc.c 2007-08-22 12:44:41 UTC
(rev 24627)
@@ -115,6 +115,16 @@
#define TC_HDR_SIZE ((sizeof(struct talloc_chunk)+15)~15)
#define TC_PTR_FROM_CHUNK(tc) ((void *)(TC_HDR_SIZE + (char*)tc))
+static void talloc_abort_double_free(void)
+{
+ TALLOC_ABORT(Bad talloc magic value - double free);
+}
+
+static void talloc_abort_unknown_value(void)
+{
+ TALLOC_ABORT(Bad talloc magic value - unknown value);
+}
+
/* panic if we get a bad magic value */
static inline struct talloc_chunk *talloc_chunk_from_ptr(const void *ptr)
{
@@ -122,9 +132,9 @@
struct talloc_chunk *tc = discard_const_p(struct talloc_chunk, pp -
TC_HDR_SIZE);
if (unlikely((tc-flags (TALLOC_FLAG_FREE | ~0xF)) != TALLOC_MAGIC))
{
if (tc-flags TALLOC_FLAG_FREE) {
- TALLOC_ABORT(Bad talloc magic value - double free);
+ talloc_abort_double_free();
} else {
- TALLOC_ABORT(Bad talloc magic value - unknown value);
+ talloc_abort_unknown_value();
}
}
return tc;
svn commit: samba r24628 - in branches/SAMBA_3_2_0/source/lib/talloc: .
Author: metze
Date: 2007-08-22 12:45:07 + (Wed, 22 Aug 2007)
New Revision: 24628
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24628
Log:
merge from SAMBA_4_0:
as TALLOC_ABORT() is defined to abort() by default
wrap it into a function so that the function name
in the backtrace shows what happens.
metze
Modified:
branches/SAMBA_3_2_0/source/lib/talloc/talloc.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/lib/talloc/talloc.c
===
--- branches/SAMBA_3_2_0/source/lib/talloc/talloc.c 2007-08-22 12:44:41 UTC
(rev 24627)
+++ branches/SAMBA_3_2_0/source/lib/talloc/talloc.c 2007-08-22 12:45:07 UTC
(rev 24628)
@@ -115,6 +115,16 @@
#define TC_HDR_SIZE ((sizeof(struct talloc_chunk)+15)~15)
#define TC_PTR_FROM_CHUNK(tc) ((void *)(TC_HDR_SIZE + (char*)tc))
+static void talloc_abort_double_free(void)
+{
+ TALLOC_ABORT(Bad talloc magic value - double free);
+}
+
+static void talloc_abort_unknown_value(void)
+{
+ TALLOC_ABORT(Bad talloc magic value - unknown value);
+}
+
/* panic if we get a bad magic value */
static inline struct talloc_chunk *talloc_chunk_from_ptr(const void *ptr)
{
@@ -122,9 +132,9 @@
struct talloc_chunk *tc = discard_const_p(struct talloc_chunk, pp -
TC_HDR_SIZE);
if (unlikely((tc-flags (TALLOC_FLAG_FREE | ~0xF)) != TALLOC_MAGIC))
{
if (tc-flags TALLOC_FLAG_FREE) {
- TALLOC_ABORT(Bad talloc magic value - double free);
+ talloc_abort_double_free();
} else {
- TALLOC_ABORT(Bad talloc magic value - unknown value);
+ talloc_abort_unknown_value();
}
}
return tc;
svn commit: samba-docs r1164 - in trunk/manpages-3: .
Author: kseeger Date: 2007-08-22 13:25:00 + (Wed, 22 Aug 2007) New Revision: 1164 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1164 Log: Add documentation for new winbindd -D switch added by metze with r24624 and r24625 Modified: trunk/manpages-3/winbindd.8.xml Changeset: Modified: trunk/manpages-3/winbindd.8.xml === --- trunk/manpages-3/winbindd.8.xml 2007-08-20 22:47:12 UTC (rev 1163) +++ trunk/manpages-3/winbindd.8.xml 2007-08-22 13:25:00 UTC (rev 1164) @@ -17,6 +17,7 @@ refsynopsisdiv cmdsynopsis commandwinbindd/command + arg choice=opt-D/arg arg choice=opt-F/arg arg choice=opt-S/arg arg choice=opt-i/arg @@ -76,6 +77,16 @@ variablelist varlistentry + term-D/term + listitemparaIf specified, this parameter causes + the server to operate as a daemon. That is, it detaches + itself and runs in the background on the appropriate port. + This switch is assumed if commandwinbindd/command is + executed on the command line of a shell. + /para/listitem + /varlistentry + + varlistentry termhosts/term listitemparaThis feature is only available on IRIX. User information traditionally stored in
svn commit: samba r24629 - in branches: SAMBA_3_0_25/source/nsswitch SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch SAMBA_4_0/source/nsswitch
Author: obnox
Date: 2007-08-22 13:51:44 + (Wed, 22 Aug 2007)
New Revision: 24629
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24629
Log:
Make read_sock return the total number of bytes read instead
of the number of bytes read in the last of possibly several
read calls.
This was noted by Metze.
Michael
Modified:
branches/SAMBA_3_0_25/source/nsswitch/wb_common.c
branches/SAMBA_3_2/source/nsswitch/wb_common.c
branches/SAMBA_3_2_0/source/nsswitch/wb_common.c
branches/SAMBA_4_0/source/nsswitch/wb_common.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/nsswitch/wb_common.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/wb_common.c 2007-08-22 12:45:07 UTC
(rev 24628)
+++ branches/SAMBA_3_0_25/source/nsswitch/wb_common.c 2007-08-22 13:51:44 UTC
(rev 24629)
@@ -422,7 +422,7 @@
static int read_sock(void *buffer, int count)
{
- int result = 0, nread = 0;
+ int nread = 0;
int total_time = 0, selret;
if (winbindd_fd == -1) {
@@ -463,7 +463,7 @@
/* Do the Read */
- result = read(winbindd_fd, (char *)buffer + nread,
+ int result = read(winbindd_fd, (char *)buffer + nread,
count - nread);
if ((result == -1) || (result == 0)) {
@@ -481,7 +481,7 @@
}
}
- return result;
+ return nread;
}
/* Read reply */
Modified: branches/SAMBA_3_2/source/nsswitch/wb_common.c
===
--- branches/SAMBA_3_2/source/nsswitch/wb_common.c 2007-08-22 12:45:07 UTC
(rev 24628)
+++ branches/SAMBA_3_2/source/nsswitch/wb_common.c 2007-08-22 13:51:44 UTC
(rev 24629)
@@ -420,7 +420,7 @@
static int read_sock(void *buffer, int count)
{
- int result = 0, nread = 0;
+ int nread = 0;
int total_time = 0, selret;
if (winbindd_fd == -1) {
@@ -461,7 +461,7 @@
/* Do the Read */
- result = read(winbindd_fd, (char *)buffer + nread,
+ int result = read(winbindd_fd, (char *)buffer + nread,
count - nread);
if ((result == -1) || (result == 0)) {
@@ -479,7 +479,7 @@
}
}
- return result;
+ return nread;
}
/* Read reply */
Modified: branches/SAMBA_3_2_0/source/nsswitch/wb_common.c
===
--- branches/SAMBA_3_2_0/source/nsswitch/wb_common.c2007-08-22 12:45:07 UTC
(rev 24628)
+++ branches/SAMBA_3_2_0/source/nsswitch/wb_common.c2007-08-22 13:51:44 UTC
(rev 24629)
@@ -420,7 +420,7 @@
static int read_sock(void *buffer, int count)
{
- int result = 0, nread = 0;
+ int nread = 0;
int total_time = 0, selret;
if (winbindd_fd == -1) {
@@ -461,7 +461,7 @@
/* Do the Read */
- result = read(winbindd_fd, (char *)buffer + nread,
+ int result = read(winbindd_fd, (char *)buffer + nread,
count - nread);
if ((result == -1) || (result == 0)) {
@@ -479,7 +479,7 @@
}
}
- return result;
+ return nread;
}
/* Read reply */
Modified: branches/SAMBA_4_0/source/nsswitch/wb_common.c
===
--- branches/SAMBA_4_0/source/nsswitch/wb_common.c 2007-08-22 12:45:07 UTC
(rev 24628)
+++ branches/SAMBA_4_0/source/nsswitch/wb_common.c 2007-08-22 13:51:44 UTC
(rev 24629)
@@ -421,7 +421,7 @@
static int read_sock(void *buffer, int count)
{
- int result = 0, nread = 0;
+ int nread = 0;
int total_time = 0, selret;
/* Read data from socket */
@@ -458,7 +458,7 @@
/* Do the Read */
- result = read(winbindd_fd, (char *)buffer + nread,
+ int result = read(winbindd_fd, (char *)buffer + nread,
count - nread);
if ((result == -1) || (result == 0)) {
@@ -476,7 +476,7 @@
}
}
- return result;
+ return nread;
}
/* Read reply */
svn commit: samba r24630 - in branches: SAMBA_3_2/source/registry SAMBA_3_2_0/source/registry
Author: obnox
Date: 2007-08-22 16:03:17 + (Wed, 22 Aug 2007)
New Revision: 24630
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24630
Log:
Store Samba configuratin options only under the default name, not as aliases.
This prevents creation of problematic configurations from registry editors
like regedit or net rpc registry.
I will refactor the code to be somewhat more concise,
but I wanted to have this in the tree, now I got it working... :-)
Michael
Modified:
branches/SAMBA_3_2/source/registry/reg_smbconf.c
branches/SAMBA_3_2_0/source/registry/reg_smbconf.c
Changeset:
Modified: branches/SAMBA_3_2/source/registry/reg_smbconf.c
===
--- branches/SAMBA_3_2/source/registry/reg_smbconf.c2007-08-22 13:51:44 UTC
(rev 24629)
+++ branches/SAMBA_3_2/source/registry/reg_smbconf.c2007-08-22 16:03:17 UTC
(rev 24630)
@@ -43,18 +43,167 @@
{
int i;
int num_values = regval_ctr_numvals(val);
+ REGVAL_CTR *new_val_ctr;
+ /*
+* we build a second regval container and copy over the values,
+* possibly changing names to the canonical name, because when
+* canonicalizing parameter names and replacing the original parameter
+* (with reval_ctr_deletevalue and regval_ctr_addvalue) in the original
+* container, the order would change and that is not so good in the
+* for loop... :-o
+*/
+ new_val_ctr = TALLOC_ZERO_P(val, REGVAL_CTR);
+ if (new_val_ctr == NULL) {
+ DEBUG(1, (out of memory\n));
+ return False;
+ }
+
for (i=0; i num_values; i++) {
REGISTRY_VALUE *theval = regval_ctr_specific_value(val, i);
const char *valname = regval_name(theval);
+ int res;
- if (registry_smbconf_valname_forbidden(valname)) {
- DEBUG(0, (smbconf_store_values: value '%s' forbidden
+ DEBUG(10, (inspecting value '%s'\n, valname));
+
+ /* unfortunately, we can not reject names that are not
+* valid parameter names here, since e.g. regedit first
+* creates values as New Value #1 and so on and then
+* drops into rename. */
+
+ if (regval_type(theval) != REG_SZ) {
+ DEBUG(1, (smbconf_store_values: only registry value
+ type REG_SZ currently allowed under key
+ smbconf\n));
+ return False;
+ }
+
+ if (registry_smbconf_valname_forbidden(regval_name(theval))) {
+ DEBUG(1, (smbconf_store_values: value '%s' forbidden
in registry.\n, valname));
return False;
}
+
+ if (lp_parameter_is_valid(valname)
+ !lp_parameter_is_canonical(valname))
+ {
+ char *valstr;
+ size_t len;
+ const char *canon_valname;
+ const char *canon_valstr;
+ BOOL inverse;
+ struct registry_value *value;
+ WERROR err;
+ DATA_BLOB value_data;
+ TALLOC_CTX *mem_ctx;
+
+ DEBUG(5, (valid parameter '%s' given but it is a
+ synonym. going to canonicalize it.\n,
+ valname));
+
+ mem_ctx = talloc_new(val);
+ if (mem_ctx == NULL) {
+ DEBUG(1, (out of memory...\n));
+ return False;
+ }
+
+ err = registry_pull_value(mem_ctx, value,
+ theval-type,
+ theval-data_p,
+ theval-size,
+ theval-size);
+ if (!W_ERROR_IS_OK(err)) {
+ TALLOC_FREE(mem_ctx);
+ return False;
+ }
+
+ valstr = (value-v.sz.str);
+ len = value-v.sz.len;
+ DEBUG(10, (theval-size: %d, value-v.sz.len: %d,
+ value-v.sz.str: '%s'\n,
+ theval-size, value-v.sz.len,
+ value-v.sz.str));
+ if (valstr[len - 1] != '\0') {
+ DEBUG(10, (string is not '\\0'-terminated.
+ adding '\\0'...\n));
+ valstr = TALLOC_REALLOC_ARRAY(mem_ctx, valstr,
+
Build status as of Thu Aug 23 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-08-22 00:01:36.0 + +++ /home/build/master/cache/broken_results.txt 2007-08-23 00:00:25.0 + @@ -1,24 +1,24 @@ -Build status as of Wed Aug 22 00:00:02 2007 +Build status as of Thu Aug 23 00:00:02 2007 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 30 9 0 +ccache 29 9 0 ctdb 0 0 0 distcc 2 0 0 -ldb 29 5 0 +ldb 29 4 0 libreplace 28 8 0 -lorikeet-heimdal 24 13 0 +lorikeet-heimdal 25 13 0 pidl 17 3 0 ppp 12 9 0 python 0 0 0 -rsync30 11 0 +rsync30 10 0 samba-docs 0 0 0 samba-gtk3 3 0 -samba4 27 25 0 -samba_3_231 19 0 +samba4 27 24 0 +samba_3_230 18 0 smb-build27 27 0 -talloc 30 1 0 -tdb 28 4 0 +talloc 29 1 0 +tdb 29 4 0
svn commit: samba r24631 - in branches/SAMBA_4_0/source: dsdb/schema lib lib/util/tests librpc/tools smbd torture/ldap torture/unix
Author: abartlet
Date: 2007-08-23 02:10:17 + (Thu, 23 Aug 2007)
New Revision: 24631
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24631
Log:
Fix up format warnings, found on my Fedora 7 x86_64 workstation.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/dsdb/schema/schema_init.c
branches/SAMBA_4_0/source/dsdb/schema/schema_syntax.c
branches/SAMBA_4_0/source/lib/gendb.c
branches/SAMBA_4_0/source/lib/util/tests/idtree.c
branches/SAMBA_4_0/source/librpc/tools/ndrdump.c
branches/SAMBA_4_0/source/smbd/server.c
branches/SAMBA_4_0/source/torture/ldap/uptodatevector.c
branches/SAMBA_4_0/source/torture/unix/whoami.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/schema/schema_init.c
===
--- branches/SAMBA_4_0/source/dsdb/schema/schema_init.c 2007-08-22 16:03:17 UTC
(rev 24630)
+++ branches/SAMBA_4_0/source/dsdb/schema/schema_init.c 2007-08-23 02:10:17 UTC
(rev 24631)
@@ -674,7 +674,7 @@
} \
if (strict _a-value_ctr.num_values != 1) { \
d_printf(%s: %s num_values == %u\n, __location__, attr, \
- _a-value_ctr.num_values); \
+(unsigned int)_a-value_ctr.num_values); \
return WERR_INVALID_PARAM; \
} \
if (strict !_a-value_ctr.values[0].blob) { \
@@ -683,7 +683,7 @@
} \
if (strict _a-value_ctr.values[0].blob-length != 4) { \
d_printf(%s: %s length == %u\n, __location__, attr, \
- _a-value_ctr.values[0].blob-length); \
+(unsigned int)_a-value_ctr.values[0].blob-length); \
return WERR_INVALID_PARAM; \
} \
if (_a _a-value_ctr.num_values = 1 \
Modified: branches/SAMBA_4_0/source/dsdb/schema/schema_syntax.c
===
--- branches/SAMBA_4_0/source/dsdb/schema/schema_syntax.c 2007-08-22
16:03:17 UTC (rev 24630)
+++ branches/SAMBA_4_0/source/dsdb/schema/schema_syntax.c 2007-08-23
02:10:17 UTC (rev 24631)
@@ -261,7 +261,7 @@
v = BVALS(in-value_ctr.values[i].blob-data, 0);
- str = talloc_asprintf(out-values, %lld, v);
+ str = talloc_asprintf(out-values, %lld, (long long int)v);
W_ERROR_HAVE_NO_MEMORY(str);
out-values[i] = data_blob_string_const(str);
@@ -948,7 +948,7 @@
W_ERROR_HAVE_NO_MEMORY(binary);
str = talloc_asprintf(out-values, B:%u:%s:%s,
- id3b.binary.length * 2, /* because of 2
hex chars per byte */
+ (unsigned int)(id3b.binary.length * 2),
/* because of 2 hex chars per byte */
binary,
id3b.dn);
W_ERROR_HAVE_NO_MEMORY(str);
Modified: branches/SAMBA_4_0/source/lib/gendb.c
===
--- branches/SAMBA_4_0/source/lib/gendb.c 2007-08-22 16:03:17 UTC (rev
24630)
+++ branches/SAMBA_4_0/source/lib/gendb.c 2007-08-23 02:10:17 UTC (rev
24631)
@@ -23,6 +23,7 @@
#include includes.h
#include lib/ldb/include/ldb.h
#include lib/ldb/include/ldb_errors.h
+#include lib/db_wrap.h
/*
search the sam for the specified attributes - va_list variant
Modified: branches/SAMBA_4_0/source/lib/util/tests/idtree.c
===
--- branches/SAMBA_4_0/source/lib/util/tests/idtree.c 2007-08-22 16:03:17 UTC
(rev 24630)
+++ branches/SAMBA_4_0/source/lib/util/tests/idtree.c 2007-08-23 02:10:17 UTC
(rev 24631)
@@ -61,10 +61,11 @@
}
} else {
if (p != NULL) {
- torture_fail(tctx, talloc_asprintf(tctx,
- non-present at %d gave %p (would be
%d),
- ii, p,
- (int)(((char *)p) - (char *)(ids[0])) /
sizeof(int)));
+ torture_fail(tctx,
+talloc_asprintf(tctx,
+non-present at %d
gave %p (would be %d),
+ii, p,
+(int)char *)p)
- (char *)(ids[0])) / sizeof(int;
}
if (random() % 5) {
ids[ii] = idr_get_new(idr, ids[ii], n);
Modified: branches/SAMBA_4_0/source/librpc/tools/ndrdump.c
===
--- branches/SAMBA_4_0/source/librpc/tools/ndrdump.c2007-08-22 16:03:17 UTC
(rev 24630)
+++
Rev 594: merge from ronnie in http://samba.org/~tridge/ctdb
revno: 594 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Wed 2007-08-22 17:31:29 +1000 message: merge from ronnie modified: include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 server/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 server/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 server/ctdb_ltdb_server.c ctdb_ltdb_server.c-20070607120348-7r182h0nlqxysyss-1 server/ctdb_monitor.c ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1 server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1 server/ctdb_server.c ctdb.c-20061127094323-t50f58d65iaao5of-2 server/ctdb_takeover.c ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2 server/ctdbd.c ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1 server/eventscript.c eventscript.c-20070704074533-95f10rsay8um8wrr-1 tools/ctdb.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1 revno: 432.1.220 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Wed 2007-08-22 12:53:24 +1000 message: when we receive a packet from the network, check explicitely that the node is not banned it the call is for a database record. i.e a REQ/REPLY CALL/DMASTER if we get such a call while banned, ignore the packet and write an entry in the logfile revno: 432.1.219 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Wed 2007-08-22 12:38:31 +1000 message: create a define to represent the 'invalid' generation id we used in two places. create a new helper function to generate new generation id values that know about the invalid id and avoids generating it. update the ctdb status tool to know about the invalid generation id and print the string INVALID instead revno: 432.1.218 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Wed 2007-08-22 11:34:48 +1000 message: if the node is inactive i.e. banned or disconnected then that node is not participating in the cluster if a client tries to attach to a database while the node is inactive, return an error back to the client and fail the attach revno: 432.1.217 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Wed 2007-08-22 10:38:35 +1000 message: when a node becomes bannedits databases are no longer part of ctdb and it should thus no longer serve any database access calls until it has been reintroduced into the cluster. when becoming banned, reset the local generation id to 1 to prevent any further database access calls from other nodes from being processed. revno: 432.1.216 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Wed 2007-08-22 09:46:48 +1000 message: if lockwait takes an excessive time to complete. log the time it took to complete and also the name of the database revno: 432.1.215 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg [EMAIL PROTECTED] branch nick: ctdb timestamp: Tue 2007-08-21 17:25:15 +1000 message: change the structure used for node flag change messages so that we can see both the old flags as well as the new flags (so we can tell which flags changed) send the CTDB_SRVID_RECONFIGURE messages to connected nodes only, not to every node, connected or not, in the cluster. in the handler inside the recovery daemon which is invoked for node flag change messages, only do a takeover_run() and redistribute the ip addresses IF it was the disabled or the unhealthy flags that changed. Also send out the cluster reconfigured message in this case. If any of the other flags changed we dont need to do the takeover_run(0 here since that will be done during
