[Samba] Fwd: samba : Strong(er) authentication required
-- Forwarded message -- From: francis thaon [EMAIL PROTECTED] Date: 2008/9/30 Subject: samba : Strong(er) authentication required To: samba@lists.samba.org Good morning I am running a windows server 2003 AD domain where the option server signing cannot be changed I have installed the latest version of samba and i always get this error msg Failed to join domain : Strong(er) authentication required Kinit is working net ads join -U xx -d4 does give above error message Is there a solution for this ? It seems lots of person are getting the problem and the only solution i have seeen is to change DC configuration for server signing that could not be allowed in the entreprise. thanks best regards Francis -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] smbldap and password expiration
Onatawahtaw a écrit : Greetings, I just recently set up a new server with samba and openldap authentication using smbldap. The passwords seem to be expiring after about 30 days. How do I set them so that they don't expire? Thanks, Onatawahtaw Hi, using smbldap-tools ? see -A and -B options in smbldap-user[add|mod] Manu -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Fwd: samba : Strong(er) authentication required
hi! You need Samba 3.2.x for this. And add the smb.conf parameter: client ldap sasl wrapping = sign The only other way is to use NTLM authentication (security = domain), but this might cause even more troubles. Bye, Martin francis thaon schrieb: -- Forwarded message -- From: francis thaon [EMAIL PROTECTED] Date: 2008/9/30 Subject: samba : Strong(er) authentication required To: samba@lists.samba.org Good morning I am running a windows server 2003 AD domain where the option server signing cannot be changed I have installed the latest version of samba and i always get this error msg Failed to join domain : Strong(er) authentication required Kinit is working net ads join -U xx -d4 does give above error message Is there a solution for this ? It seems lots of person are getting the problem and the only solution i have seeen is to change DC configuration for server signing that could not be allowed in the entreprise. thanks best regards Francis -- Martin Zielinski[EMAIL PROTECTED] Softwareentwicklung T +49 (0)521 94226 76 SEH Computertechnik GmbHwww.seh.de -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] can root still connect clients to a domain?
On Tue, Sep 30, 2008 at 01:37:00PM +0200, Helmut Hullen wrote: when I connect a Windows client to a Samba domain I am asked for the user's login name and password on the Linux server who has the rights to do this job. Under Samba 3.0.22 and older I could use root with a password defined via smbpasswd (must not be the Linux password). Under Samba 3.0.28 and newer this way seems no more possible; I have to use another user from the admin users = xxx, yyy, zzz line. Is that a change which is somewhere documented? Probably this has to do with group mapping changes. The login as root should definitely still work, however root is no longer automatically in the domain admins group (probably required for accessing the client's c$ share). You have to create an explicit group mapping entry for the sid S-1-5-21-DOMAIN-SID-512 and make root member of the corresponding unix group. Volker pgpUUHproXddD.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
[Samba] RE: Browse QNX directories thro windows PC thro SAMBA
DISCLAIMER: --- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or HCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of HCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. Before opening any mail and attachments please check them for viruses and defect. - To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba over bridged ethernet VPN
On Tuesday 30 September 2008 18:07:25 Daniel Bye wrote: Thanks for your reply, Wes. ... As for the routing between sites, if I understand correctly what you're asking, then it's simply a small LAN in the office attached via a commodity ADSL modem, with Samba and OpenVPN running on the same host. OpenVPN is running in bridged Ethernet mode, and assigns IP addresses to connecting clients. Therefore, effectively there is no routing between sites, as far as our CIFS/SMB clients are concerned. However, the physical routing is essentially as you'd expect - the office is on a standard domestic grade ADSL link, as are two of the remote users. The other remote users and I are connected over cable, and all are subject to our upstream providers' routing policies. I'm going to try fiddling with the MTU/fragment/mssfix settings in my OpenVPN configs, and see how we get on. If you're using Linux routers, a good diag tool is iperf, which has a maximum MTU discovery mode. The problem (apparently) comes in because fragmenting OpenVPN packets is Bad. So if you set no-fragment then large packets just get dropped, which is also Bad. It can also come from an interface or router in the middle that's broken somehow. In my case, I had a PCI T1 interface that wasn't reporting the correct MTU for path discovery. It was reporting 1500 as standard but it actually cut off somewhere around 1480; I think the driver implementation was broken. Normally it wouldn't be an issue, but since OVPN can't be fragmented it became a problem. Regardless, I hard-set the MTU on the ethernet devices (both ends) to 1400 and that fixed the transport issue. In theory, you can do the same in the OVPN config (such that it pre-fragments, basically) but it didn't work as well for me. Good luck! Wes -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba authentication using ADS
Greetings I need help in setting up my linux box with ADS authentication on Samba. I know that it can be done using winbind and Kerberos. I tried some of the online methods but I am not able to get a result. Request you to please help me with this. These are the steps I followed to setup winbind * Using Authconfig command I put in the relavant details like Use Winbind and Use Winbind Authentication and left Cache Information, Use MD5 Passwords and Use Shadow Passwords selected * Then I put details about the domain with authentication. * I placed entries in /etc/nssswitch as passwd: files winbind shadow: files winbind group: files winbind This is the output I get [2008/10/01 18:27:56, 0] libads/kerberos.c:ads_kinit_password(146) kerberos_kinit_password [EMAIL PROTECTED] failed: Cannot find KDC for requested realm [2008/10/01 18:27:56, 0] utils/net_ads.c:ads_startup(186) ads_connect: Cannot find KDC for requested realm [2008/10/01 18:27:56, 0] rpc_client/cli_pipe.c:cli_nt_session_open(1451) cli_nt_session_open: cli_nt_create failed on pipe \lsarpc to machine ads.example.com. Error was NT_STATUS_ACCESS_DENIED could not initialise lsa pipe could not obtain sid for domain Shutting down Winbind services:[FAILED] Starting Winbind services: [ OK ] Please help me as to what is going wrong. Appreciate if any members could help me out in configuring using Kerberos. Here also I edited the krb5.conf, krb.conf and krb.realm with the correct parameters but stll am not able to get a solution. Thanking you Prashanth Adiyodi System Administrator Roamware (I) Pvt. Ltd. 7th Floor, Sigma, Hiranandani Gardens Technology Street, Powai, Mumbai-400 076 Tel: 40406000 Ext: 6124 GSM: 91-9833377712 www.roamware.com http://www.roamware.com The information contained herein may include confidential or privileged information and is intended solely for the recipient(s) noted above. If you receive this e-mail in error, please respond to the sender and delete the e-mail. Any dissemination of this e-mail or the information contained in this e-mail or attachments to unintended parties is prohibited. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Samba authentication using ADS
Try this: http://wiki.samba.org/index.php/Samba__Active_Directory -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] ] On Behalf Of Prashanth Adiyodi Sent: Wednesday, October 01, 2008 7:42 AM To: samba@lists.samba.org Subject: [Samba] Samba authentication using ADS Greetings I need help in setting up my linux box with ADS authentication on Samba. I know that it can be done using winbind and Kerberos. I tried some of the online methods but I am not able to get a result. Request you to please help me with this. These are the steps I followed to setup winbind * Using Authconfig command I put in the relavant details like Use Winbind and Use Winbind Authentication and left Cache Information, Use MD5 Passwords and Use Shadow Passwords selected * Then I put details about the domain with authentication. * I placed entries in /etc/nssswitch as passwd: files winbind shadow: files winbind group: files winbind This is the output I get [2008/10/01 18:27:56, 0] libads/kerberos.c:ads_kinit_password(146) kerberos_kinit_password [EMAIL PROTECTED] failed: Cannot find KDC for requested realm [2008/10/01 18:27:56, 0] utils/net_ads.c:ads_startup(186) ads_connect: Cannot find KDC for requested realm [2008/10/01 18:27:56, 0] rpc_client/cli_pipe.c:cli_nt_session_open(1451) cli_nt_session_open: cli_nt_create failed on pipe \lsarpc to machine ads.example.com. Error was NT_STATUS_ACCESS_DENIED could not initialise lsa pipe could not obtain sid for domain Shutting down Winbind services:[FAILED] Starting Winbind services: [ OK ] Please help me as to what is going wrong. Appreciate if any members could help me out in configuring using Kerberos. Here also I edited the krb5.conf, krb.conf and krb.realm with the correct parameters but stll am not able to get a solution. Thanking you Prashanth Adiyodi System Administrator Roamware (I) Pvt. Ltd. 7th Floor, Sigma, Hiranandani Gardens Technology Street, Powai, Mumbai-400 076 Tel: 40406000 Ext: 6124 GSM: 91-9833377712 www.roamware.com http://www.roamware.com The information contained herein may include confidential or privileged information and is intended solely for the recipient(s) noted above. If you receive this e-mail in error, please respond to the sender and delete the e-mail. Any dissemination of this e-mail or the information contained in this e-mail or attachments to unintended parties is prohibited. -- 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] nmbd fails to start - permission denied
On Tue, Sep 30, 2008 at 10:36:49PM -0400, Onotsky, Steve x55328 wrote: Once all of that was in place, I started up Samba via the Red Hat startup script, but nmbd failed to load. The nmbd.log file indicates that it can't open the smb.conf file, with the error Permission denied. I've verified that unprivileged users can change into the directory where the config file resides, and I've given full (777) permissions to the file. It also fails at boot time. Is it possible that you have something like SELinux installed? If yes, please deactivate that and try again. Volker pgpHGine6ONrD.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] nmbd fails to start - permission denied
Danke, Volker. SELinux bit me in the ass again; I set it to permissive, rebooted, and voila - nmbd starting. I wonder why it fails during boot/via the script, but runs manually... Cheers Steve -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Volker Lendecke Sent: October 1, 2008 11:10 To: Onotsky, Steve x55328 Cc: samba@lists.samba.org Subject: Re: [Samba] nmbd fails to start - permission denied On Tue, Sep 30, 2008 at 10:36:49PM -0400, Onotsky, Steve x55328 wrote: Once all of that was in place, I started up Samba via the Red Hat startup script, but nmbd failed to load. The nmbd.log file indicates that it can't open the smb.conf file, with the error Permission denied. I've verified that unprivileged users can change into the directory where the config file resides, and I've given full (777) permissions to the file. It also fails at boot time. Is it possible that you have something like SELinux installed? If yes, please deactivate that and try again. Volker This message and any attachments are intended only for the use of the addressee and may contain information that is privileged and confidential. If the reader of the message is not the intended recipient or an authorized representative of the intended recipient, you are hereby notified that any dissemination of this communication is strictly prohibited. If you have received this communication in error, please notify us immediately by e-mail and delete the message and any attachments from your system. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Revisiting Samba's interaction with LDAP's ppolicy overlay
On Mon, Sep 29, 2008 at 10:14:01AM -0400, Adam Tauno Williams wrote: This is, AFAIK, the only solution currently. We do the same thing. It stinks. As I said in the former mail thread: Patches are welcome. If you really want it done quickly, some companies on http://samba.org/samba/support also offer development services. Volker pgpBYc6QWOEWF.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
[Samba] samba-3.2.4 Solaris 9: configure gets error: Active Directory support requires ldap_initialize
Unable to compile samba-3.2.4 on Solaris 9 for sparc. #building openldap CC=gcc #echo $CC #exit CPPFLAGS=-I/usr/local/include -I/usr/local/ssl/include -I/usr/local/BerkeleyDB.4.2/include -I/usr/local/include/sasl LDFLAGS=-L/usr/local/lib -L/usr/local/ssl/lib -L/usr/local/BerkeleyDB.4.2/lib export CC CPPFLAGS LDFLAGS # CFLAGS='-D_AVL_H' export CFLAGS # ./configure --enable-bdb make depend make install #end building openldap #build samba make clean ./configure --with-ldap --with-acl-support --with-ads --with-pam --with-winbind --with-krb5=/usr/local #make #make install #end build samba The samba script, configure, seems to be failing with the following: checking for LDAP support... yes checking ldap.h usability... yes checking ldap.h presence... yes checking for ldap.h... yes checking lber.h usability... yes checking lber.h presence... yes checking for lber.h... yes checking for ber_tag_t... yes checking for ber_scanf in -llber... yes checking for ber_sockbuf_add_io... yes checking for LDAP_OPT_SOCKBUF... yes checking for LBER_OPT_LOG_PRINT_FN... yes checking for ldap_init in -lldap... yes checking for ldap_set_rebind_proc... yes checking whether ldap_set_rebind_proc takes 3 arguments... 3 checking for ldap_initialize... no checking whether LDAP support is used... yes checking for Active Directory and krb5 support... yes checking for ldap_initialize... (cached) no configure: error: Active Directory support requires ldap_initialize -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba PDC - first Domain Admin
Hi guys, i'm trying to setup a samba PDC and was hoping to delegate Admin control to the Domain Admins Group. The backend is run off of ldap and there is no root user account in the ldap directory i set my user james with the rid ending in -500 i used: net rpc rights grant TESTING/Domain Admins SeMachineAccountPrivilege SePrintOperatorPrivilege SeAddUsersPrivilege SeRemoteShutdownPrivilege SeDiskOperatorPrivilege -U james i get: Failed to grant privileges for Domain Admins (NT_STATUS_ACCESS_DENIED) does the first Admin user HAVE to have uid=0 and be in the ldap directory? if so can i just shove him in and remove him later? and does the net rpc rights grant command have to be run on every domain controller or does it right something to ldap so it'll know? Thanks, James -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] nmbd fails to start - permission denied
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hopefully this is not taken as rude: Disabling/setting permissive SELinux (particularly for an app that ships with the distribution) is the WRONG way to go, and is not required. It's a good way to figure if it is SELinux that is the problem, but the real solution is to fix the problems with the setup. Frequently it's nothing more than using restorecon or chcon. None of this stuff is rocket science, and is there to help keep admins from getting called in to clean up after intruders. Onotsky, Steve x55328 wrote: Danke, Volker. SELinux bit me in the ass again; I set it to permissive, rebooted, and voila - nmbd starting. I wonder why it fails during boot/via the script, but runs manually... Cheers Steve -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Volker Lendecke Sent: October 1, 2008 11:10 To: Onotsky, Steve x55328 Cc: samba@lists.samba.org Subject: Re: [Samba] nmbd fails to start - permission denied On Tue, Sep 30, 2008 at 10:36:49PM -0400, Onotsky, Steve x55328 wrote: Once all of that was in place, I started up Samba via the Red Hat startup script, but nmbd failed to load. The nmbd.log file indicates that it can't open the smb.conf file, with the error Permission denied. I've verified that unprivileged users can change into the directory where the config file resides, and I've given full (777) permissions to the file. It also fails at boot time. Is it possible that you have something like SELinux installed? If yes, please deactivate that and try again. Volker This message and any attachments are intended only for the use of the addressee and may contain information that is privileged and confidential. If the reader of the message is not the intended recipient or an authorized representative of the intended recipient, you are hereby notified that any dissemination of this communication is strictly prohibited. If you have received this communication in error, please notify us immediately by e-mail and delete the message and any attachments from your system. - -- _ _ _ _ ___ _ _ _ |Y#| | | |\/| | \ |\ | | |Ryan Novosielski - Systems Programmer II |$| |__| | | |__/ | \| _| |[EMAIL PROTECTED] - 973/972.0922 (2-0922) \__/ Univ. of Med. and Dent.|IST/AST - NJMS Medical Science Bldg - C630 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFI48ubmb+gadEcsb4RApB6AJ9v+w++NOyJmsTNKWsNtf8QjCsIoQCeN0Jj x0jrKpAiiP/bl8MQWDKV6ek= =kSP5 -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] file share issues
I have /oracle/fin shared out but when a user tries to hit it they get the following error: [2008/10/01 15:55:24, 0] smbd/service.c:make_connection_snum(1003) '/oracle/fin' does not exist or permission denied when connecting to [fin] Error was Permission denied This is AD based authentication which is working fine. If I use setfacl and give the user permissions to the parent folder /oracle then they are able to access the fin share in windows xp. Below is a snippet of the share information. [fin] path = /oracle/fin browseable = yes read only = no create mask = 700 directory mask = 700 writeable = yes getfacl /oracle/fin # file: oracle/fin # owner: oracle # group: dba user::rwx user:tiptonj:rwx user:lawrencej:rwx group::rwx mask::rwx other::--- default:user::rwx default:group::rwx default:mask::rwx default:other::--- Josh ** This email contains confidential and proprietary information and is not to be used or disclosed to anyone other than the named recipient of this email, and is to be used only for the intended purpose of this communication. ** -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba-3.2.4 Solaris 9: configure gets error: Active Directory support requires ldap_initialize
Hi Wayne,
I had the same problem. I fixed one line in configure:
if test x$debug = xyes ; then
CFLAGS=${CFLAGS} -g
else
CFLAGS=-O
fi
The second if statement was clearing my CFLAGS setting, replacing it
with just -O. I changed the line from CFLAGS=-O to
CFLAGS=${CFLAGS} -O. This kept my settings. I don't know if this is
the correct fix, but it worked for me.
HTH
-John
Wayne Rasmussen wrote:
Unable to compile samba-3.2.4 on Solaris 9 for sparc.
#building openldap
CC=gcc
#echo $CC
#exit
CPPFLAGS=-I/usr/local/include -I/usr/local/ssl/include
-I/usr/local/BerkeleyDB.4.2/include -I/usr/local/include/sasl
LDFLAGS=-L/usr/local/lib -L/usr/local/ssl/lib
-L/usr/local/BerkeleyDB.4.2/lib
export CC CPPFLAGS LDFLAGS
#
CFLAGS='-D_AVL_H'
export CFLAGS
#
./configure --enable-bdb
make depend
make install
#end building openldap
#build samba
make clean
./configure --with-ldap --with-acl-support --with-ads --with-pam
--with-winbind --with-krb5=/usr/local
#make
#make install
#end build samba
The samba script, configure, seems to be failing with the following:
checking for LDAP support... yes
checking ldap.h usability... yes
checking ldap.h presence... yes
checking for ldap.h... yes
checking lber.h usability... yes
checking lber.h presence... yes
checking for lber.h... yes
checking for ber_tag_t... yes
checking for ber_scanf in -llber... yes
checking for ber_sockbuf_add_io... yes
checking for LDAP_OPT_SOCKBUF... yes
checking for LBER_OPT_LOG_PRINT_FN... yes
checking for ldap_init in -lldap... yes
checking for ldap_set_rebind_proc... yes
checking whether ldap_set_rebind_proc takes 3 arguments... 3
checking for ldap_initialize... no
checking whether LDAP support is used... yes
checking for Active Directory and krb5 support... yes
checking for ldap_initialize... (cached) no
configure: error: Active Directory support requires ldap_initialize
--
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] samba-3.2.4 Solaris 9: configure gets error: Active Directory support requires ldap_initialize
On Wed, Oct 01, 2008 at 06:28:42PM -0400, John Center wrote:
I had the same problem. I fixed one line in configure:
if test x$debug = xyes ; then
CFLAGS=${CFLAGS} -g
else
CFLAGS=-O
fi
The second if statement was clearing my CFLAGS setting, replacing it
with just -O. I changed the line from CFLAGS=-O to
CFLAGS=${CFLAGS} -O. This kept my settings. I don't know if this is
the correct fix, but it worked for me.
Pushed the attached patch which should also solve it,
configure is made from configure.in.
Volker
From 73f9e17e6457be8dfb6c1132cc6ca43ef65c677c Mon Sep 17 00:00:00 2001
From: Volker Lendecke [EMAIL PROTECTED]
Date: Thu, 2 Oct 2008 02:17:04 +0200
Subject: [PATCH] Fix bug 5798: CFLAGS info lost in configure
Michael, please check and merge to the other branches if it's right.
Thanks,
Volker
---
source3/configure.in |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/source3/configure.in b/source3/configure.in
index f04ddbe..545a565 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -128,7 +128,7 @@ fi
if test x$debug = xyes ; then
CFLAGS=${CFLAGS} -g
else
- CFLAGS=-O
+ CFLAGS=${CFLAGS} -O
fi
m4_include(../lib/socket_wrapper/config.m4)
--
1.5.5
pgpuCL7vatIeS.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
[Samba] files disappearing from Samba server
I'm the tech coordinator for a high school. Last year, we had a file server kids could save work to that was a generic Celeron 800 PC with an IDE hard drive. It ran Debian Sarge, with whatever version of Samba ships with that. It was down to a couple of gig of free disk space by the end of the year, so this year I took an old Compaq Proliant server (ML360 or something like that) with a three drive RAID 5 SCSI array and installed Debian Etch on that with whatever version of Samba is shipped with that. School's been in session a month now, and I've had dozens of kids come up to me and claim that they've written files to their mapped shares (P: maps to their home directory when they log onto a Windows machine), and the files have disappeared. Teachers have confirmed that they've looked over the kids shoulders while they're saving files, and checked when they were done by accessing the drive via My Computer, and the files are there, but the next day they're gone. Sometimes they say a kid will write a file to the server, and not get any error message, but when they go to My Computer, the file's no where to be found. Needless to say, my credibility is taking quite a beating. Has anyone else experienced this, and have any ideas how to put a stop to it? On a slightly different subject, does anyone know how to get a linux file system to do what we used to be able to do with Netware, ie just launch some utility and see every file you've ever deleted that the file system hasn't yet overwritten, and recover them at will? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0pre1-377-g562dce5
The branch, v3-3-stable has been updated via 562dce5505f47c1f505c538b88107e3d9f9eae54 (commit) via 1020caf615e5c413363ead70f3930895889edc0b (commit) via ba0cb8c74dd2fdeab014a8b90869725b85b6d557 (commit) via 394325b79c9f381e8b4bdaf1b8aec698e2e83cf7 (commit) via f23599f59415f367c7a11b89e5ceac1d6032b87f (commit) via 4cfb63a07d7748d58dd869cdbb48f813534a8dea (commit) via cf1786f82c819d3aeaf26e89dd4c8a627c291fa4 (commit) via 7fb8734762812808905de737495fbe5e550dbe00 (commit) via bea0a1ee8d931bb95d29acbb74593849167a38fd (commit) via 4d2eda0d28380ec04234a75177423d31190a2ef6 (commit) via 3d21d7fc44e528bb27350bb373755241cb46e57c (commit) via b381e23c5498f37208772ac1357b272ad931c92a (commit) via 64bf96ec26d6b479e6e41ec15e0f5036df4f0cd5 (commit) via 3c7f173dff889ba67cf200fe5a6f3b65c276b865 (commit) via 79978a4098fda2bcbcdaffc82c035548917781c8 (commit) from a251d1bf1499f2e9f717028ccd3a46ecef8928e3 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable - Log - commit 562dce5505f47c1f505c538b88107e3d9f9eae54 Author: Jeremy Allison [EMAIL PROTECTED] Date: Tue Sep 30 16:20:43 2008 -0700 Convert to allocated strings. Use write_data(), not send as this doesn't correctly deal with EINTR. Jim and Holger please check this still works. Jeremy. (cherry picked from commit bec55237c9c5687d947562524124b7aa76209b8f) commit 1020caf615e5c413363ead70f3930895889edc0b Author: Jeremy Allison [EMAIL PROTECTED] Date: Tue Sep 30 15:22:24 2008 -0700 Remove current_user_info - not needed. Jeremy. (cherry picked from commit 093fc8c6bf1420c0f1e171598c4894b4df24862c) commit ba0cb8c74dd2fdeab014a8b90869725b85b6d557 Author: Jeremy Allison [EMAIL PROTECTED] Date: Tue Sep 30 15:11:26 2008 -0700 Restructure the module so it connects to the remote data sink on connect, and closes the socket on client disconnect. This should make it much more efficient. Store the remote fd in a private data pointer off the handle. Finally we need to remove the fstrings and convert to allocated buffer storage. Jeremy. (cherry picked from commit e3e89077a5559eda39ea27f0ce6f9f0ebeba8f1e) commit 394325b79c9f381e8b4bdaf1b8aec698e2e83cf7 Author: Jeremy Allison [EMAIL PROTECTED] Date: Tue Sep 30 13:22:44 2008 -0700 Fix the make test problem Karolin reported. Now rename_open_files actually works correctly we must emit the change notify before we change the name, not before. Jeremy (cherry picked from commit 48c0dff0c5e36313619fb39d2bfb57d49ed2141e) commit f23599f59415f367c7a11b89e5ceac1d6032b87f Author: Andrew Tridgell [EMAIL PROTECTED] Date: Mon Sep 29 13:34:58 2008 -0700 re-added winbind:ignore domains patch This option really is essential, as we discover again and again at customer sites. Due to bugs in winbind some domains are toxic. When you are installing at a site and a particular domain in a complex setup causes winbind to segfault or hang then you need a way to disable that domain and continue. In an ideal world winbind could handle arbitrarily complex ADS domains, but we are nowhere near that yet. If we ever get to that stage then we won't need this option. (cherry picked from commit f0f2fbd4800fb4a1df26f03f37b9972101657fdd) commit 4cfb63a07d7748d58dd869cdbb48f813534a8dea Author: Andrew Tridgell [EMAIL PROTECTED] Date: Mon Sep 29 12:04:57 2008 -0700 fixed an (unlikely) memory leak (cherry picked from commit 8b908862ec7de000865cd8dfa691f5643cb3d099) commit cf1786f82c819d3aeaf26e89dd4c8a627c291fa4 Author: Andrew Tridgell [EMAIL PROTECTED] Date: Mon Sep 29 11:27:31 2008 -0700 fixed a segfault on the ctdb destructor code (cherry picked from commit f495968c88f07b74a943da9e034084b72f5a1c8b) commit 7fb8734762812808905de737495fbe5e550dbe00 Author: Andrew Tridgell [EMAIL PROTECTED] Date: Mon Sep 29 11:24:48 2008 -0700 removed unused variables (cherry picked from commit c48fd3cee0a91617123d79bccff7ec1f6008fb26) commit bea0a1ee8d931bb95d29acbb74593849167a38fd Author: Andrew Tridgell [EMAIL PROTECTED] Date: Mon Sep 29 11:18:21 2008 -0700 fixed segv on startup with trusted domains With some setups, idmap_tdb2_allocate_id can be called before the allocate backend is initialised, leading to a segv. This change ensures that the db is opened in all paths that use it (cherry picked from commit 8ec11590f471d2852e5ffd3d1d65da54bd2182ca) commit 4d2eda0d28380ec04234a75177423d31190a2ef6 Author: Jeremy Allison [EMAIL PROTECTED] Date: Mon Sep 29 10:56:54 2008 -0700 Ensure we null out fsp after a close in all paths. Jeremy. (cherry picked from commit 35a074c24b9b320bb23e82d3f44e17c5fadbcf62) commit 3d21d7fc44e528bb27350bb373755241cb46e57c Author: Jelmer Vernooij [EMAIL
[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0pre1-378-gb311ded
The branch, v3-3-stable has been updated via b311ded4ae326ed7d140d4e8a8a1c81994311e9f (commit) from 562dce5505f47c1f505c538b88107e3d9f9eae54 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable - Log - commit b311ded4ae326ed7d140d4e8a8a1c81994311e9f Author: Karolin Seeger [EMAIL PROTECTED] Date: Wed Oct 1 14:22:10 2008 +0200 WHATSNEW: Update changes since 3.3.0pre1 and release date. Karolin (cherry picked from commit eef33fe6383afb5870aef0eef132cd0ba88bac83) --- Summary of changes: WHATSNEW.txt | 16 +++- 1 files changed, 15 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 8a11744..e6b2855 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,6 +1,6 @@ = Release Notes for Samba 3.3.0pre2 - September 30, 2008 + October 2, 2008 = This is the second preview release of Samba 3.3.0. This is *not* @@ -186,6 +186,7 @@ o Jeremy Allison [EMAIL PROTECTED] * BUG 5783: Fix FindFirst where search pattern == mangled filename. * BUG 5790: Fix returning of STATUS_OBJECT_NAME_NOT_FOUND on set file disposition. +* BUG 5797: Fix moving of readonly files. * Fix crashes when looking up a non-existant uid. * Fix getting/setting of NT ACLs on a file. * Add st_birthtime and friends for accurate create times on *BSD @@ -196,6 +197,8 @@ o Jeremy Allison [EMAIL PROTECTED] mappings. * Write times code update. * Add experimental version of VFS module acl_xattr. +* Fix rename_open_files. +* Make SMB traffic analyzer VFS module more efficient. o Gerald W. Carter [EMAIL PROTECTED] @@ -205,6 +208,7 @@ o Gerald W. Carter [EMAIL PROTECTED] * Allow an admin to define the uid attribute for a RFC2307 user object in AD to be the username alias. * Add new idmap backend adex to support RFC2307 enabled AD forests. +* Add new idmap backend hash. o Steven Danneman [EMAIL PROTECTED] @@ -217,6 +221,8 @@ o Günther Deschner [EMAIL PROTECTED] * BUG 5784: Fix pam_winbind build issue on Solaris. * Fix invalid sid copy (hit when enumerating sibling domains) in Winbind. * Fix double installation of cifs.upcall. +* Add change-user-password command to wbinfo. +* Fix segfault in _srvsvc_NetShareAdd. o James Ding [EMAIL PROTECTED] @@ -271,6 +277,14 @@ o Andrew Tridgell [EMAIL PROTECTED] * Fix an errno handling bug that could lead to an infinite loop. * Fix logic of tsmsm_sendfile(). * Fix handling of arbitrary new PAC types. +* Fix segfault on startup with trusted domains. +* Fix segfault on the CTDB destructor code. +* Fix memory leak. +* Re-add winbind:ignore domains. + + +o Jelmer Vernooij [EMAIL PROTECTED] +* Fix segfault (Debian bug #431696). o Qiao Yang [EMAIL PROTECTED] -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4202-geef33fe
The branch, v3-3-test has been updated via eef33fe6383afb5870aef0eef132cd0ba88bac83 (commit) from bec55237c9c5687d947562524124b7aa76209b8f (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit eef33fe6383afb5870aef0eef132cd0ba88bac83 Author: Karolin Seeger [EMAIL PROTECTED] Date: Wed Oct 1 14:22:10 2008 +0200 WHATSNEW: Update changes since 3.3.0pre1 and release date. Karolin --- Summary of changes: WHATSNEW.txt | 16 +++- 1 files changed, 15 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 8a11744..e6b2855 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,6 +1,6 @@ = Release Notes for Samba 3.3.0pre2 - September 30, 2008 + October 2, 2008 = This is the second preview release of Samba 3.3.0. This is *not* @@ -186,6 +186,7 @@ o Jeremy Allison [EMAIL PROTECTED] * BUG 5783: Fix FindFirst where search pattern == mangled filename. * BUG 5790: Fix returning of STATUS_OBJECT_NAME_NOT_FOUND on set file disposition. +* BUG 5797: Fix moving of readonly files. * Fix crashes when looking up a non-existant uid. * Fix getting/setting of NT ACLs on a file. * Add st_birthtime and friends for accurate create times on *BSD @@ -196,6 +197,8 @@ o Jeremy Allison [EMAIL PROTECTED] mappings. * Write times code update. * Add experimental version of VFS module acl_xattr. +* Fix rename_open_files. +* Make SMB traffic analyzer VFS module more efficient. o Gerald W. Carter [EMAIL PROTECTED] @@ -205,6 +208,7 @@ o Gerald W. Carter [EMAIL PROTECTED] * Allow an admin to define the uid attribute for a RFC2307 user object in AD to be the username alias. * Add new idmap backend adex to support RFC2307 enabled AD forests. +* Add new idmap backend hash. o Steven Danneman [EMAIL PROTECTED] @@ -217,6 +221,8 @@ o Günther Deschner [EMAIL PROTECTED] * BUG 5784: Fix pam_winbind build issue on Solaris. * Fix invalid sid copy (hit when enumerating sibling domains) in Winbind. * Fix double installation of cifs.upcall. +* Add change-user-password command to wbinfo. +* Fix segfault in _srvsvc_NetShareAdd. o James Ding [EMAIL PROTECTED] @@ -271,6 +277,14 @@ o Andrew Tridgell [EMAIL PROTECTED] * Fix an errno handling bug that could lead to an infinite loop. * Fix logic of tsmsm_sendfile(). * Fix handling of arbitrary new PAC types. +* Fix segfault on startup with trusted domains. +* Fix segfault on the CTDB destructor code. +* Fix memory leak. +* Re-add winbind:ignore domains. + + +o Jelmer Vernooij [EMAIL PROTECTED] +* Fix segfault (Debian bug #431696). o Qiao Yang [EMAIL PROTECTED] -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - bdd80734c977336b09f64cd55d76815de49a5fee
The branch, master has been updated
via bdd80734c977336b09f64cd55d76815de49a5fee (commit)
via 90d1481cf6b100988f9a6157674d03ed677f280f (commit)
via d56a81f60a820e6a4a3f2617c4fdd4f88e7853cd (commit)
from c164ff2be5f9af7cc83e43d8c54b54186444fac0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit bdd80734c977336b09f64cd55d76815de49a5fee
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Oct 1 17:29:16 2008 +0200
Fix header.
commit 90d1481cf6b100988f9a6157674d03ed677f280f
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Oct 1 17:28:12 2008 +0200
Fix formatting to be compatible with ReST.
commit d56a81f60a820e6a4a3f2617c4fdd4f88e7853cd
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Oct 1 17:27:42 2008 +0200
Update to refer to 3 and 4, not just Samba 3.
---
Summary of changes:
README.Coding | 65 +++
prog_guide4.txt | 31 ++---
2 files changed, 49 insertions(+), 47 deletions(-)
Changeset truncated at 500 lines:
diff --git a/README.Coding b/README.Coding
index 8063ae8..c1b6641 100644
--- a/README.Coding
+++ b/README.Coding
@@ -1,6 +1,7 @@
-##
-## Coding conventions in the Samba 3 tree
-##
+Coding conventions in the Samba tree
+
+
+.. contents::
===
Quick Start
@@ -14,15 +15,13 @@ style should never outweigh coding itself and so the the
guidelines
described here are hopefully easy enough to follow as they are very
common and supported by tools and editors.
-The basic style, also mentioned in the SAMBA_4_0/prog_guide.txt is the
-Linux kernel coding style (See Documentation/CodingStyle in the kernel
-source tree). The closely matches what most Samba developers use already
-anyways.
+The basic style, also mentioned in prog_guide4.txt, is the Linux kernel coding
+style (See Documentation/CodingStyle in the kernel source tree). This closely
+matches what most Samba developers use already anyways.
But to save you the trouble of reading the Linux kernel style guide, here
are the highlights.
-
* Maximum Line Width is 80 Characters
The reason is not for people with low-res screens but rather sticking
to 80 columns prevents you from easily nesting more than one level of
@@ -59,14 +58,14 @@ Vi
--
(Thanks to SATOH Fumiyasu [EMAIL PROTECTED] for these hints):
-For the basic vi editor including with all variants of *nix, add the
+For the basic vi editor including with all variants of \*nix, add the
following to $HOME/.exrc:
set tabstop=8
set shiftwidth=8
For Vim, the following settings in $HOME/.vimrc will also deal with
-displaying trailing whitespace:
+displaying trailing whitespace::
if has(syntax) (t_Co 2 || has(gui_running))
syntax on
@@ -91,7 +90,7 @@ FAQ Statement Reference
Comments
-Comments should always use the standard C syntax. I.e. /* ... */. C++
+Comments should always use the standard C syntax. C++
style comments are not currently allowed.
@@ -145,7 +144,7 @@ The exception to the ending rule is when the closing brace
is followed by
another language keyword such as else or the closing while in a do..while
loop.
-Good examples:
+Good examples::
if (x == 1) {
printf(good\n);
@@ -162,7 +161,7 @@ Good examples:
printf(also good\n);
} while (1);
-Bad examples:
+Bad examples::
while (1)
{
@@ -177,29 +176,29 @@ evil, they can greatly enhance readability and reduce
memory leaks when used
as the single exit point from a function. But in no Samba world what so ever
is a goto outside of a function or block of code a good idea.
-Good Examples:
-
-int function foo(int y)
-{
- int *z = NULL;
- int ret = 0;
+Good Examples::
- if ( y 10 ) {
- z = malloc(sizeof(int)*y);
- if (!z) {
- ret = 1;
- goto done;
+ int function foo(int y)
+ {
+ int *z = NULL;
+ int ret = 0;
+
+ if ( y 10 ) {
+ z = malloc(sizeof(int)*y);
+ if (!z) {
+ ret = 1;
+ goto done;
+ }
}
- }
- print(Allocated %d elements.\n, y);
+ print(Allocated %d elements.\n, y);
- done:
- if (z)
- free(z);
+done:
+ if (z)
+ free(z);
- return ret;
-}
+ return ret;
+ }
Checking Pointer Values
@@ -207,13 +206,13 @@ Checking Pointer Values
When invoking functions that return pointer values, either of the following
are acceptable. Use you best judgement
[SCM] Samba Shared Repository - branch master updated - ca44340891d60de7e48bb263c7debd45cc3f3ed0
The branch, master has been updated via ca44340891d60de7e48bb263c7debd45cc3f3ed0 (commit) from bdd80734c977336b09f64cd55d76815de49a5fee (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ca44340891d60de7e48bb263c7debd45cc3f3ed0 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Oct 1 18:06:55 2008 +0200 Fix some syntax errors for use with ReST. --- Summary of changes: lib/talloc/talloc_guide.txt | 43 ++- 1 files changed, 26 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/talloc/talloc_guide.txt b/lib/talloc/talloc_guide.txt index 18663b3..3201fe6 100644 --- a/lib/talloc/talloc_guide.txt +++ b/lib/talloc/talloc_guide.txt @@ -1,5 +1,7 @@ Using talloc in Samba4 --- +== + +.. contents:: Andrew Tridgell September 2004 @@ -18,7 +20,7 @@ get used to it. Perhaps the biggest change from Samba3 is that there is no distinction between a talloc context and a talloc pointer. Any pointer returned from talloc() is itself a valid talloc context. This means -you can do this: +you can do this:: struct foo *X = talloc(mem_ctx, struct foo); X-name = talloc_strdup(X, foo); @@ -271,7 +273,7 @@ equivalent to: =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- void *talloc_named_const(const void *context, size_t size, const char *name); -This is equivalent to: +This is equivalent to:: ptr = talloc_size(context, size); talloc_set_name_const(ptr, name); @@ -288,7 +290,7 @@ talloc_set_name() for details. void *talloc_init(const char *fmt, ...); This function creates a zero length named talloc context as a top -level context. It is equivalent to: +level context. It is equivalent to:: talloc_named(NULL, 0, fmt, ...); @@ -309,7 +311,7 @@ The talloc_realloc() macro changes the size of a talloc pointer. The count argument is the number of elements of type type that you want the resulting pointer to hold. -talloc_realloc() has the following equivalences: +talloc_realloc() has the following equivalences:: talloc_realloc(context, NULL, type, 1) == talloc(context, type); talloc_realloc(context, NULL, type, N) == talloc_array(context, type, N); @@ -490,7 +492,7 @@ This disables tracking of the NULL memory context. =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- (type *)talloc_zero(const void *ctx, type); -The talloc_zero() macro is equivalent to: +The talloc_zero() macro is equivalent to:: ptr = talloc(ctx, type); if (ptr) memset(ptr, 0, sizeof(type)); @@ -505,7 +507,7 @@ The talloc_zero_size() function is useful when you don't have a known type =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- void *talloc_memdup(const void *ctx, const void *p, size_t size); -The talloc_memdup() function is equivalent to: +The talloc_memdup() function is equivalent to:: ptr = talloc_size(ctx, size); if (ptr) memcpy(ptr, p, size); @@ -514,13 +516,14 @@ The talloc_memdup() function is equivalent to: =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- char *talloc_strdup(const void *ctx, const char *p); -The talloc_strdup() function is equivalent to: +The talloc_strdup() function is equivalent to:: ptr = talloc_size(ctx, strlen(p)+1); if (ptr) memcpy(ptr, p, strlen(p)+1); This functions sets the name of the new pointer to the passed -string. This is equivalent to: +string. This is equivalent to:: + talloc_set_name_const(ptr, ptr) =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -540,7 +543,8 @@ The talloc_append_string() function appends the given formatted string to the given string. This function sets the name of the new pointer to the new -string. This is equivalent to: +string. This is equivalent to:: + talloc_set_name_const(ptr, ptr) =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -550,7 +554,8 @@ The talloc_vasprintf() function is the talloc equivalent of the C library function vasprintf() This functions sets the name of the new pointer to the new -string. This is equivalent to: +string. This is equivalent to:: + talloc_set_name_const(ptr, ptr) @@ -561,7 +566,8 @@ The talloc_asprintf() function is the talloc equivalent of the C library function asprintf() This functions sets the name of the new pointer to the new -string. This is equivalent to: +string. This is equivalent to:: + talloc_set_name_const(ptr, ptr) @@ -574,7 +580,8 @@ Use this varient when the string in the current talloc buffer may have been truncated in length. This functions sets the name of the new pointer to the new -string. This is equivalent to: +string. This is equivalent to:: +
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4203-g9a90cea
The branch, v3-3-test has been updated
via 9a90ceac52f8623dde2bf50e630b10aebbc0e28d (commit)
from eef33fe6383afb5870aef0eef132cd0ba88bac83 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 9a90ceac52f8623dde2bf50e630b10aebbc0e28d
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Oct 1 12:28:45 2008 -0700
Turn the socket connections into a refcounted list - in the common case
there'll now only be one socket per smbd.
Changed the format of the wire data to (a) include a version number (V1) as
the first element. (b) removed the
;) at the end an replaced it with a \n. Receiver can change back if
needed, and now receiver can just log
as-is to a text file (making testing easier). Added my (C). Sorry Holger,
but I've changed quite a bit now.
Jeremy.
---
Summary of changes:
source/modules/vfs_smb_traffic_analyzer.c | 139 -
1 files changed, 95 insertions(+), 44 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/modules/vfs_smb_traffic_analyzer.c
b/source/modules/vfs_smb_traffic_analyzer.c
index 3925424..ff61768 100644
--- a/source/modules/vfs_smb_traffic_analyzer.c
+++ b/source/modules/vfs_smb_traffic_analyzer.c
@@ -3,6 +3,7 @@
* on the net.
*
* Copyright (C) Holger Hetterich, 2008
+ * Copyright (C) Jeremy Allison, 2008
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,12 +22,14 @@
#include includes.h
/* abstraction for the send_over_network function */
-#define UNIX_DOMAIN_SOCKET 1
-#define INTERNET_SOCKET 0
+
+enum sock_type {INTERNET_SOCKET = 0, UNIX_DOMAIN_SOCKET};
+
+#define LOCAL_PATHNAME /var/tmp/stadsocket
static int vfs_smb_traffic_analyzer_debug_level = DBGC_VFS;
-static int smb_traffic_analyzer_connMode(vfs_handle_struct *handle)
+static enum sock_type smb_traffic_analyzer_connMode(vfs_handle_struct *handle)
{
connection_struct *conn = handle-conn;
const char *Mode;
@@ -41,28 +44,22 @@ static int smb_traffic_analyzer_connMode(vfs_handle_struct
*handle)
/* Connect to an internet socket */
-static int smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle)
+static int smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle,
+ const char *name, uint16_t port)
{
/* Create a streaming Socket */
- const char *Hostname;
int sockfd = -1;
-uint16_t port;
struct addrinfo hints;
struct addrinfo *ailist = NULL;
struct addrinfo *res = NULL;
- connection_struct *conn = handle-conn;
int ret;
- /* get port number, target system from the config parameters */
- Hostname=lp_parm_const_string(SNUM(conn), smb_traffic_analyzer,
- host, localhost);
-
ZERO_STRUCT(hints);
/* By default make sure it supports TCP. */
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_ADDRCONFIG;
- ret = getaddrinfo(Hostname,
+ ret = getaddrinfo(name,
NULL,
hints,
ailist);
@@ -70,16 +67,13 @@ static int
smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle)
if (ret) {
DEBUG(3,(smb_traffic_analyzer_connect_inet_socket:
getaddrinfo failed for name %s [%s]\n,
-Hostname,
+name,
gai_strerror(ret) ));
return -1;
}
- port = atoi( lp_parm_const_string(SNUM(conn),
- smb_traffic_analyzer, port, 9430));
-
DEBUG(3,(smb_traffic_analyzer: Internet socket mode. Hostname: %s,
- Port: %i\n, Hostname, port));
+ Port: %i\n, name, port));
for (res = ailist; res; res = res-ai_next) {
struct sockaddr_storage ss;
@@ -113,15 +107,16 @@ static int
smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle)
/* Connect to a unix domain socket */
-static int smb_traffic_analyzer_connect_unix_socket(vfs_handle_struct *handle)
+static int smb_traffic_analyzer_connect_unix_socket(vfs_handle_struct *handle,
+ const char *name)
{
/* Create the socket to stad */
int len, sock;
struct sockaddr_un remote;
DEBUG(7, (smb_traffic_analyzer_connect_unix_socket:
- Unix domain socket mode. Using
- /var/tmp/stadsocket\n));
+ Unix domain socket mode. Using %s\n,
+ name ));
if ((sock = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
DEBUG(1,
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3061-g7ea95c1
The branch, v3-2-test has been updated
via 7ea95c19305a2fb6efc95acc4e96f083e31f6c6f (commit)
from dc1ff1a9c07edf7e3e649b256667704ad59aafbd (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 7ea95c19305a2fb6efc95acc4e96f083e31f6c6f
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Oct 1 12:30:12 2008 -0700
Turn the socket connections into a refcounted list - in the common case
there'll now only be one socket per smbd.
Changed the format of the wire data to (a) include a version number (V1) as
the first element. (b) removed the
;) at the end an replaced it with a \n. Receiver can change back if
needed, and now receiver can just log
as-is to a text file (making testing easier). Added my (C). Sorry Holger,
but I've changed quite a bit now.
Jeremy.
---
Summary of changes:
source/modules/vfs_smb_traffic_analyzer.c | 138 -
1 files changed, 94 insertions(+), 44 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/modules/vfs_smb_traffic_analyzer.c
b/source/modules/vfs_smb_traffic_analyzer.c
index 6be58cd..714df02 100644
--- a/source/modules/vfs_smb_traffic_analyzer.c
+++ b/source/modules/vfs_smb_traffic_analyzer.c
@@ -3,6 +3,7 @@
* on the net.
*
* Copyright (C) Holger Hetterich, 2008
+ * Copyright (C) Jeremy Allison, 2008
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,14 +22,15 @@
#include includes.h
/* abstraction for the send_over_network function */
-#define UNIX_DOMAIN_SOCKET 1
-#define INTERNET_SOCKET 0
+enum sock_type {INTERNET_SOCKET = 0, UNIX_DOMAIN_SOCKET};
+
+#define LOCAL_PATHNAME /var/tmp/stadsocket
extern userdom_struct current_user_info;
static int vfs_smb_traffic_analyzer_debug_level = DBGC_VFS;
-static int smb_traffic_analyzer_connMode(vfs_handle_struct *handle)
+static enum sock_type smb_traffic_analyzer_connMode(vfs_handle_struct *handle)
{
connection_struct *conn = handle-conn;
const char *Mode;
@@ -43,28 +45,22 @@ static int smb_traffic_analyzer_connMode(vfs_handle_struct
*handle)
/* Connect to an internet socket */
-static int smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle)
+static int smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle,
+ const char *name, uint16_t port)
{
/* Create a streaming Socket */
- const char *Hostname;
int sockfd = -1;
-uint16_t port;
struct addrinfo hints;
struct addrinfo *ailist = NULL;
struct addrinfo *res = NULL;
- connection_struct *conn = handle-conn;
int ret;
- /* get port number, target system from the config parameters */
- Hostname=lp_parm_const_string(SNUM(conn), smb_traffic_analyzer,
- host, localhost);
-
ZERO_STRUCT(hints);
/* By default make sure it supports TCP. */
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_ADDRCONFIG;
- ret = getaddrinfo(Hostname,
+ ret = getaddrinfo(name,
NULL,
hints,
ailist);
@@ -72,16 +68,13 @@ static int
smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle)
if (ret) {
DEBUG(3,(smb_traffic_analyzer_connect_inet_socket:
getaddrinfo failed for name %s [%s]\n,
-Hostname,
+name,
gai_strerror(ret) ));
return -1;
}
- port = atoi( lp_parm_const_string(SNUM(conn),
- smb_traffic_analyzer, port, 9430));
-
DEBUG(3,(smb_traffic_analyzer: Internet socket mode. Hostname: %s,
- Port: %i\n, Hostname, port));
+ Port: %i\n, name, port));
for (res = ailist; res; res = res-ai_next) {
struct sockaddr_storage ss;
@@ -115,15 +108,16 @@ static int
smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle)
/* Connect to a unix domain socket */
-static int smb_traffic_analyzer_connect_unix_socket(vfs_handle_struct *handle)
+static int smb_traffic_analyzer_connect_unix_socket(vfs_handle_struct *handle,
+ const char *name)
{
/* Create the socket to stad */
int len, sock;
struct sockaddr_un remote;
DEBUG(7, (smb_traffic_analyzer_connect_unix_socket:
- Unix domain socket mode. Using
- /var/tmp/stadsocket\n));
+ Unix domain socket mode. Using %s\n,
+ name ));
if ((sock = socket(AF_UNIX,
[SCM] Samba Shared Repository - branch master updated - 370cbe0060cb2670c7f65100954dac6c63030ca0
The branch, master has been updated
via 370cbe0060cb2670c7f65100954dac6c63030ca0 (commit)
from ca44340891d60de7e48bb263c7debd45cc3f3ed0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 370cbe0060cb2670c7f65100954dac6c63030ca0
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Oct 1 12:50:29 2008 -0700
Turn the socket connections into a refcounted list - in the common case
there'll now only be one socket per smbd.
Changed the format of the wire data to (a) include a version number (V1) as
the first element. (b) removed the
;) at the end an replaced it with a \n. Receiver can change back if
needed, and now receiver can just log
as-is to a text file (making testing easier). Added my (C). Sorry Holger,
but I've changed quite a bit now.
Jeremy.
---
Summary of changes:
source3/modules/vfs_smb_traffic_analyzer.c | 139 +++-
1 files changed, 95 insertions(+), 44 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c
b/source3/modules/vfs_smb_traffic_analyzer.c
index 3925424..ff61768 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -3,6 +3,7 @@
* on the net.
*
* Copyright (C) Holger Hetterich, 2008
+ * Copyright (C) Jeremy Allison, 2008
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,12 +22,14 @@
#include includes.h
/* abstraction for the send_over_network function */
-#define UNIX_DOMAIN_SOCKET 1
-#define INTERNET_SOCKET 0
+
+enum sock_type {INTERNET_SOCKET = 0, UNIX_DOMAIN_SOCKET};
+
+#define LOCAL_PATHNAME /var/tmp/stadsocket
static int vfs_smb_traffic_analyzer_debug_level = DBGC_VFS;
-static int smb_traffic_analyzer_connMode(vfs_handle_struct *handle)
+static enum sock_type smb_traffic_analyzer_connMode(vfs_handle_struct *handle)
{
connection_struct *conn = handle-conn;
const char *Mode;
@@ -41,28 +44,22 @@ static int smb_traffic_analyzer_connMode(vfs_handle_struct
*handle)
/* Connect to an internet socket */
-static int smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle)
+static int smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle,
+ const char *name, uint16_t port)
{
/* Create a streaming Socket */
- const char *Hostname;
int sockfd = -1;
-uint16_t port;
struct addrinfo hints;
struct addrinfo *ailist = NULL;
struct addrinfo *res = NULL;
- connection_struct *conn = handle-conn;
int ret;
- /* get port number, target system from the config parameters */
- Hostname=lp_parm_const_string(SNUM(conn), smb_traffic_analyzer,
- host, localhost);
-
ZERO_STRUCT(hints);
/* By default make sure it supports TCP. */
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_ADDRCONFIG;
- ret = getaddrinfo(Hostname,
+ ret = getaddrinfo(name,
NULL,
hints,
ailist);
@@ -70,16 +67,13 @@ static int
smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle)
if (ret) {
DEBUG(3,(smb_traffic_analyzer_connect_inet_socket:
getaddrinfo failed for name %s [%s]\n,
-Hostname,
+name,
gai_strerror(ret) ));
return -1;
}
- port = atoi( lp_parm_const_string(SNUM(conn),
- smb_traffic_analyzer, port, 9430));
-
DEBUG(3,(smb_traffic_analyzer: Internet socket mode. Hostname: %s,
- Port: %i\n, Hostname, port));
+ Port: %i\n, name, port));
for (res = ailist; res; res = res-ai_next) {
struct sockaddr_storage ss;
@@ -113,15 +107,16 @@ static int
smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle)
/* Connect to a unix domain socket */
-static int smb_traffic_analyzer_connect_unix_socket(vfs_handle_struct *handle)
+static int smb_traffic_analyzer_connect_unix_socket(vfs_handle_struct *handle,
+ const char *name)
{
/* Create the socket to stad */
int len, sock;
struct sockaddr_un remote;
DEBUG(7, (smb_traffic_analyzer_connect_unix_socket:
- Unix domain socket mode. Using
- /var/tmp/stadsocket\n));
+ Unix domain socket mode. Using %s\n,
+ name ));
if ((sock = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
DEBUG(1,
[SCM] Samba Shared Repository - branch master updated - e4f5bfb34b7a515e2cf107eb94489260594b8733
The branch, master has been updated
via e4f5bfb34b7a515e2cf107eb94489260594b8733 (commit)
from 370cbe0060cb2670c7f65100954dac6c63030ca0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e4f5bfb34b7a515e2cf107eb94489260594b8733
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Oct 1 13:15:54 2008 -0700
Fix use of DLIST_REMOVE as spotted by Constantine Vetoshev [EMAIL
PROTECTED].
This API is unusual in that if used to remove a non-list head it nulls out
the next and prev pointers. This is what you want for debugging (don't want
an entry removed from the list to be still virtually linked into it) but
means there is no consistent idiom for use as the next and prev pointers
get trashed on removal from the list, meaning you must save them yourself.
You can use it one way when deleting everything via the head pointer, as
this preserves the next pointer, but you *must* use it another way when not
deleting everything via the head pointer. Fix all known uses of this (the
main
one is in conn_free_internal() and would not free all the private data
entries
for vfs modules. The other changes in web/statuspage.c and winbindd_util.c
are not strictly neccessary, as the head pointer is being used, but I've
done
them for consistency. Long term we must revisit this as this API is too hard
to use correctly.
Jeremy.
---
Summary of changes:
source3/smbd/conn.c |2 +-
source3/web/statuspage.c |5 +++--
source3/winbindd/winbindd_util.c |3 +--
3 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index b9433bb..7f34d2b 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -252,8 +252,8 @@ void conn_free_internal(connection_struct *conn)
/* Free vfs_connection_struct */
handle = conn-vfs_handles;
while(handle) {
- DLIST_REMOVE(conn-vfs_handles, handle);
thandle = handle-next;
+ DLIST_REMOVE(conn-vfs_handles, handle);
if (handle-free_data)
handle-free_data(handle-data);
handle = thandle;
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index ce24c7c..e684a07 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -43,9 +43,10 @@ static void initPid2Machine (void)
{
/* show machine name rather PID on table Open Files? */
if (PID_or_Machine) {
- PIDMAP *p;
+ PIDMAP *p, *next;
- for (p = pidmap; p != NULL; ) {
+ for (p = pidmap; p != NULL; p = next) {
+ next = p-next;
DLIST_REMOVE(pidmap, p);
SAFE_FREE(p-machine);
SAFE_FREE(p);
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index b8cb27c..fdfc8ed 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -1075,13 +1075,12 @@ void free_getent_state(struct getent_state *state)
temp = state;
while(temp != NULL) {
- struct getent_state *next;
+ struct getent_state *next = temp-next;
/* Free sam entries then list entry */
SAFE_FREE(state-sam_entries);
DLIST_REMOVE(state, state);
- next = temp-next;
SAFE_FREE(temp);
temp = next;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3062-g347fc4e
The branch, v3-2-test has been updated
via 347fc4ed725083f2c520afc39f7c81db0dd60324 (commit)
from 7ea95c19305a2fb6efc95acc4e96f083e31f6c6f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 347fc4ed725083f2c520afc39f7c81db0dd60324
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Oct 1 13:22:02 2008 -0700
Fix use of DLIST_REMOVE as spotted by Constantine Vetoshev [EMAIL
PROTECTED].
This API is unusual in that if used to remove a non-list head it nulls out
the next and prev pointers. This is what you want for debugging (don't want
an entry removed from the list to be still virtually linked into it) but
means there is no consistent idiom for use as the next and prev pointers
get trashed on removal from the list, meaning you must save them yourself.
You can use it one way when deleting everything via the head pointer, as
this preserves the next pointer, but you *must* use it another way when not
deleting everything via the head pointer. Fix all known uses of this (the
main
one is in conn_free_internal() and would not free all the private data
entries
for vfs modules. The other changes in web/statuspage.c and winbindd_util.c
are not strictly neccessary, as the head pointer is being used, but I've
done
them for consistency. Long term we must revisit this as this API is too hard
to use correctly.
Jeremy.
---
Summary of changes:
source/smbd/conn.c |2 +-
source/web/statuspage.c |5 +++--
source/winbindd/winbindd_util.c |3 +--
3 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/conn.c b/source/smbd/conn.c
index c5a2df4..cfcec51 100644
--- a/source/smbd/conn.c
+++ b/source/smbd/conn.c
@@ -267,8 +267,8 @@ void conn_free_internal(connection_struct *conn)
/* Free vfs_connection_struct */
handle = conn-vfs_handles;
while(handle) {
- DLIST_REMOVE(conn-vfs_handles, handle);
thandle = handle-next;
+ DLIST_REMOVE(conn-vfs_handles, handle);
if (handle-free_data)
handle-free_data(handle-data);
handle = thandle;
diff --git a/source/web/statuspage.c b/source/web/statuspage.c
index eda53b6..5d9a239 100644
--- a/source/web/statuspage.c
+++ b/source/web/statuspage.c
@@ -43,9 +43,10 @@ static void initPid2Machine (void)
{
/* show machine name rather PID on table Open Files? */
if (PID_or_Machine) {
- PIDMAP *p;
+ PIDMAP *p, *next;
- for (p = pidmap; p != NULL; ) {
+ for (p = pidmap; p != NULL; p = next) {
+ next = p-next;
DLIST_REMOVE(pidmap, p);
SAFE_FREE(p-machine);
SAFE_FREE(p);
diff --git a/source/winbindd/winbindd_util.c b/source/winbindd/winbindd_util.c
index 3425b4c..cf7663d 100644
--- a/source/winbindd/winbindd_util.c
+++ b/source/winbindd/winbindd_util.c
@@ -1042,13 +1042,12 @@ void free_getent_state(struct getent_state *state)
temp = state;
while(temp != NULL) {
- struct getent_state *next;
+ struct getent_state *next = temp-next;
/* Free sam entries then list entry */
SAFE_FREE(state-sam_entries);
DLIST_REMOVE(state, state);
- next = temp-next;
SAFE_FREE(temp);
temp = next;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4204-g7378251
The branch, v3-3-test has been updated
via 737825183115732de1f1d6d2bd89ce6402a65b20 (commit)
from 9a90ceac52f8623dde2bf50e630b10aebbc0e28d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 737825183115732de1f1d6d2bd89ce6402a65b20
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Oct 1 13:23:09 2008 -0700
Fix use of DLIST_REMOVE as spotted by Constantine Vetoshev [EMAIL
PROTECTED].
This API is unusual in that if used to remove a non-list head it nulls out
the next and prev pointers. This is what you want for debugging (don't want
an entry removed from the list to be still virtually linked into it) but
means there is no consistent idiom for use as the next and prev pointers
get trashed on removal from the list, meaning you must save them yourself.
You can use it one way when deleting everything via the head pointer, as
this preserves the next pointer, but you *must* use it another way when not
deleting everything via the head pointer. Fix all known uses of this (the
main
one is in conn_free_internal() and would not free all the private data
entries
for vfs modules. The other changes in web/statuspage.c and winbindd_util.c
are not strictly neccessary, as the head pointer is being used, but I've
done
them for consistency. Long term we must revisit this as this API is too hard
to use correctly.
Jeremy.
---
Summary of changes:
source/smbd/conn.c |2 +-
source/web/statuspage.c |5 +++--
source/winbindd/winbindd_util.c |3 +--
3 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/conn.c b/source/smbd/conn.c
index b9433bb..7f34d2b 100644
--- a/source/smbd/conn.c
+++ b/source/smbd/conn.c
@@ -252,8 +252,8 @@ void conn_free_internal(connection_struct *conn)
/* Free vfs_connection_struct */
handle = conn-vfs_handles;
while(handle) {
- DLIST_REMOVE(conn-vfs_handles, handle);
thandle = handle-next;
+ DLIST_REMOVE(conn-vfs_handles, handle);
if (handle-free_data)
handle-free_data(handle-data);
handle = thandle;
diff --git a/source/web/statuspage.c b/source/web/statuspage.c
index ce24c7c..e684a07 100644
--- a/source/web/statuspage.c
+++ b/source/web/statuspage.c
@@ -43,9 +43,10 @@ static void initPid2Machine (void)
{
/* show machine name rather PID on table Open Files? */
if (PID_or_Machine) {
- PIDMAP *p;
+ PIDMAP *p, *next;
- for (p = pidmap; p != NULL; ) {
+ for (p = pidmap; p != NULL; p = next) {
+ next = p-next;
DLIST_REMOVE(pidmap, p);
SAFE_FREE(p-machine);
SAFE_FREE(p);
diff --git a/source/winbindd/winbindd_util.c b/source/winbindd/winbindd_util.c
index 7847d1d..ebcf625 100644
--- a/source/winbindd/winbindd_util.c
+++ b/source/winbindd/winbindd_util.c
@@ -1075,13 +1075,12 @@ void free_getent_state(struct getent_state *state)
temp = state;
while(temp != NULL) {
- struct getent_state *next;
+ struct getent_state *next = temp-next;
/* Free sam entries then list entry */
SAFE_FREE(state-sam_entries);
DLIST_REMOVE(state, state);
- next = temp-next;
SAFE_FREE(temp);
temp = next;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-43-g45514fc
The branch, v3-0-test has been updated
via 45514fc5d85221339a4ee55b9f9f78c917b2fd19 (commit)
from ffa704347a9cf10de20105e3dd07963f975cbd77 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit 45514fc5d85221339a4ee55b9f9f78c917b2fd19
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Oct 1 13:23:36 2008 -0700
Fix use of DLIST_REMOVE as spotted by Constantine Vetoshev [EMAIL
PROTECTED].
This API is unusual in that if used to remove a non-list head it nulls out
the next and prev pointers. This is what you want for debugging (don't want
an entry removed from the list to be still virtually linked into it) but
means there is no consistent idiom for use as the next and prev pointers
get trashed on removal from the list, meaning you must save them yourself.
You can use it one way when deleting everything via the head pointer, as
this preserves the next pointer, but you *must* use it another way when not
deleting everything via the head pointer. Fix all known uses of this (the
main
one is in conn_free_internal() and would not free all the private data
entries
for vfs modules. The other changes in web/statuspage.c and winbindd_util.c
are not strictly neccessary, as the head pointer is being used, but I've
done
them for consistency. Long term we must revisit this as this API is too hard
to use correctly.
Jeremy.
---
Summary of changes:
source/nsswitch/winbindd_util.c |3 +--
source/smbd/conn.c |2 +-
source/web/statuspage.c |5 +++--
3 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/winbindd_util.c b/source/nsswitch/winbindd_util.c
index 130d45c..e72cd7c 100644
--- a/source/nsswitch/winbindd_util.c
+++ b/source/nsswitch/winbindd_util.c
@@ -771,13 +771,12 @@ void free_getent_state(struct getent_state *state)
temp = state;
while(temp != NULL) {
- struct getent_state *next;
+ struct getent_state *next = temp-next;
/* Free sam entries then list entry */
SAFE_FREE(state-sam_entries);
DLIST_REMOVE(state, state);
- next = temp-next;
SAFE_FREE(temp);
temp = next;
diff --git a/source/smbd/conn.c b/source/smbd/conn.c
index 610e641..4a78b5a 100644
--- a/source/smbd/conn.c
+++ b/source/smbd/conn.c
@@ -261,8 +261,8 @@ void conn_free_internal(connection_struct *conn)
/* Free vfs_connection_struct */
handle = conn-vfs_handles;
while(handle) {
- DLIST_REMOVE(conn-vfs_handles, handle);
thandle = handle-next;
+ DLIST_REMOVE(conn-vfs_handles, handle);
if (handle-free_data)
handle-free_data(handle-data);
handle = thandle;
diff --git a/source/web/statuspage.c b/source/web/statuspage.c
index e4d726c..7b21a63 100644
--- a/source/web/statuspage.c
+++ b/source/web/statuspage.c
@@ -42,9 +42,10 @@ static void initPid2Machine (void)
{
/* show machine name rather PID on table Open Files? */
if (PID_or_Machine) {
- PIDMAP *p;
+ PIDMAP *p, *next;
- for (p = pidmap; p != NULL; ) {
+ for (p = pidmap; p != NULL; p = next) {
+ next = p-next;
DLIST_REMOVE(pidmap, p);
SAFE_FREE(p-machine);
SAFE_FREE(p);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4205-ge782150
The branch, v3-3-test has been updated
via e782150175ff324b6e0ef1802a9e17f9a5aea560 (commit)
from 737825183115732de1f1d6d2bd89ce6402a65b20 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit e782150175ff324b6e0ef1802a9e17f9a5aea560
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Oct 1 15:00:22 2008 -0700
Whitespace cleanup.
Jeremy.
---
Summary of changes:
source/printing/print_cups.c | 32
1 files changed, 16 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/printing/print_cups.c b/source/printing/print_cups.c
index f9568f0..97584cb 100644
--- a/source/printing/print_cups.c
+++ b/source/printing/print_cups.c
@@ -7,12 +7,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, see http://www.gnu.org/licenses/.
*/
@@ -109,7 +109,7 @@ bool cups_cache_reload(void)
{
printer-name,
printer-info
- };
+ };
bool ret = False;
DEBUG(5, (reloading cups printcap cache\n));
@@ -657,8 +657,8 @@ static int cups_job_submit(int snum, struct printjob *pjob)
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, job-name, NULL,
new_jobname);
- /*
-* add any options defined in smb.conf
+ /*
+* add any options defined in smb.conf
*/
num_options = 0;
@@ -666,7 +666,7 @@ static int cups_job_submit(int snum, struct printjob *pjob)
num_options = cupsParseOptions(lp_cups_options(snum), num_options,
options);
if ( num_options )
- cupsEncodeOptions(request, num_options, options);
+ cupsEncodeOptions(request, num_options, options);
/*
* Do the request and get back a response...
@@ -712,7 +712,7 @@ static int cups_job_submit(int snum, struct printjob *pjob)
static int cups_queue_get(const char *sharename,
enum printing_types printing_type,
char *lpq_command,
- print_queue_struct **q,
+ print_queue_struct **q,
print_status_struct *status)
{
fstring printername;
@@ -751,10 +751,10 @@ static int cups_queue_get(const char *sharename,
*q = NULL;
- /* HACK ALERT!!! The problem with support the 'printer name'
- option is that we key the tdb off the sharename. So we will
- overload the lpq_command string to pass in the printername
- (which is basically what we do for non-cups printers ... using
+ /* HACK ALERT!!! The problem with support the 'printer name'
+ option is that we key the tdb off the sharename. So we will
+ overload the lpq_command string to pass in the printername
+ (which is basically what we do for non-cups printers ... using
the lpq_command to get the queue listing). */
fstrcpy( printername, lpq_command );
@@ -1316,22 +1316,22 @@ bool cups_pull_comment_location(NT_PRINTER_INFO_LEVEL_2
*printer)
/* Grab the comment if we don't have one */
if ( (strcmp(attr-name, printer-info) == 0)
(attr-value_tag == IPP_TAG_TEXT)
- !strlen(printer-comment) )
+ !strlen(printer-comment) )
{
DEBUG(5,(cups_pull_comment_location: Using
cups comment: %s\n,
-attr-values[0].string.text));
+attr-values[0].string.text));
strlcpy(printer-comment,
attr-values[0].string.text,
sizeof(printer-comment));
}
- /* Grab the location if we don't have one */
+ /* Grab the location if we don't have one */
if ( (strcmp(attr-name, printer-location) == 0)
- (attr-value_tag == IPP_TAG_TEXT)
+ (attr-value_tag == IPP_TAG_TEXT)
[SCM] Samba Shared Repository - branch master updated - ea85ceefa945f1fee2bb10441a3cc8e35216733b
The branch, master has been updated
via ea85ceefa945f1fee2bb10441a3cc8e35216733b (commit)
from e4f5bfb34b7a515e2cf107eb94489260594b8733 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ea85ceefa945f1fee2bb10441a3cc8e35216733b
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Oct 1 15:01:05 2008 -0700
Whitespace cleanup.
Jeremy.
---
Summary of changes:
source3/printing/print_cups.c | 32
1 files changed, 16 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index f9568f0..97584cb 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -7,12 +7,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, see http://www.gnu.org/licenses/.
*/
@@ -109,7 +109,7 @@ bool cups_cache_reload(void)
{
printer-name,
printer-info
- };
+ };
bool ret = False;
DEBUG(5, (reloading cups printcap cache\n));
@@ -657,8 +657,8 @@ static int cups_job_submit(int snum, struct printjob *pjob)
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, job-name, NULL,
new_jobname);
- /*
-* add any options defined in smb.conf
+ /*
+* add any options defined in smb.conf
*/
num_options = 0;
@@ -666,7 +666,7 @@ static int cups_job_submit(int snum, struct printjob *pjob)
num_options = cupsParseOptions(lp_cups_options(snum), num_options,
options);
if ( num_options )
- cupsEncodeOptions(request, num_options, options);
+ cupsEncodeOptions(request, num_options, options);
/*
* Do the request and get back a response...
@@ -712,7 +712,7 @@ static int cups_job_submit(int snum, struct printjob *pjob)
static int cups_queue_get(const char *sharename,
enum printing_types printing_type,
char *lpq_command,
- print_queue_struct **q,
+ print_queue_struct **q,
print_status_struct *status)
{
fstring printername;
@@ -751,10 +751,10 @@ static int cups_queue_get(const char *sharename,
*q = NULL;
- /* HACK ALERT!!! The problem with support the 'printer name'
- option is that we key the tdb off the sharename. So we will
- overload the lpq_command string to pass in the printername
- (which is basically what we do for non-cups printers ... using
+ /* HACK ALERT!!! The problem with support the 'printer name'
+ option is that we key the tdb off the sharename. So we will
+ overload the lpq_command string to pass in the printername
+ (which is basically what we do for non-cups printers ... using
the lpq_command to get the queue listing). */
fstrcpy( printername, lpq_command );
@@ -1316,22 +1316,22 @@ bool cups_pull_comment_location(NT_PRINTER_INFO_LEVEL_2
*printer)
/* Grab the comment if we don't have one */
if ( (strcmp(attr-name, printer-info) == 0)
(attr-value_tag == IPP_TAG_TEXT)
- !strlen(printer-comment) )
+ !strlen(printer-comment) )
{
DEBUG(5,(cups_pull_comment_location: Using
cups comment: %s\n,
-attr-values[0].string.text));
+attr-values[0].string.text));
strlcpy(printer-comment,
attr-values[0].string.text,
sizeof(printer-comment));
}
- /* Grab the location if we don't have one */
+ /* Grab the location if we don't have one */
if ( (strcmp(attr-name, printer-location) == 0)
- (attr-value_tag == IPP_TAG_TEXT)
+ (attr-value_tag == IPP_TAG_TEXT)
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3063-gd596f78
The branch, v3-2-test has been updated
via d596f78517f33f5a4c4849be3162d4f3031f045f (commit)
from 347fc4ed725083f2c520afc39f7c81db0dd60324 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit d596f78517f33f5a4c4849be3162d4f3031f045f
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Oct 1 15:00:35 2008 -0700
Whitespace cleanup.
Jeremy.
---
Summary of changes:
source/printing/print_cups.c | 38 +++---
1 files changed, 19 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/printing/print_cups.c b/source/printing/print_cups.c
index 593c5c7..2acf2cb 100644
--- a/source/printing/print_cups.c
+++ b/source/printing/print_cups.c
@@ -7,12 +7,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, see http://www.gnu.org/licenses/.
*/
@@ -45,7 +45,7 @@ static http_t *cups_connect(void)
http_t *http;
char *server, *p;
int port;
-
+
if (lp_cups_server() != NULL strlen(lp_cups_server()) 0) {
server = smb_xstrdup(lp_cups_server());
} else {
@@ -59,12 +59,12 @@ static http_t *cups_connect(void)
} else {
port = ippPort();
}
-
+
DEBUG(10, (connecting to cups server %s:%d\n,
server, port));
if ((http = httpConnect(server, port)) == NULL) {
- DEBUG(0,(Unable to connect to CUPS server %s:%d - %s\n,
+ DEBUG(0,(Unable to connect to CUPS server %s:%d - %s\n,
server, port, strerror(errno)));
SAFE_FREE(server);
return NULL;
@@ -87,7 +87,7 @@ bool cups_cache_reload(void)
{
printer-name,
printer-info
- };
+ };
bool ret = False;
DEBUG(5, (reloading cups printcap cache\n));
@@ -635,8 +635,8 @@ static int cups_job_submit(int snum, struct printjob *pjob)
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, job-name, NULL,
new_jobname);
- /*
-* add any options defined in smb.conf
+ /*
+* add any options defined in smb.conf
*/
num_options = 0;
@@ -644,7 +644,7 @@ static int cups_job_submit(int snum, struct printjob *pjob)
num_options = cupsParseOptions(lp_cups_options(snum), num_options,
options);
if ( num_options )
- cupsEncodeOptions(request, num_options, options);
+ cupsEncodeOptions(request, num_options, options);
/*
* Do the request and get back a response...
@@ -690,7 +690,7 @@ static int cups_job_submit(int snum, struct printjob *pjob)
static int cups_queue_get(const char *sharename,
enum printing_types printing_type,
char *lpq_command,
- print_queue_struct **q,
+ print_queue_struct **q,
print_status_struct *status)
{
fstring printername;
@@ -729,10 +729,10 @@ static int cups_queue_get(const char *sharename,
*q = NULL;
- /* HACK ALERT!!! The problem with support the 'printer name'
- option is that we key the tdb off the sharename. So we will
- overload the lpq_command string to pass in the printername
- (which is basically what we do for non-cups printers ... using
+ /* HACK ALERT!!! The problem with support the 'printer name'
+ option is that we key the tdb off the sharename. So we will
+ overload the lpq_command string to pass in the printername
+ (which is basically what we do for non-cups printers ... using
the lpq_command to get the queue listing). */
fstrcpy( printername, lpq_command );
@@ -1294,22 +1294,22 @@ bool cups_pull_comment_location(NT_PRINTER_INFO_LEVEL_2
*printer)
/* Grab the comment if we don't have one */
if ( (strcmp(attr-name, printer-info) == 0)
(attr-value_tag == IPP_TAG_TEXT)
- !strlen(printer-comment) )
+ !strlen(printer-comment) )
{
[SCM] Samba Shared Repository - branch master updated - 3bfb53caa86ece1d7ff1bf3c7759f003203d4247
The branch, master has been updated
via 3bfb53caa86ece1d7ff1bf3c7759f003203d4247 (commit)
from ea85ceefa945f1fee2bb10441a3cc8e35216733b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3bfb53caa86ece1d7ff1bf3c7759f003203d4247
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Oct 1 16:40:41 2008 -0700
Fix bug #5080. Access to cups-printers via samba broken with cups 1.3.4,
Unsupported character set.
Cups 1.3.4 expects utf8 to be used in all messages to/from the server. We
may be using a
different character set so we need to use talloc utf8 push/pull functions
in all communication.
Needs more testing. Don't release until I've done a thorough test. I also
have a version for 3.2.x.
Jeremy.
---
Summary of changes:
source3/printing/print_cups.c | 341 ++---
1 files changed, 251 insertions(+), 90 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index 97584cb..b46d83b 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -2,6 +2,7 @@
* Support code for the Common UNIX Printing System (CUPS)
*
* Copyright 1999-2003 by Michael R Sweet.
+ * Copyright 2008 Jeremy Allison.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,6 +18,10 @@
* along with this program; if not, see http://www.gnu.org/licenses/.
*/
+/*
+ * JRA. Converted to utf8 pull/push.
+ */
+
#include includes.h
#include printing.h
@@ -51,24 +56,23 @@ cups_passwd_cb(const char *prompt) /* I - Prompt */
return (NULL);
}
-static http_t *cups_connect(void)
+static http_t *cups_connect(TALLOC_CTX *frame)
{
- http_t *http;
- char *server, *p;
+ http_t *http = NULL;
+ char *server = NULL, *p = NULL;
int port;
int timeout = lp_cups_connection_timeout();
-
- gotalarm = 0;
-
- if (timeout) {
-CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
-alarm(timeout);
-}
+ size_t size;
if (lp_cups_server() != NULL strlen(lp_cups_server()) 0) {
- server = smb_xstrdup(lp_cups_server());
+ if (!push_utf8_talloc(frame, server, lp_cups_server(), size))
{
+ return NULL;
+ }
} else {
- server = smb_xstrdup(cupsServer());
+ server = talloc_strdup(frame,cupsServer());
+ }
+ if (server) {
+ return NULL;
}
p = strchr(server, ':');
@@ -82,6 +86,13 @@ static http_t *cups_connect(void)
DEBUG(10, (connecting to cups server %s:%d\n,
server, port));
+ gotalarm = 0;
+
+ if (timeout) {
+CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
+alarm(timeout);
+}
+
http = httpConnect(server, port);
CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
@@ -92,12 +103,12 @@ static http_t *cups_connect(void)
server, port, strerror(errno)));
}
- SAFE_FREE(server);
return http;
}
bool cups_cache_reload(void)
{
+ TALLOC_CTX *frame = talloc_stackframe();
http_t *http = NULL; /* HTTP connection to server */
ipp_t *request = NULL,/* IPP Request */
*response = NULL; /* IPP Response */
@@ -111,6 +122,7 @@ bool cups_cache_reload(void)
printer-info
};
bool ret = False;
+ size_t size;
DEBUG(5, (reloading cups printcap cache\n));
@@ -124,7 +136,7 @@ bool cups_cache_reload(void)
* Try to connect to the server...
*/
- if ((http = cups_connect()) == NULL) {
+ if ((http = cups_connect(frame)) == NULL) {
goto out;
}
@@ -145,7 +157,7 @@ bool cups_cache_reload(void)
language = cupsLangDefault();
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
- attributes-charset, NULL, cupsLangEncoding(language));
+ attributes-charset, NULL, utf-8);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
attributes-natural-language, NULL, language-language);
@@ -185,12 +197,24 @@ bool cups_cache_reload(void)
while (attr != NULL attr-group_tag == IPP_TAG_PRINTER) {
if (strcmp(attr-name, printer-name) == 0
- attr-value_tag == IPP_TAG_NAME)
- name = attr-values[0].string.text;
+ attr-value_tag == IPP_TAG_NAME) {
+
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4206-g2a2bb6b
The branch, v3-3-test has been updated
via 2a2bb6b0757b1f2a6199474f93ea8d598575d650 (commit)
from e782150175ff324b6e0ef1802a9e17f9a5aea560 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 2a2bb6b0757b1f2a6199474f93ea8d598575d650
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Oct 1 16:39:29 2008 -0700
Fix bug #5080. Access to cups-printers via samba broken with cups 1.3.4,
Unsupported character set.
Cups 1.3.4 expects utf8 to be used in all messages to/from the server. We
may be using a
different character set so we need to use talloc utf8 push/pull functions
in all communication.
Needs more testing. Don't release until I've done a thorough test. I also
have a version for 3.2.x.
Jeremy.
---
Summary of changes:
source/printing/print_cups.c | 341 +++---
1 files changed, 251 insertions(+), 90 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/printing/print_cups.c b/source/printing/print_cups.c
index 97584cb..b46d83b 100644
--- a/source/printing/print_cups.c
+++ b/source/printing/print_cups.c
@@ -2,6 +2,7 @@
* Support code for the Common UNIX Printing System (CUPS)
*
* Copyright 1999-2003 by Michael R Sweet.
+ * Copyright 2008 Jeremy Allison.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,6 +18,10 @@
* along with this program; if not, see http://www.gnu.org/licenses/.
*/
+/*
+ * JRA. Converted to utf8 pull/push.
+ */
+
#include includes.h
#include printing.h
@@ -51,24 +56,23 @@ cups_passwd_cb(const char *prompt) /* I - Prompt */
return (NULL);
}
-static http_t *cups_connect(void)
+static http_t *cups_connect(TALLOC_CTX *frame)
{
- http_t *http;
- char *server, *p;
+ http_t *http = NULL;
+ char *server = NULL, *p = NULL;
int port;
int timeout = lp_cups_connection_timeout();
-
- gotalarm = 0;
-
- if (timeout) {
-CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
-alarm(timeout);
-}
+ size_t size;
if (lp_cups_server() != NULL strlen(lp_cups_server()) 0) {
- server = smb_xstrdup(lp_cups_server());
+ if (!push_utf8_talloc(frame, server, lp_cups_server(), size))
{
+ return NULL;
+ }
} else {
- server = smb_xstrdup(cupsServer());
+ server = talloc_strdup(frame,cupsServer());
+ }
+ if (server) {
+ return NULL;
}
p = strchr(server, ':');
@@ -82,6 +86,13 @@ static http_t *cups_connect(void)
DEBUG(10, (connecting to cups server %s:%d\n,
server, port));
+ gotalarm = 0;
+
+ if (timeout) {
+CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
+alarm(timeout);
+}
+
http = httpConnect(server, port);
CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN);
@@ -92,12 +103,12 @@ static http_t *cups_connect(void)
server, port, strerror(errno)));
}
- SAFE_FREE(server);
return http;
}
bool cups_cache_reload(void)
{
+ TALLOC_CTX *frame = talloc_stackframe();
http_t *http = NULL; /* HTTP connection to server */
ipp_t *request = NULL,/* IPP Request */
*response = NULL; /* IPP Response */
@@ -111,6 +122,7 @@ bool cups_cache_reload(void)
printer-info
};
bool ret = False;
+ size_t size;
DEBUG(5, (reloading cups printcap cache\n));
@@ -124,7 +136,7 @@ bool cups_cache_reload(void)
* Try to connect to the server...
*/
- if ((http = cups_connect()) == NULL) {
+ if ((http = cups_connect(frame)) == NULL) {
goto out;
}
@@ -145,7 +157,7 @@ bool cups_cache_reload(void)
language = cupsLangDefault();
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
- attributes-charset, NULL, cupsLangEncoding(language));
+ attributes-charset, NULL, utf-8);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
attributes-natural-language, NULL, language-language);
@@ -185,12 +197,24 @@ bool cups_cache_reload(void)
while (attr != NULL attr-group_tag == IPP_TAG_PRINTER) {
if (strcmp(attr-name, printer-name) == 0
- attr-value_tag == IPP_TAG_NAME)
- name = attr-values[0].string.text;
+ attr-value_tag == IPP_TAG_NAME) {
+
Build status as of Thu Oct 2 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-10-01 00:01:04.0 + +++ /home/build/master/cache/broken_results.txt 2008-10-02 00:00:25.0 + @@ -1,22 +1,22 @@ -Build status as of Wed Oct 1 00:00:02 2008 +Build status as of Thu Oct 2 00:00:02 2008 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 33 8 0 +ccache 30 8 0 ctdb 0 0 0 distcc 1 0 0 -ldb 33 32 0 -libreplace 30 12 0 +ldb 31 32 0 +libreplace 31 12 0 lorikeet-heimdal 29 20 0 pidl 19 19 0 ppp 14 0 0 rsync33 11 0 samba-docs 0 0 0 samba-gtk8 8 0 -samba_3_X_devel 28 17 0 +samba_3_X_devel 29 17 0 samba_3_X_test 29 17 0 -samba_4_0_test 32 30 2 +samba_4_0_test 32 29 1 smb-build31 7 0 talloc 32 29 0 tdb 30 12 0
[SCM] Samba Shared Repository - branch master updated - 9097a67def72ea41e85a4acb5d7cbcc46adaaa84
The branch, master has been updated
via 9097a67def72ea41e85a4acb5d7cbcc46adaaa84 (commit)
from 3bfb53caa86ece1d7ff1bf3c7759f003203d4247 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9097a67def72ea41e85a4acb5d7cbcc46adaaa84
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Thu Oct 2 02:17:04 2008 +0200
Fix bug 5798: CFLAGS info lost in configure
Michael, please check and merge to the other branches if it's right.
Thanks,
Volker
---
Summary of changes:
source3/configure.in |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index f04ddbe..545a565 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -128,7 +128,7 @@ fi
if test x$debug = xyes ; then
CFLAGS=${CFLAGS} -g
else
- CFLAGS=-O
+ CFLAGS=${CFLAGS} -O
fi
m4_include(../lib/socket_wrapper/config.m4)
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 8641b54a736c5c924bf38cf4574d1f8e34d2d0cd
The branch, master has been updated
via 8641b54a736c5c924bf38cf4574d1f8e34d2d0cd (commit)
from 9097a67def72ea41e85a4acb5d7cbcc46adaaa84 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8641b54a736c5c924bf38cf4574d1f8e34d2d0cd
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Thu Oct 2 03:37:52 2008 +0200
Attempt to fix the build on IRIX
Under irix, sa_family is a #define to sa_union.sa_generic.sa_family2
---
Summary of changes:
source3/librpc/gen_ndr/nbt.h |2 +-
source3/librpc/gen_ndr/ndr_nbt.c |6 +++---
source3/librpc/idl/nbt.idl |2 +-
source3/libsmb/dsgetdcname.c |2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/librpc/gen_ndr/nbt.h b/source3/librpc/gen_ndr/nbt.h
index 264b00b..4b872d7 100644
--- a/source3/librpc/gen_ndr/nbt.h
+++ b/source3/librpc/gen_ndr/nbt.h
@@ -391,7 +391,7 @@ struct nbt_dgram_packet {
}/*
[public,flag(LIBNDR_FLAG_NOALIGN|LIBNDR_FLAG_BIGENDIAN|LIBNDR_PRINT_ARRAY_HEX)]
*/;
struct nbt_sockaddr {
- uint32_t sa_family;
+ uint32_t sockaddr_family;
const char * pdc_ip;/* [flag(LIBNDR_FLAG_BIGENDIAN)] */
DATA_BLOB remaining;/* [flag(LIBNDR_FLAG_REMAINING)] */
}/* [gensize,public] */;
diff --git a/source3/librpc/gen_ndr/ndr_nbt.c b/source3/librpc/gen_ndr/ndr_nbt.c
index 84cfabd..c02b539 100644
--- a/source3/librpc/gen_ndr/ndr_nbt.c
+++ b/source3/librpc/gen_ndr/ndr_nbt.c
@@ -1531,7 +1531,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_nbt_sockaddr(struct
ndr_push *ndr, int ndr_f
{
if (ndr_flags NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r-sa_family));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r-sockaddr_family));
{
uint32_t _flags_save_ipv4address = ndr-flags;
ndr_set_flags(ndr-flags, LIBNDR_FLAG_BIGENDIAN);
@@ -1554,7 +1554,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_nbt_sockaddr(struct
ndr_pull *ndr, int ndr_f
{
if (ndr_flags NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r-sa_family));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
r-sockaddr_family));
{
uint32_t _flags_save_ipv4address = ndr-flags;
ndr_set_flags(ndr-flags, LIBNDR_FLAG_BIGENDIAN);
@@ -1577,7 +1577,7 @@ _PUBLIC_ void ndr_print_nbt_sockaddr(struct ndr_print
*ndr, const char *name, co
{
ndr_print_struct(ndr, name, nbt_sockaddr);
ndr-depth++;
- ndr_print_uint32(ndr, sa_family, r-sa_family);
+ ndr_print_uint32(ndr, sockaddr_family, r-sockaddr_family);
ndr_print_ipv4address(ndr, pdc_ip, r-pdc_ip);
ndr_print_DATA_BLOB(ndr, remaining, r-remaining);
ndr-depth--;
diff --git a/source3/librpc/idl/nbt.idl b/source3/librpc/idl/nbt.idl
index 82571d9..f3590fc 100644
--- a/source3/librpc/idl/nbt.idl
+++ b/source3/librpc/idl/nbt.idl
@@ -339,7 +339,7 @@ interface nbt
*/
typedef [public,gensize] struct {
- uint32 sa_family;
+ uint32 sockaddr_family;
[flag(NDR_BIG_ENDIAN)] ipv4address pdc_ip;
[flag(NDR_REMAINING)] DATA_BLOB remaining;
} nbt_sockaddr;
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 89769d8..d2ede1d 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -200,7 +200,7 @@ static NTSTATUS store_cldap_reply(TALLOC_CTX *mem_ctx,
/* FIXME */
r-sockaddr_size = 0x10; /* the w32 winsock addr size */
- r-sockaddr.sa_family = 2; /* AF_INET */
+ r-sockaddr.sockaddr_family = 2; /* AF_INET */
r-sockaddr.pdc_ip = talloc_strdup(mem_ctx, addr);
ndr_err = ndr_push_struct_blob(blob, mem_ctx, NULL, r,
--
Samba Shared Repository
