[Samba] smbldap-tools - ssl - problem
hello It is possible to configure smbldap-tools to work with ssl, not tls?? because when I put : masterPort=636 I've got : Can't contact LDAP server at /usr/sbin/smbldap_tools.pm line 353. And my LDAP server is corectly working on that port. Thanks in advance Luk -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] migrating files along with acls
Hello, I am migrating files from an NT4 server to a Samba server using the command line: net rpc share MIGRATE FILES My_Share -S srv-nt4 -D srv-samba -UAdministrateur%passwd --attrs --acls -v Since these are french machines I think I am having trouble with accentuation: I get these errors: cannot check for directory \My_Share\Photos défenses: Call returned zero bytes (EOF) and could not handle file \My_Share\Photos d�fenses\photo.JPG: NT_STATUS_END_OF_FILE However, If I leave out the --acls option, file are copied correctly (of course leaving out correct acls) How can I effectively migrate my old shares without losing the acls? I am using the inherit owner=yes option but it doesn't seem to work all the time. Could someone please enlighten me on these matters, (I am using samba-3.0.23c-2.el5.2.0.2; wbinfo getent work fine, I AM mounting my filesystem with acl support) Regards Pierig. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] smbclient doesn't work with anonymous access on windows 2000
Hello, I have the following error when I try to use smbclient with windows 2000 anonymous access : $ smbclient -N -L //machine1 Anonymous login successful Domain=[DOMAIN] OS=[Windows 5.1] Server=[Windows 2000 LAN Manager] Sharename Type Comment - --- cli_rpc_pipe_open: cli_nt_create failed on pipe \srvsvc to machine machine1. Error was NT_STATUS_ACCESS_DENIED Error returning browse list: NT_STATUS_ACCESS_DENIED --- Some infos : -Debian GNU/Linux unstable distribution -kernel : $ uname -a Linux Xdeb 2.6.18-4-686 #1 SMP Mon Mar 26 17:17:36 UTC 2007 i686 GNU/Linux -smbclient version : $ smbclient -V Version 3.0.25a Anyone knows how to fix this problem ? Best regards, -- Alexandru Ionut Munteanu _ Ne gardez plus qu'une seule adresse mail ! Copiez vos mails vers Yahoo! Mail -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] NFS quotas: truncated files without warning
Opened bug in RHs bugzilla ( https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=244848 ) En/na simo ha escrit: On Mon, 2007-06-18 at 12:21 -0700, Jeremy Allison wrote: On Mon, Jun 18, 2007 at 08:48:09PM +0200, SER.RI-TIC - David Losada wrote: Hi Jeremy, actually, I have adapted your patch for applying to the current RHEL4 Samba release (samba-3.0.10-1.4E.12.2). Would you mind to check if I have made any flagrant mistakes? If anyone reads this and decides to try it, please bear in mind it's experimental. Summary of what I have modified from your patch: * no patch for smbd/aio.c , because it's just not there yet in this release * in smbd/fileio.c:sync_file() , doesn't check for the sync always directive, the check's not originally there * in smbd/fileio.c:sync_file() , for accessing the fd, it's just fsp-fd, not fsp-fh-fd * in smbd/reply.c:reply_write() , ignored the hunk around CHECK_WRITE(fsp), because in this release that check is not made * took into account that the checking of conditions for forcing synchronization (lp_strict_sync, lp_sync_always, write_through) hadn't yet been refactored into the fileio.c:sync_file() function If patching from a vanilla samba-3.0.10 release, should apply the smbd_deferred_open_backport patch first. I'm also attaching it for convenience. If your patch makes it to next Samba official release, and this patch receives your blessing, could we put them in consideration of RedHat for an errata? The fact it helps to avoid silent data corruption in an scenario like ours, should be interesting for them. This work looks good - it's not a complex change. The fix will definately be in 3.0.25b, I'll let Simo pick up the change for RH for their older versions if he thinks it's warrented. I'd really prefer an entry in RHs bugzilla to be able to easily pick it up :-) Simo. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] NFS quotas: truncated files without warning
On Tue, 2007-06-19 at 16:15 +0200, SER.RI-TIC - David Losada wrote: Opened bug in RHs bugzilla ( https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=244848 ) Thank you! Simo. -- Simo Sorce Samba Team GPL Compliance Officer email: [EMAIL PROTECTED] http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Problems adding a printer share
You don't need Samba to print. As long as you set up your CUPS configuration to allow other local addresses to print to the server, you can print to it from windows using http://servername:631/printers/printername, where you replace servername and pritnername with the appropriate values. servername can also be an IP address. If this works, you can also (but don't have to) set up the printer to be shared via Samba by adding a section to your Samba configuration. I recommend that you use SWAT for this - it makes it easy. Michael Powell wrote: I have added an HP Deskjet 600 to my debian etch system, using CUPS. It is working fine. I would like to set it up so that I can occassionally print to it from a Windows 9x machine. This is where I seem to be having trouble. I consulted the HOW-TO docs on the samba site, but they are quite detailed and confusing (for me). I don't want to do anything that will cause the printer to work for the Win9x machine, but stop working properly on the debian machine. I am probably wrong, but what little I did understand of the HOW-TO gave me the impression that it might indeed cause problems. I really need something that is more like A Dummy's Guide to SAMBA and Print Shares. The Win9x machine can currently see/access the other shares defined on the debian box. Is there an dummy's way to set the printer share up so that my Win9x machine can see it? Thanks! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Unable to join new machines to the domain
I have a samba server configured that is the domain controller of a samba domain called PRODESAN.COM.BR. After we had to reinstall the domain controller, we are currently unable to join any new machines to the domain. Whenever I try to join the domain I get this message on the clients: # net join -U root root's password: [2007/06/19 14:27:41, 0] utils/net_ads.c:ads_startup(191) ads_connect: No results returned Creation of workstation account failed Unable to join domain PRODESAN.COM.BR. On the PDC side I get this: [2007/06/19 14:25:27, 2] lib/smbldap.c:smbldap_open_connection(788) smbldap_open_connection: connection opened [2007/06/19 14:25:27, 2] passdb/pdb_ldap.c:init_sam_from_ldap(541) init_sam_from_ldap: Entry found for user: root [2007/06/19 14:25:27, 2] passdb/pdb_ldap.c:init_group_from_ldap(2140) init_group_from_ldap: Entry found for group: 513 [2007/06/19 14:25:27, 2] auth/auth.c:check_ntlm_password(309) check_ntlm_password: authentication for user [root] - [root] - [root] succeeded [2007/06/19 14:25:27, 2] passdb/pdb_ldap.c:init_sam_from_ldap(541) init_sam_from_ldap: Entry found for user: root [2007/06/19 14:25:27, 2] smbd/reply.c:reply_tcon_and_X(711) Serving IPC$ as a Dfs root [2007/06/19 14:25:28, 0] passdb/pdb_interface.c:pdb_default_create_user(368) _samr_create_user: Running the command `/usr/sbin/smbldap-useradd - w servproducao$' gave 9 On my LDAP backend I have this entry: gidNumber 1058 objectClass sambaDomain objectClass sambaUnixIdPool sambaAlgorithmicRidBase 1000 sambaDomainName prodesan.com.br sambaNextGroupRid 41001 sambaNextUserRid41000 sambaSIDS-1-5-21-3756370324-611414431-635963119 uidNumber 1519 The sambaSID is the same that was before the migration. Do I need to set this SID somewhere else? -- Esta mensagem foi verificada pelo sistema de antivírus e acredita-se estar livre de perigo. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Unable to join new machines to the domain
On Tuesday 19 June 2007, Sandra wrote: [2007/06/19 14:27:41, 0] utils/net_ads.c:ads_startup(191) ads_connect: No results returned Creation of workstation account failed Unable to join domain PRODESAN.COM.BR. Correct me if I'm wrong as I have no experience with ldap setups but AFAIK Samba domains are NetBIOS domains which are flat, not hierarchical. If so your domain name should be something more like PRODESAN and not PRODESAN.COM.BR. Also you didn't post your smb.conf but I'm curious about the use of ads_connect, which seems like you're trying to work with an AD domain instead of a NetBIOS (Samba) domain. So I'm wondering if you have something other than security - user in the PDC's smb.conf and security - domain in the member servers smb.conf. Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Unable to join new machines to the domain
Here is the PDC's smb.conf: [global] netbios name= servsso workgroup = prodesan.com.br log file= /var/log/samba/%m.log max log size= 500 unix password sync = yes passwd program = /usr/bin/passwd %u passwd chat = *New*password* %n\n *Retype*new*password* % n\n *passwd:*all*authentication*tokens*updated*successfully* smb passwd file = /etc/samba/smbpasswd socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 domain logons = yes os level= 180 preferred master= yes domain master = yes security= user guest ok= no invalid users = bin daemon sys man postfix mail ftp admin users = root encrypt passwords = yes logon script = scripts\logon.bat ldap ssl= no printing= lprng hide dot files = yes time server = yes log level = 2 passdb backend = ldapsam:ldap://127.0.0.1 ldap passwd sync = yes ldap delete dn = Yes ldap admin dn = cn=admin,dc=prodesan,dc=com,dc=br ldap suffix = dc=prodesan,dc=com,dc=br ldap machine suffix = ou=computadores ldap user suffix = ou=pessoas ldap group suffix = ou=grupos ldap idmap suffix = ou=Idmap idmap backend = ldap:ldap://127.0.0.1 idmap uid = 1-2 idmap gid = 1-2 winbind separator = \ winbind enum users = yes winbind enum groups = yes add user script = /usr/sbin/smbldap-useradd -m %u delete user script = /usr/sbin/smbldap-userdel %u add group script = /usr/sbin/smbldap-groupadd -p %g delete group script = /usr/sbin/smbldap-groupdel %g add user to group script = /usr/sbin/smbldap-groupmod -m %u %g delete user from group script = /usr/sbin/smbldap-groupmod -x %u % g set primary group script = /usr/sbin/smbldap-usermod -g %g %u add machine script = /usr/sbin/smbldap-useradd -w %u And here is the member server's smb.conf: [global] workgroup = prodesan.com.br realm = PRODESAN.COM.BR preferred master = no netbios name = Servproducao server string = Servproducao security = domain encrypt passwords = true log level = 3 log file = /var/log/samba/%m max log size = 50 winbind separator = + printcap name = cups printing = cups idmap uid = 1-2 idmap gid = 1-2 passdb backend = ldapsam:ldap://192.168.131.104 ldap passwd sync = yes ldap delete dn = Yes ldap admin dn = cn=admin,dc=prodesan,dc=com,dc=br ldap suffix = dc=prodesan,dc=com,dc=br ldap machine suffix = ou=computadores ldap user suffix = ou=pessoas ldap group suffix = ou=grupos ldap idmap suffix = ou=Idmap idmap backend = ldap:ldap://192.168.131.104 idmap uid = 1-2 idmap gid = 1-2 winbind separator = \ winbind enum users = yes winbind enum groups = yes add user script = /usr/sbin/smbldap-useradd -m %u delete user script = /usr/sbin/smbldap-userdel %u add group script = /usr/sbin/smbldap-groupadd -p %g delete group script = /usr/sbin/smbldap-groupdel %g add user to group script = /usr/sbin/smbldap-groupmod -m %u %g delete user from group script = /usr/sbin/smbldap-groupmod -x %u %g set primary group script = /usr/sbin/smbldap-usermod -g %g %u add machine script = /usr/sbin/smbldap-useradd -w %u On Tue, 19 Jun 2007 14:18:58 -0400, Chris Smith wrote On Tuesday 19 June 2007, Sandra wrote: [2007/06/19 14:27:41, 0] utils/net_ads.c:ads_startup(191) ads_connect: No results returned Creation of workstation account failed Unable to join domain PRODESAN.COM.BR. Correct me if I'm wrong as I have no experience with ldap setups but AFAIK Samba domains are NetBIOS domains which are flat, not hierarchical. If so your domain name should be something more like PRODESAN and not PRODESAN.COM.BR. Also you didn't post your smb.conf but I'm curious about the use of ads_connect, which seems like you're trying to work with an AD domain instead of a NetBIOS (Samba) domain. So I'm wondering if you have something other than security - user in the PDC's smb.conf and security - domain in the member servers smb.conf. Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- Esta mensagem foi verificada pelo sistema de antivírus e acredita-se estar livre de perigo. Sandra Nascimento Analista de Suporte [EMAIL PROTECTED] (13)3229.8000 Ramal 135/176 -- Prefeitura Municipal de Santos (http://www.santos.sp.gov.br) -- Esta mensagem foi verificada pelo sistema de antivírus e acredita-se estar livre de perigo.
[Samba] Samba Client with Windows XP share slow performance
I'm getting awful performance when trying to write to our new NAS and/or a Windows XP share. In short, I'm getting just under 1/2 the speed that I can get if I mount a Linux share on the Windows box and send the files that way. Here are the test results: From XP to Linux via FTP 47MB/sec From XP to Linux via SAMBA 40MB/sec From Linux to XP via CIFS 21MB/sec Now, this is much better than the performance I am getting from our SuSE 9.3 stock servers using the 2.6.5 kernel. This can only get about 10MB/sec. We have tried many different socket options with little to show for the effort.7 Is this to be expected? Is there no way to get the performance the same? Thank you in advance for your help. Will -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba Client with Windows XP share slow performance
On Tue, Jun 19, 2007 at 03:22:34PM -0400, [EMAIL PROTECTED] wrote: I'm getting awful performance when trying to write to our new NAS and/or a Windows XP share. In short, I'm getting just under 1/2 the speed that I can get if I mount a Linux share on the Windows box and send the files that way. Here are the test results: From XP to Linux via FTP 47MB/sec From XP to Linux via SAMBA 40MB/sec From Linux to XP via CIFS 21MB/sec Now, this is much better than the performance I am getting from our SuSE 9.3 stock servers using the 2.6.5 kernel. This can only get about 10MB/sec. We have tried many different socket options with little to show for the effort.7 More details on the Linux mount please ? Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba Client with Windows XP share slow performance
On Tue, Jun 19, 2007 at 03:22:34PM -0400, [EMAIL PROTECTED] wrote: I'm getting awful performance when trying to write to our new NAS and/or a Windows XP share. In short, I'm getting just under 1/2 the speed that I can get if I mount a Linux share on the Windows box and send the files that way. Here are the test results: From XP to Linux via FTP 47MB/sec From XP to Linux via SAMBA 40MB/sec From Linux to XP via CIFS 21MB/sec Now, this is much better than the performance I am getting from our SuSE 9.3 stock servers using the 2.6.5 kernel. This can only get about 10MB/sec. We have tried many different socket options with little to show for the effort.7 More details on the Linux mount please ? Well, I'm not exactly sure what information would be useful. Here is some things I can think of. I simply did a mount -t cifs //windowsxpmachine/xfertest /home/xfertest Here is some more machine information. Please let me know if this is not what is needed. uname -a Linux localhost.localdomain 2.6.20-1.2925.fc6 #1 SMP Sat Mar 10 19:15:16 EST 2007 i686 i686 i386 GNU/Linux modinfo cifs.ko filename: cifs.ko version:1.47 description:VFS to access servers complying with the SNIA CIFS Specification e.g. Samba and Windows license:GPL author: Steve French [EMAIL PROTECTED] srcversion: 1F9612E98A836FE3CFEA30A depends: vermagic: 2.6.20-1.2925.fc6 SMP mod_unload 686 4KSTACKS parm: CIFSMaxBufSize:Network buffer size (not including header). Default: 16384 Range: 8192 to 130048 (int) parm: cifs_min_rcv:Network buffers in pool. Default: 4 Range: 1 to 64 (int) parm: cifs_min_small:Small network buffers in pool. Default: 30 Range: 2 to 256 (int) parm: cifs_max_pending:Simultaneous requests to server. Default: 50 Range: 2 to 256 (int) rpm -qa|grep samba system-config-samba-1.2.35-1.1 samba-3.0.24-1.fc6 samba-common-3.0.24-1.fc6 samba-client-3.0.24-1.fc6 free total used free sharedbuffers cached Mem: 2070904 4277361643168 0 20632 284708 -/+ buffers/cache: 1223961948508 Swap: 2031608 02031608 -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Unable to join new machines to the domain
On Tuesday 19 June 2007, Sandra wrote: workgroup = prodesan.com.br I thought this should read: workgroup = PRODESAN ...in both smb.conf files. But apparently it is OK as is and I can't seem to find any docs that support my thought, prodesan.com.br does meet the max 15 character limit and apparently .'s are an allowed character in NetBIOS names (although i personally never use them). It also seems, in general, that NetBIOS names are by convention capitalized in the smb.conf file. Sorry to lead you down a false trail. Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] The Domain THUNDER is not abaliable
Good day. I am relatively new with samba, I can get a single server configuration of samba to work. However now I am trying to get single sign ons with roaming profiles to work. I can join the domain without problems. However when I restart and then type THUNDER\dan and my password into the login screen (as the domain entry box does not show up) I get the error The system cannot log you on now because the domain THUNDER is not avaliable.. This error still happens even though I can browse the file server portion of the server. My goals with this server are to have my login accounts set on the one server and logged on to by Windows XP Pro, and Mac OS X eventually. The following is my smb.conf file, it is mostly a copy of one I found in a HOW-TO on the internet, most options I do not understand. [global] workgroup = THUNDER netbios name = %h server string = %h passdb backend = tdbsam security = user username map = /etc/samba/smbusers name resolve order = wins bcast hosts domain logons = yes preferred master = yes wins support = yes # Set CUPS for printing printcap name = CUPS printing = CUPS # Default logon logon drive = H: logon script = scripts/logon.bat logon path = \\THUNDER\profile\%U # Useradd scripts add user script = /usr/sbin/useradd -m %u delete user script = /usr/sbin/userdel -r %u add group script = /usr/sbin/groupadd %g delete group script = /usr/sbin/groupdel %g add user to group script = /usr/sbin/usermod -G %g %u add machine script = /usr/sbin/useradd -s /bin/false/ -d /var/lib/nobody %u idmap uid = 15000-2 idmap gid = 15000-2 # sync smb passwords woth linux passwords passwd program = /usr/bin/passwd %u passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n . passwd chat debug = yes unix password sync = yes # set the loglevel log level = 3 [homes] comment = Home valid users = %S read only = no browsable = no [Data] comment = Data Share path = /media/Thunder read only = no browsable = yes writable = yes [printers] comment = All Printers path = /var/spool/samba printable = yes guest ok = yes browsable = no [netlogon] comment = Network Logon Service path = /home/samba/netlogon admin users = Administrator valid users = %U read only = no [profile] comment = User profiles path = /home/samba/profiles valid users = %U create mode = 0600 directory mode = 0700 writable = yes browsable = no [profiles] comment = User profiles path = /home/samba/profiles valid users = %U create mode = 0600 directory mode = 0700 writable = yes browsable = no If you require any other information I will be more then happy to provide it, simply say the word. Thank you for your time, it is much appreciated. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] SWAT says nmbd not running when it is
We are running Version 3.0.25a-SerNet-RedHat In SWAT nmbd shows as not running when in fact it is. Is this a possible misconfiguration on our part or a bug? Helen -- Helen P. Nulty Systems Analyst UNC-CH School of Public Health Instructional Information Systems CB# 7400 Chapel Hill, NC 27599 ph: 919-966-9136 email: [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Debian Etch bug?
Tim Bates wrote: Michael Lueck wrote: So, just a general heads up... something smelling fishy with Debian Etch. So it's not just me having weird problems on recently upgraded servers that have weird permissions setups. Now if only I had the time to go and try the official packages on the most problematic server... But users will complain if I break it (again). I ended up presenting with Ubuntu Server 7.04 and their current Samba packages, which were at build 3.0.24-2ubuntu1.2_i386. Upon returning from that conference, Debian Etch had been updated to 3.0.24-6etch4_i386, and a clean installation of Etch and those packages worked to perfection. I have no idea what was up... and since I did a clean install (the previous Etch installation was nuked to hurry off to Ubuntu), possibly it was some Etch bug only if you first installed an earlier build of Samba, or, or, or... Just glad to see that weirdness GONE! :-) -- Michael Lueck Lueck Data Systems http://www.lueckdatasystems.com/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Corrupted files on Debian stable with quotas?
HI. A few users have told me their powerpoint presentations they've been working on have been corrupted in the last week. One user is very close to the quota limit (a few hundred KB left), and I know they are using embedded photos in the presentation. Could it be an issue with hitting the limit and just not writing the entire file and never informing Windows/the user? I'm running Debian Stable's release of Samba and I have got it up to date with the updates (just did it then, and no Samba packages to update). TB ** This message is intended for the addressee named and may contain privileged information or confidential information or both. If you are not the intended recipient please delete it and notify the sender. ** -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Rev 5381: merge from upstream - now in sync again! in http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/ revno: 5381 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Michael Adam [EMAIL PROTECTED] branch nick: SAMBA_3_0-registry.bzr timestamp: Tue 2007-06-19 11:54:01 +0200 message: merge from upstream - now in sync again! added: source/include/reg_db.hreg_db.h-20070615214610-cezf0v33opod19n3-1 source/lib/privileges_basic.c privileges_basic.c-20070614113052-vss4ipzfefw4ou23-1 source/lib/util_nttoken.c util_nttoken.c-20070614113053-yunl01g6q5iqk4rv-1 source/lib/util_reg_api.c util_reg_api.c-20070614113053-250c4n739wu542wo-1 source/lib/util_reg_smbconf.c util_reg_smbconf.c-20070614113054-hsmgsndbevshz5tg-1 renamed: source/lib/privileges_basic.c = source/lib/privileges_basic.c.moved privileges_basic.c-20070412140750-pro2zmd8rfupsdup-1 source/lib/util_nttoken.c = source/lib/util_nttoken.c.moved util_nttoken.c-20070412121956-apjs5s3igy1ydc2e-1 modified: REVISION REVISION-20060530022625-68239662668b41c3 examples/misc/adssearch.pl adssearch.pl-2006053005-0e15313921c49cc3 source/Makefile.in Makefile.in-20060530022626-b16dac2328ebe703 source/auth/auth_util.cauth_util.c-20060530022627-f9a3e5940d409fe9 source/client/smbspool.c smbspool.c-20060530022627-037d79e85d505b8b source/configure.inconfigure.in-20060530022626-07e74bc1e326c82d source/groupdb/mapping.c mapping.c-20060530022627-0d4c0d27ca093883 source/include/includes.h includes.h-20060530022627-d1a059a99c05e8be source/include/smb_macros.hsmb_macros.h-20060530022627-412e2056512de943 source/lib/charcnv.c charcnv.c-20060530022627-e157371a538fdeb6 source/lib/data_blob.c data_blob.c-20060530022627-6dbdabdd0ae85f7f source/lib/select.cselect.c-20060530022627-0a8a8f371f75ead5 source/lib/smbldap.c smbldap.c-20060530022627-2d88240b15c77135 source/lib/system.csystem.c-20060530022627-3f01435a4e07a714 source/lib/system_smbd.c system_smbd.c-20060530022627-e97a2e558e6fd98c source/lib/util.c util.c-20060530022627-d569af0e687a4dd3 source/lib/util_pw.c util_pw.c-20060530022627-912c52afc587540f source/lib/util_reg.c util_reg.c-20060711181331-c2d45d0e1f4a8648 source/lib/util_str.c util_str.c-20060530022627-0ba87cda5eaacc2e source/lib/util_tdb.c util_tdb.c-20061021025435-o3vr4t381qf9lv7e-1 source/libads/kerberos_verify.c kerberos_verify.c-20060530022627-7ce45c38ec645075 source/libads/ldap.c ldap.c-20060530022627-07f10a20cc50f671 source/libsmb/cliquota.c cliquota.c-20060530022627-6a0c6af7c7a1799b source/locking/brlock.cbrlock.c-20060530022627-3b8aec140997e136 source/locking/locking.c locking.c-20060530022627-4f229d47402340bb source/locking/posix.c posix.c-20060530022627-997d33ad43f0bd3e source/nmbd/nmbd.c nmbd.c-20060530022627-f3b08abf8f3e3c36 source/nsswitch/idmap_rid.cidmap_rid.c-20061212152807-oje7ib8mg9u2kxxg-1 source/nsswitch/winbind_nss.h winbind_nss.h-20060530022627-d0c8a4c069df06f6 source/nsswitch/winbind_nss_linux.h winbind_nss_linux.h-20060530022627-000f66c6b04b919e source/nsswitch/winbindd.c winbindd.c-20060530022627-8bb76c46bd1253ec source/nsswitch/winbindd_ads.c winbindd_ads.c-20060530022627-7c5e13eefe48f902 source/nsswitch/winbindd_cm.c winbindd_cm.c-20060530022627-54b91b1c8940d29e source/nsswitch/winbindd_group.c winbindd_group.c-20060530022627-9288f9a998ed2fbe source/nsswitch/winbindd_pam.c winbindd_pam.c-20060530022627-6b827f2f7ba30f85 source/nsswitch/winbindd_util.c winbindd_util.c-20060530022627-e014c9e53147dffe source/param/loadparm.cloadparm.c-20060530022627-1efa1edb3eb0e897 source/passdb/machine_sid.cmachine_sid.c-20060530022627-0ae56984d090a020 source/passdb/pdb_tdb.cpdb_tdb.c-20060530022627-b60f9dcd220e2886 source/registry/reg_db.c reg_db.c-20060530022627-e9a827257fb89131 source/rpc_parse/parse_misc.c parse_misc.c-20060530022627-2f2bf5c0060cbd6c source/rpc_server/srv_lsa.csrv_lsa.c-20060530022627-81cfe5eecd61a4f2 source/script/tests/test_local_s3.sh test_local_s3.sh-20060901130329-d2423dc033e3ea57 source/script/tests/test_posix_s3.sh test_posix_s3.sh-20060530100742-bf4d8804f7ab56c6 source/smbd/aio.c aio.c-20060530065353-839ba30629e9be61 source/smbd/blocking.c blocking.c-20060530022627-b43dcc35e2ddb440 source/smbd/fileio.c fileio.c-20060530022627-1404925b99a776aa source/smbd/files.cfiles.c-20060530022627-8e2ca5e2d798cd9b source/smbd/msdfs.cmsdfs.c-20060530024146-252992a3c60c990c source/smbd/negprot.c negprot.c-20060530022627-a352553cf95f9931 source/smbd/notify.c notify.c-20060530022627-f5b19ce2772c47a0
svn commit: samba r23543 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_26/source/utils
Author: obnox Date: 2007-06-19 11:11:01 + (Tue, 19 Jun 2007) New Revision: 23543 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23543 Log: Adjust comments. Modified: branches/SAMBA_3_0/source/utils/net_conf.c branches/SAMBA_3_0_26/source/utils/net_conf.c Changeset: Modified: branches/SAMBA_3_0/source/utils/net_conf.c === --- branches/SAMBA_3_0/source/utils/net_conf.c 2007-06-18 21:48:57 UTC (rev 23542) +++ branches/SAMBA_3_0/source/utils/net_conf.c 2007-06-19 11:11:01 UTC (rev 23543) @@ -20,21 +20,11 @@ */ /* - * This currently only an interface to the configuration - * stored inside the samba registry. In the future there - * might be support for other configuration backends as well. + * This is an interface to the configuration stored inside the + * samba registry. In the future there might be support for other + * configuration backends as well. */ -/* - * TODO: - * - * - check uid 0 for write operations - * - check for valid parameter names and types (loadparm...) ??? - * - check for correctness of shares (service_ok) ? - * - refactor to use _internal functions for pieces of code - * - */ - #include includes.h #include utils/net.h Modified: branches/SAMBA_3_0_26/source/utils/net_conf.c === --- branches/SAMBA_3_0_26/source/utils/net_conf.c 2007-06-18 21:48:57 UTC (rev 23542) +++ branches/SAMBA_3_0_26/source/utils/net_conf.c 2007-06-19 11:11:01 UTC (rev 23543) @@ -20,21 +20,11 @@ */ /* - * This currently only an interface to the configuration - * stored inside the samba registry. In the future there - * might be support for other configuration backends as well. + * This is an interface to the configuration stored inside the + * samba registry. In the future there might be support for other + * configuration backends as well. */ -/* - * TODO: - * - * - check uid 0 for write operations - * - check for valid parameter names and types (loadparm...) ??? - * - check for correctness of shares (service_ok) ? - * - refactor to use _internal functions for pieces of code - * - */ - #include includes.h #include utils/net.h
svn commit: samba r23544 - in branches/SAMBA_3_0_RELEASE: packaging/Debian/debian-sarge packaging/Debian/debian-sarge/patches source source/auth source/client source/include source/lib source/libads s
Author: jerry Date: 2007-06-19 16:01:58 + (Tue, 19 Jun 2007) New Revision: 23544 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23544 Log: sync 3.0.25b release with SAMBA_3_0_25 svn r23530. Removed: branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-sarge/patches/undefined-symbols.patch Modified: branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-sarge/changelog branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-sarge/patches/documentation.patch branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-sarge/patches/fhs.patch branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-sarge/patches/non-linux-ports.patch branches/SAMBA_3_0_RELEASE/packaging/Debian/debian-sarge/patches/samba.patch branches/SAMBA_3_0_RELEASE/source/Makefile.in branches/SAMBA_3_0_RELEASE/source/VERSION branches/SAMBA_3_0_RELEASE/source/auth/auth_sam.c branches/SAMBA_3_0_RELEASE/source/auth/auth_util.c branches/SAMBA_3_0_RELEASE/source/client/smbspool.c branches/SAMBA_3_0_RELEASE/source/include/ads.h branches/SAMBA_3_0_RELEASE/source/include/doserr.h branches/SAMBA_3_0_RELEASE/source/include/rpc_lsa.h branches/SAMBA_3_0_RELEASE/source/include/rpc_netlogon.h branches/SAMBA_3_0_RELEASE/source/lib/smbldap.c branches/SAMBA_3_0_RELEASE/source/lib/time.c branches/SAMBA_3_0_RELEASE/source/lib/util_str.c branches/SAMBA_3_0_RELEASE/source/libads/kerberos.c branches/SAMBA_3_0_RELEASE/source/libsmb/clifile.c branches/SAMBA_3_0_RELEASE/source/libsmb/clireadwrite.c branches/SAMBA_3_0_RELEASE/source/libsmb/doserr.c branches/SAMBA_3_0_RELEASE/source/locking/brlock.c branches/SAMBA_3_0_RELEASE/source/modules/vfs_catia.c branches/SAMBA_3_0_RELEASE/source/nmbd/nmbd_subnetdb.c branches/SAMBA_3_0_RELEASE/source/nmbd/nmbd_winsserver.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_ldap.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_nss.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_passdb.c branches/SAMBA_3_0_RELEASE/source/nsswitch/idmap_rid.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cm.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_dual.c branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_misc.c branches/SAMBA_3_0_RELEASE/source/pam_smbpass/general.h branches/SAMBA_3_0_RELEASE/source/rpc_client/cli_lsarpc.c branches/SAMBA_3_0_RELEASE/source/rpc_client/cli_netlogon.c branches/SAMBA_3_0_RELEASE/source/rpc_parse/parse_lsa.c branches/SAMBA_3_0_RELEASE/source/rpc_parse/parse_net.c branches/SAMBA_3_0_RELEASE/source/rpc_parse/parse_prs.c branches/SAMBA_3_0_RELEASE/source/rpc_parse/parse_spoolss.c branches/SAMBA_3_0_RELEASE/source/rpc_server/srv_lsa_nt.c branches/SAMBA_3_0_RELEASE/source/rpcclient/cmd_netlogon.c branches/SAMBA_3_0_RELEASE/source/rpcclient/rpcclient.c branches/SAMBA_3_0_RELEASE/source/smbd/aio.c branches/SAMBA_3_0_RELEASE/source/smbd/fileio.c branches/SAMBA_3_0_RELEASE/source/smbd/notify.c branches/SAMBA_3_0_RELEASE/source/smbd/nttrans.c branches/SAMBA_3_0_RELEASE/source/smbd/open.c branches/SAMBA_3_0_RELEASE/source/smbd/reply.c branches/SAMBA_3_0_RELEASE/source/tdb/common/traverse.c branches/SAMBA_3_0_RELEASE/source/torture/denytest.c branches/SAMBA_3_0_RELEASE/source/utils/pdbedit.c Changeset: Sorry, the patch is too large (3405 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23544
svn commit: samba r23545 - in branches: SAMBA_3_0_25 SAMBA_3_0_RELEASE
Author: jerry Date: 2007-06-19 16:59:20 + (Tue, 19 Jun 2007) New Revision: 23545 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23545 Log: Update release notes for 3.0.25b. Modified: branches/SAMBA_3_0_25/WHATSNEW.txt branches/SAMBA_3_0_RELEASE/WHATSNEW.txt Changeset: Modified: branches/SAMBA_3_0_25/WHATSNEW.txt === --- branches/SAMBA_3_0_25/WHATSNEW.txt 2007-06-19 16:01:58 UTC (rev 23544) +++ branches/SAMBA_3_0_25/WHATSNEW.txt 2007-06-19 16:59:20 UTC (rev 23545) @@ -1,12 +1,112 @@ === - Release Notes for Samba 3.0.25a - May 25, 2007 + Release Notes for Samba 3.0.25b + June 20, 2007 === -This is the second production release of the Samba 3.0.25 code +This is the third production release of the Samba 3.0.25 code base and is the version that servers should be run for for all current bug fixes. +Major bug fixes included in Samba 3.0.25b are: + + o Offline caching of files with Windows XP/Vista clients. + o Improper cleanup of expired or invalid byte range locks +on files. + o Crashes is idmap_ldap and idmap_rid. + + +## +Changes +### + +Changes since 3.0.25a +- + +o Jeremy Allison [EMAIL PROTECTED] +* BUG 4655: Fix client parsing bug in spoolss EnumPrinterDataEx(). +* Ensure that proper oplock break requests occur during file open + and performing internal checks for compatible open modes. +* Fix offline file caching with Windows XP/Vista clients. +* Coverity fixes. +* Ensure that winbindd reports the correct client connection + details in response to a SIGUSR2. +* Fix timespec_current() to return the correct nano-second time. +* Fix lock logic inconsistencies in tdb_traverse(). +* Remove restriction on string length for rpcclient commands. +* BUG 4683: Fix LSA crash bug. +* BUG 3204: Fix file descriptor leak in the parent winbindd when + child processes hang. +* Avoid calling rename_open_files() when the old and new names + are identical. +* BUG 4689: Fix bug in new change notify code caused by not + ignoring the max_params_return value and as a resulting + returning truncated names. +* Fix sync_file() to return NTSTATUS and return this on failure in + the write reply path. +* BUG 4678,4697: Fix token creation for clear text logins. + + +o Jacob Berkman [EMAIL PROTECTED] +* BUG 4566: Pass password data to krb5_prompter. + + +o Guenther Deschner [EMAIL PROTECTED] +* BUG 4657: Fix compilation and linking of pam_smbpass.so. +* Add more netlogon GetDcName() client calls. + + +o Steve Langasek [EMAIL PROTECTED] +* Allow SIGTERM to cause nmbd to exit on awaiting an interface + to come up. + + +o Volker Lendecke [EMAIL PROTECTED] +* Fix record state check error when reviewing entries in nmbd's + WINS database. + + +o Justin Maggard [EMAIL PROTECTED] +* Don't expire a password if it's explicitly set as ACB_PWNOTREQ. + + +o [EMAIL PROTECTED] +* Fix old old bug in cli_smbwrite() (not incrementing data + being sent). + + +o Jens Nissen [EMAIL PROTECTED] +* BUG 4537: Fix smbtorture deny test2. + + +o James Peach [EMAIL PROTECTED] +* Fix structure types in the vfs_catia NT_ACL operations. + + +o Doug Rudoff [EMAIL PROTECTED] +* Ensure that the the lck struct for invalid locks are correctly + saved and therefore cleaned up. + + +o Simo Sorce [EMAIL PROTECTED] +* Updates for the packaging/Debian directory. +* Add missing 'c' character to the list of shell safe characters. +* BUG 4667 (partial): Fix crash bug in idmap_ldap.c. +* Fix inconsistencies between creating machine and user accounts. +* Fix bug deleting LDAP user accounts that used the account + objectclass as its structural basis. +* BUG 2319: Ensure that smbspool correctly decodes %-encoded + characters. +* BUG 4624: Fix crashes in idmap_rid. + + +Release notes for older releases follow: + + -- + === + Release Notes for Samba 3.0.25a + May 25, 2007 + === + Major bug fixes included in Samba 3.0.25a are: o Missing supplementary Unix group membership when using force @@ -54,7 +154,7 @@ about that we retry the lock every 10 seconds instead of waiting for the standard select timeout. * BUG 4637: Fix samlogon reply regression that broke domain logons. -* Fix rename on open files and improved cdelete-on-close semantics. +* Fix rename
svn commit: samba r23546 - in branches/SAMBA_3_0_25/source: .
Author: jerry Date: 2007-06-19 16:59:51 + (Tue, 19 Jun 2007) New Revision: 23546 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23546 Log: this is now 3.0.25c Modified: branches/SAMBA_3_0_25/source/VERSION Changeset: Modified: branches/SAMBA_3_0_25/source/VERSION === --- branches/SAMBA_3_0_25/source/VERSION2007-06-19 16:59:20 UTC (rev 23545) +++ branches/SAMBA_3_0_25/source/VERSION2007-06-19 16:59:51 UTC (rev 23546) @@ -36,7 +36,7 @@ # e.g. SAMBA_VERSION_REVISION=a# # - 2.2.8a# -SAMBA_VERSION_REVISION=b +SAMBA_VERSION_REVISION=c # For 'pre' releases the version will be #
svn commit: samba-docs r1126 - in tags: .
Author: jerry Date: 2007-06-19 17:17:37 + (Tue, 19 Jun 2007) New Revision: 1126 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1126 Log: tagging 3.0.25b Added: tags/release-3-0-25b/ Changeset: Copied: tags/release-3-0-25b (from rev 1125, trunk)
svn commit: samba r23547 - in branches: SAMBA_3_0/source/param SAMBA_3_0_26/source/param
Author: obnox
Date: 2007-06-19 21:06:31 + (Tue, 19 Jun 2007)
New Revision: 23547
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23547
Log:
Ignore parameter include in regsitry globals.
Michael
Modified:
branches/SAMBA_3_0/source/param/loadparm.c
branches/SAMBA_3_0_26/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===
--- branches/SAMBA_3_0/source/param/loadparm.c 2007-06-19 16:59:51 UTC (rev
23546)
+++ branches/SAMBA_3_0/source/param/loadparm.c 2007-06-19 21:06:31 UTC (rev
23547)
@@ -3163,6 +3163,11 @@
type,
size,
data_p);
+ if (strcmp(valname,include)) {
+ DEBUG(10, (process_registry_globals: Ignoring
+ parameter 'include' in registry.\n));
+ continue;
+ }
DEBUG(10, (process_registry_shares: got value '%s'\n,
valname));
if (size data_p) {
Modified: branches/SAMBA_3_0_26/source/param/loadparm.c
===
--- branches/SAMBA_3_0_26/source/param/loadparm.c 2007-06-19 16:59:51 UTC
(rev 23546)
+++ branches/SAMBA_3_0_26/source/param/loadparm.c 2007-06-19 21:06:31 UTC
(rev 23547)
@@ -3164,6 +3164,11 @@
type,
size,
data_p);
+ if (strcmp(valname,include)) {
+ DEBUG(10, (process_registry_globals: Ignoring
+ parameter 'include' in registry.\n));
+ continue;
+ }
DEBUG(10, (process_registry_shares: got value '%s'\n,
valname));
if (size data_p) {
svn commit: samba r23548 - in branches: SAMBA_3_0/source/param SAMBA_3_0_26/source/param
Author: obnox
Date: 2007-06-19 21:08:46 + (Tue, 19 Jun 2007)
New Revision: 23548
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23548
Log:
Fix comments.
Michael
Modified:
branches/SAMBA_3_0/source/param/loadparm.c
branches/SAMBA_3_0_26/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===
--- branches/SAMBA_3_0/source/param/loadparm.c 2007-06-19 21:06:31 UTC (rev
23547)
+++ branches/SAMBA_3_0/source/param/loadparm.c 2007-06-19 21:08:46 UTC (rev
23548)
@@ -3136,7 +3136,7 @@
KEY_SMBCONF, GLOBAL_NAME);
normalize_dbkey(keystr);
- DEBUG(10, (process_registry_shares: fetching key '%s'\n,
+ DEBUG(10, (process_registry_globals: fetching key '%s'\n,
keystr));
data = tdb_fetch_bystring(reg_tdb-tdb, keystr);
@@ -3150,7 +3150,7 @@
/* unpack number of values */
len = tdb_unpack(buf, buflen, d, num_values);
- DEBUG(10, (process_registry_shares: got %d values from tdb\n,
+ DEBUG(10, (process_registry_globals: got %d values from tdb\n,
num_values));
/* unpack the values */
@@ -3168,7 +3168,7 @@
parameter 'include' in registry.\n));
continue;
}
- DEBUG(10, (process_registry_shares: got value '%s'\n,
+ DEBUG(10, (process_registry_globals: got value '%s'\n,
valname));
if (size data_p) {
err = registry_pull_value(reg_tdb,
Modified: branches/SAMBA_3_0_26/source/param/loadparm.c
===
--- branches/SAMBA_3_0_26/source/param/loadparm.c 2007-06-19 21:06:31 UTC
(rev 23547)
+++ branches/SAMBA_3_0_26/source/param/loadparm.c 2007-06-19 21:08:46 UTC
(rev 23548)
@@ -3137,7 +3137,7 @@
KEY_SMBCONF, GLOBAL_NAME);
normalize_dbkey(keystr);
- DEBUG(10, (process_registry_shares: fetching key '%s'\n,
+ DEBUG(10, (process_registry_globals: fetching key '%s'\n,
keystr));
data = tdb_fetch_bystring(reg_tdb-tdb, keystr);
@@ -3151,7 +3151,7 @@
/* unpack number of values */
len = tdb_unpack(buf, buflen, d, num_values);
- DEBUG(10, (process_registry_shares: got %d values from tdb\n,
+ DEBUG(10, (process_registry_globals: got %d values from tdb\n,
num_values));
/* unpack the values */
@@ -3169,7 +3169,7 @@
parameter 'include' in registry.\n));
continue;
}
- DEBUG(10, (process_registry_shares: got value '%s'\n,
+ DEBUG(10, (process_registry_globals: got value '%s'\n,
valname));
if (size data_p) {
err = registry_pull_value(reg_tdb,
svn commit: samba r23549 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_26/source/utils
Author: obnox
Date: 2007-06-19 21:40:27 + (Tue, 19 Jun 2007)
New Revision: 23549
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23549
Log:
Make net conf setparm always use registry data type sz.
This simplifies the usage of this command from
net conf setparm section param type value
to
net conf setparm section param value.
Micheal
Modified:
branches/SAMBA_3_0/source/utils/net_conf.c
branches/SAMBA_3_0_26/source/utils/net_conf.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_conf.c
===
--- branches/SAMBA_3_0/source/utils/net_conf.c 2007-06-19 21:08:46 UTC (rev
23548)
+++ branches/SAMBA_3_0/source/utils/net_conf.c 2007-06-19 21:40:27 UTC (rev
23549)
@@ -82,8 +82,7 @@
static int net_conf_setparm_usage(int argc, const char **argv)
{
- d_printf(USAGE: net conf setparm section param type value\n
-\t(Supported types are 'dword' and 'sz' by now.)\n);
+ d_printf(USAGE: net conf setparm section param value\n);
return -1;
}
@@ -918,20 +917,18 @@
struct registry_key *key = NULL;
char *service = NULL;
char *param = NULL;
- char *type = NULL;
const char *value_str = NULL;
TALLOC_CTX *ctx;
ctx = talloc_init(setparm);
- if (argc != 4) {
+ if (argc != 3) {
net_conf_setparm_usage(argc, argv);
goto done;
}
service = strdup_lower(argv[0]);
param = strdup_lower(argv[1]);
- type = strdup_lower(argv[2]);
- value_str = argv[3];
+ value_str = argv[2];
if (!smbconf_key_exists(ctx, service)) {
werr = reg_createkey_internal(ctx, service, key);
@@ -943,7 +940,7 @@
goto done;
}
- werr = reg_setvalue_internal(key, param, type, value_str);
+ werr = reg_setvalue_internal(key, param, sz, value_str);
if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, Error setting value '%s': %s\n,
param, dos_errstr(werr));
Modified: branches/SAMBA_3_0_26/source/utils/net_conf.c
===
--- branches/SAMBA_3_0_26/source/utils/net_conf.c 2007-06-19 21:08:46 UTC
(rev 23548)
+++ branches/SAMBA_3_0_26/source/utils/net_conf.c 2007-06-19 21:40:27 UTC
(rev 23549)
@@ -82,8 +82,7 @@
static int net_conf_setparm_usage(int argc, const char **argv)
{
- d_printf(USAGE: net conf setparm section param type value\n
-\t(Supported types are 'dword' and 'sz' by now.)\n);
+ d_printf(USAGE: net conf setparm section param value\n);
return -1;
}
@@ -918,20 +917,18 @@
struct registry_key *key = NULL;
char *service = NULL;
char *param = NULL;
- char *type = NULL;
const char *value_str = NULL;
TALLOC_CTX *ctx;
ctx = talloc_init(setparm);
- if (argc != 4) {
+ if (argc != 3) {
net_conf_setparm_usage(argc, argv);
goto done;
}
service = strdup_lower(argv[0]);
param = strdup_lower(argv[1]);
- type = strdup_lower(argv[2]);
- value_str = argv[3];
+ value_str = argv[2];
if (!smbconf_key_exists(ctx, service)) {
werr = reg_createkey_internal(ctx, service, key);
@@ -943,7 +940,7 @@
goto done;
}
- werr = reg_setvalue_internal(key, param, type, value_str);
+ werr = reg_setvalue_internal(key, param, sz, value_str);
if (!W_ERROR_IS_OK(werr)) {
d_fprintf(stderr, Error setting value '%s': %s\n,
param, dos_errstr(werr));
Build status as of Wed Jun 20 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-06-19 00:00:23.0 + +++ /home/build/master/cache/broken_results.txt 2007-06-20 00:00:23.0 + @@ -1,4 +1,4 @@ -Build status as of Tue Jun 19 00:00:01 2007 +Build status as of Wed Jun 20 00:00:02 2007 Build counts: Tree Total Broken Panic @@ -9,17 +9,17 @@ distcc 2 0 0 ldb 35 3 0 libreplace 33 9 0 -lorikeet-heimdal 31 23 0 +lorikeet-heimdal 31 17 0 pidl 20 4 0 -ppp 15 0 0 +ppp 15 8 0 python 0 0 0 rsync36 10 0 samba0 0 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba4 33 21 12 -samba_3_035 18 0 +samba4 32 22 12 +samba_3_036 17 0 smb-build33 33 0 talloc 36 8 0 -tdb 35 2 0 +tdb 34 2 0
svn commit: samba r23550 - in branches: SAMBA_3_0/source/lib SAMBA_3_0_25/source/libsmb SAMBA_3_0_26/source/lib
Author: jra
Date: 2007-06-20 01:26:18 + (Wed, 20 Jun 2007)
New Revision: 23550
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23550
Log:
Add more UNIX error - NT status mappings.
Jeremy.
Modified:
branches/SAMBA_3_0/source/lib/errmap_unix.c
branches/SAMBA_3_0_25/source/libsmb/errormap.c
branches/SAMBA_3_0_26/source/lib/errmap_unix.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/errmap_unix.c
===
--- branches/SAMBA_3_0/source/lib/errmap_unix.c 2007-06-19 21:40:27 UTC (rev
23549)
+++ branches/SAMBA_3_0/source/lib/errmap_unix.c 2007-06-20 01:26:18 UTC (rev
23550)
@@ -63,9 +63,34 @@
{ ENOBUFS, ERRDOS, ERRnomem, NT_STATUS_INSUFFICIENT_RESOURCES },
#endif
{ EAGAIN, ERRDOS, 111, NT_STATUS_NETWORK_BUSY },
+#ifdef EADDRINUSE
+ { EADDRINUSE, ERRDOS, 52, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED},
+#endif
+#ifdef ENETUNREACH
+ { ENETUNREACH, ERRHRD, ERRgeneral, NT_STATUS_NETWORK_UNREACHABLE},
+#endif
+#ifdef EHOSTUNREACH
+ { EHOSTUNREACH, ERRHRD, ERRgeneral, NT_STATUS_HOST_UNREACHABLE},
+#endif
+#ifdef ECONNREFUSED
+ { ECONNREFUSED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_REFUSED},
+#endif
+#ifdef ETIMEDOUT
+ { ETIMEDOUT, ERRHRD, 121, NT_STATUS_IO_TIMEOUT},
+#endif
+#ifdef ECONNABORTED
+ { ECONNABORTED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_ABORTED},
+#endif
+#ifdef ENODEV
+ { ENODEV, ERRDOS, 55, NT_STATUS_DEVICE_DOES_NOT_EXIST},
+#endif
+#ifdef EPIPE
+ { EPIPE, ERRDOS, 109, NT_STATUS_PIPE_BROKEN},
+#endif
#ifdef EWOULDBLOCK
{ EWOULDBLOCK, ERRDOS, 111, NT_STATUS_NETWORK_BUSY },
#endif
+
{ 0, 0, 0, NT_STATUS_OK }
};
Modified: branches/SAMBA_3_0_25/source/libsmb/errormap.c
===
--- branches/SAMBA_3_0_25/source/libsmb/errormap.c 2007-06-19 21:40:27 UTC
(rev 23549)
+++ branches/SAMBA_3_0_25/source/libsmb/errormap.c 2007-06-20 01:26:18 UTC
(rev 23550)
@@ -1542,6 +1542,34 @@
#ifdef ENOBUFS
{ ENOBUFS, ERRDOS, ERRnomem, NT_STATUS_INSUFFICIENT_RESOURCES },
#endif
+ { EAGAIN, ERRDOS, 111, NT_STATUS_NETWORK_BUSY },
+#ifdef EADDRINUSE
+ { EADDRINUSE, ERRDOS, 52, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED},
+#endif
+#ifdef ENETUNREACH
+ { ENETUNREACH, ERRHRD, ERRgeneral, NT_STATUS_NETWORK_UNREACHABLE},
+#endif
+#ifdef EHOSTUNREACH
+ { EHOSTUNREACH, ERRHRD, ERRgeneral, NT_STATUS_HOST_UNREACHABLE},
+#endif
+#ifdef ECONNREFUSED
+ { ECONNREFUSED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_REFUSED},
+#endif
+#ifdef ETIMEDOUT
+ { ETIMEDOUT, ERRHRD, 121, NT_STATUS_IO_TIMEOUT},
+#endif
+#ifdef ECONNABORTED
+ { ECONNABORTED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_ABORTED},
+#endif
+#ifdef ENODEV
+ { ENODEV, ERRDOS, 55, NT_STATUS_DEVICE_DOES_NOT_EXIST},
+#endif
+#ifdef EPIPE
+ {EPIPE, ERRDOS, 109, NT_STATUS_PIPE_BROKEN},
+#endif
+#ifdef EWOULDBLOCK
+ { EWOULDBLOCK, ERRDOS, 111, NT_STATUS_NETWORK_BUSY },
+#endif
{ 0, 0, 0, NT_STATUS_OK }
};
Modified: branches/SAMBA_3_0_26/source/lib/errmap_unix.c
===
--- branches/SAMBA_3_0_26/source/lib/errmap_unix.c 2007-06-19 21:40:27 UTC
(rev 23549)
+++ branches/SAMBA_3_0_26/source/lib/errmap_unix.c 2007-06-20 01:26:18 UTC
(rev 23550)
@@ -63,9 +63,34 @@
{ ENOBUFS, ERRDOS, ERRnomem, NT_STATUS_INSUFFICIENT_RESOURCES },
#endif
{ EAGAIN, ERRDOS, 111, NT_STATUS_NETWORK_BUSY },
+#ifdef EADDRINUSE
+ { EADDRINUSE, ERRDOS, 52, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED},
+#endif
+#ifdef ENETUNREACH
+ { ENETUNREACH, ERRHRD, ERRgeneral, NT_STATUS_NETWORK_UNREACHABLE},
+#endif
+#ifdef EHOSTUNREACH
+ { EHOSTUNREACH, ERRHRD, ERRgeneral, NT_STATUS_HOST_UNREACHABLE},
+#endif
+#ifdef ECONNREFUSED
+ { ECONNREFUSED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_REFUSED},
+#endif
+#ifdef ETIMEDOUT
+ { ETIMEDOUT, ERRHRD, 121, NT_STATUS_IO_TIMEOUT},
+#endif
+#ifdef ECONNABORTED
+ { ECONNABORTED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_ABORTED},
+#endif
+#ifdef ENODEV
+ { ENODEV, ERRDOS, 55, NT_STATUS_DEVICE_DOES_NOT_EXIST},
+#endif
+#ifdef EPIPE
+ { EPIPE, ERRDOS, 109, NT_STATUS_PIPE_BROKEN},
+#endif
#ifdef EWOULDBLOCK
{ EWOULDBLOCK, ERRDOS, 111, NT_STATUS_NETWORK_BUSY },
#endif
+
{ 0, 0, 0, NT_STATUS_OK }
};
svn commit: samba r23551 - in branches/SAMBA_4_0/source: lib/registry lib/util librpc/rpc rpc_server/epmapper torture/basic
Author: abartlet
Date: 2007-06-20 04:15:39 + (Wed, 20 Jun 2007)
New Revision: 23551
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23551
Log:
Change data_blob_equal to data_blob_cmp, suitable for sorting with qsort().
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/lib/registry/patchfile.c
branches/SAMBA_4_0/source/lib/util/data_blob.c
branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c
branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c
branches/SAMBA_4_0/source/torture/basic/aliases.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/registry/patchfile.c
===
--- branches/SAMBA_4_0/source/lib/registry/patchfile.c 2007-06-20 01:26:18 UTC
(rev 23550)
+++ branches/SAMBA_4_0/source/lib/registry/patchfile.c 2007-06-20 04:15:39 UTC
(rev 23551)
@@ -125,7 +125,7 @@
return error2;
}
- if (W_ERROR_IS_OK(error2) data_blob_equal(v1-data,
v2-data))
+ if (W_ERROR_IS_OK(error2) data_blob_cmp(v1-data,
v2-data) == 0)
continue;
thiskey = diff_find_add_key(diff, oldkey-path);
Modified: branches/SAMBA_4_0/source/lib/util/data_blob.c
===
--- branches/SAMBA_4_0/source/lib/util/data_blob.c 2007-06-20 01:26:18 UTC
(rev 23550)
+++ branches/SAMBA_4_0/source/lib/util/data_blob.c 2007-06-20 04:15:39 UTC
(rev 23551)
@@ -130,21 +130,23 @@
/**
check if two data blobs are equal
**/
-_PUBLIC_ BOOL data_blob_equal(const DATA_BLOB *d1, const DATA_BLOB *d2)
+_PUBLIC_ int data_blob_cmp(const DATA_BLOB *d1, const DATA_BLOB *d2)
{
- if (d1-length != d2-length) {
- return False;
+ int ret;
+ if (d1-data == NULL d2-data != NULL) {
+ return -1;
}
+ if (d1-data != NULL d2-data == NULL) {
+ return 1;
+ }
if (d1-data == d2-data) {
- return True;
+ return d1-length - d2-length;
}
- if (d1-data == NULL || d2-data == NULL) {
- return False;
+ ret = memcmp(d1-data, d2-data, MIN(d1-length, d2-length));
+ if (ret == 0) {
+ return d1-length - d2-length;
}
- if (memcmp(d1-data, d2-data, d1-length) == 0) {
- return True;
- }
- return False;
+ return ret;
}
/**
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c
===
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c 2007-06-20 01:26:18 UTC
(rev 23550)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c 2007-06-20 04:15:39 UTC
(rev 23551)
@@ -1193,7 +1193,7 @@
blob2 = ndr_push_blob(push);
- if (!data_blob_equal(blob, blob2)) {
+ if (data_blob_cmp(blob, blob2) != 0) {
DEBUG(3,(original:\n));
dump_data(3, blob.data, blob.length);
DEBUG(3,(secondary:\n));
@@ -1276,7 +1276,7 @@
blob2 = ndr_push_blob(push);
- if (!data_blob_equal(blob, blob2)) {
+ if (data_blob_cmp(blob, blob2) != 0) {
DEBUG(3,(original:\n));
dump_data(3, blob.data, blob.length);
DEBUG(3,(secondary:\n));
Modified: branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c
===
--- branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c
2007-06-20 01:26:18 UTC (rev 23550)
+++ branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c
2007-06-20 04:15:39 UTC (rev 23551)
@@ -218,8 +218,8 @@
for (i=0;icount;i++) {
if (
-
!data_blob_equal(r-in.map_tower-tower.floors[0].lhs.lhs_data,
- eps[i].ep.floors[0].lhs.lhs_data)
+
data_blob_cmp(r-in.map_tower-tower.floors[0].lhs.lhs_data,
+ eps[i].ep.floors[0].lhs.lhs_data) != 0
|| transport != dcerpc_transport_by_tower(eps[i].ep)) {
continue;
}
Modified: branches/SAMBA_4_0/source/torture/basic/aliases.c
===
--- branches/SAMBA_4_0/source/torture/basic/aliases.c 2007-06-20 01:26:18 UTC
(rev 23550)
+++ branches/SAMBA_4_0/source/torture/basic/aliases.c 2007-06-20 04:15:39 UTC
(rev 23551)
@@ -68,8 +68,8 @@
for (t2b=alias_blobs; t2b; t2b=t2b-next) {
for (t2b2=alias_blobs; t2b2; t2b2=t2b2-next) {
if (t2b-level = t2b2-level) continue;
- if (data_blob_equal(t2b-params, t2b2-params)
- data_blob_equal(t2b-data, t2b2-data)) {
+ if (data_blob_cmp(t2b-params, t2b2-params) == 0
+
