[Samba] PDC doesnt work on RHEL 4
The exact configuration mentioned below used to work on rhel3, and when updated to rhel4 it stopped working... when visited the samba log file, there was this error : useradd: invalid user name 'wpvm01$' rpc_server/srv_samr_nt.c:_samr_create_user(2272) could not add user/computer wpvm01$ to passdb. Check permissions? [2005/03/17 07:42:27, 0] passdb/pdb_tdb.c:tdb_update_sam(609) tdb_update_sam: Failing to store a SAM_ACCOUNT for [wpvm01$] without a primary group RID [2005/03/17 07:42:27, 0] rpc_server/srv_samr_nt.c:_samr_create_user(2272) could not add user/computer wpvm01$ to passdb. Check permissions? this happens when I try to add a windows 200 Client to the domain... I am using samb 3.0.11 My smb.conf is [global] netbios name = QA1 workgroup = ERR.CHK passdb backend = tdbsam obey pam restrictions = yes pam password change = yes encrypt passwords = yes unix password sync = yes wins support = yes add user script = /usr/sbin/useradd -m %u delete user script = /usr/sbin/userdel -r %u add group script = /usr/sbin/groupadd %g delete group script = /usr/sbin/groupdel %g add user to group script = /usr/sbin/usermod -G %g %u add machine script = /usr/sbin/useradd -s /bin/false \ -d /dev/null %u logon script = scripts\logon.bat os level = 33 preferred master = yes domain master = yes local master = yes security = user domain logons = yes logon path = \\%N\profiles\%U logon drive = H: logon home = \\%N\%U idmap uid = 15000-2 idmap gid = 15000-2 admin users = @admins any pointer or help would be very helpfull regards __ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] looking for a good tutorial on samba 3 and Active directory
Hi there! I have looked around a bit and found all sorts of documents Regarding samba 3 and ldap, samba and authentication against Windows AD. It seems a bit confusing, I found many documents from many dates. I am looking for a good one that can help me integrate the authentication of the linux machines on Microsoft AD to set up a couple of file and ssh servers. Any help would be appretiated. Cheers João Carneiro -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] looking for a good tutorial on samba 3 and Active directory 1
By the way... I use debian. João Carneiro Departamento de Sistemas e Tecnologias da Informação [EMAIL PROTECTED] DLS - Projectos Automação e Manutenção, Lda Tel.: 227 470 786 :: Fax: 227 470 787 -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Joao Carneiro - DLS Sent: sábado, 19 de Março de 2005 10:11 To: samba@lists.samba.org Subject: [Samba] looking for a good tutorial on samba 3 and Active directory Hi there! I have looked around a bit and found all sorts of documents Regarding samba 3 and ldap, samba and authentication against Windows AD. It seems a bit confusing, I found many documents from many dates. I am looking for a good one that can help me integrate the authentication of the linux machines on Microsoft AD to set up a couple of file and ssh servers. Any help would be appretiated. Cheers João Carneiro -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Problem with domain membership
Hello, I have a Samba 3.0.11/LDAP-Backend PDC configured and I am able to join all kinds of machines quite well. However my Samba 2.2.12 Linux Fileserver is just able to join the domain: ---snip--- [EMAIL PROTECTED]/opt/samba smbpasswd -j Domainname -r PDC Name -U Administrator Password: Joined domain Domainname ---snip--- When I now try to access my Fileserver with a valid PDC account, I get: ---snip--- [EMAIL PROTECTED]/opt/samba /opt/samba/bin/smbclient -L //hal -U jwitte -W Domainname -d4 Serverzone is 0 Initialising global parameters params.c:pm_process() - Processing configuration file /opt/samba-2.2.12/lib/smb.conf Processing section [global] doing parameter workgroup = Domainname doing parameter netbios name = HAL handle_netbios_name: set global_myname to: HAL doing parameter server string = Samba 2.2.12 on HAL doing parameter log file = /var/log/samba/%m-log.smbd doing parameter lock dir = /var/lock/samba doing parameter template homedir = /home/%U doing parameter guest account = ftp doing parameter socket options = IPTOS_LOWDELAY TCP_NODELAY SO_SNDBUF=8192 SO_RCVBUF=8192 SO_KEEPALIVE doing parameter kernel oplocks = yes doing parameter log level = 4 doing parameter debuglevel = 4 doing parameter security = domain doing parameter encrypt passwords = yes doing parameter password server = * doing parameter os level = 33 doing parameter local master = no doing parameter wins server = 10.128.0.24 wins_srv_load_list(): Building WINS server list: 10.128.0.24, 1 WINS server listed. doing parameter dns proxy = no pm_process() returned Yes added interface ip=10.128.0.23 bcast=10.128.0.255 nmask=255.255.255.0 Client started (version 2.2.12). resolve_lmhosts: Attempting lmhosts lookup for name hal0x20 resolve_hosts: Attempting host lookup for name hal0x20 Connecting to 10.128.0.23 at port 139 session request ok Password: session setup failed: NT_STATUS_LOGON_FAILURE ---snip--- On the PDC side I get the following: ---snip--- [2005/03/19 13:08:22, 3] smbd/oplock.c:init_oplocks(1345) open_oplock_ipc: opening loopback UDP socket. [2005/03/19 13:08:22, 3] smbd/oplock_linux.c:linux_init_kernel_oplocks (303) Linux kernel oplocks enabled [2005/03/19 13:08:22, 3] smbd/oplock.c:init_oplocks(1376) open_oplock ipc: pid = 349, global_oplock_port = 36763 [2005/03/19 13:08:22, 4] lib/time.c:get_serverzone(122) Serverzone is -3600 [2005/03/19 13:08:22, 3] smbd/process.c:process_smb(1091) Transaction 0 of length 168 [2005/03/19 13:08:22, 3] smbd/process.c:switch_message(886) switch message SMBnegprot (pid 349) conn 0x0 [2005/03/19 13:08:22, 3] smbd/sec_ctx.c:set_sec_ctx(288) setting sec ctx (0, 0) - sec_ctx_stack_ndx = 0 [2005/03/19 13:08:22, 3] smbd/negprot.c:reply_negprot(461) Requested protocol [PC NETWORK PROGRAM 1.0] [2005/03/19 13:08:22, 3] smbd/negprot.c:reply_negprot(461) Requested protocol [MICROSOFT NETWORKS 1.03] [2005/03/19 13:08:22, 3] smbd/negprot.c:reply_negprot(461) Requested protocol [MICROSOFT NETWORKS 3.0] [2005/03/19 13:08:22, 3] smbd/negprot.c:reply_negprot(461) Requested protocol [LANMAN1.0] [2005/03/19 13:08:22, 3] smbd/negprot.c:reply_negprot(461) Requested protocol [LM1.2X002] [2005/03/19 13:08:22, 3] smbd/negprot.c:reply_negprot(461) Requested protocol [Samba] [2005/03/19 13:08:22, 3] smbd/negprot.c:reply_nt1(327) not using SPNEGO [2005/03/19 13:08:22, 3] smbd/negprot.c:reply_negprot(555) Selected protocol NT LANMAN 1.0 [2005/03/19 13:08:22, 3] smbd/process.c:process_smb(1091) Transaction 1 of length 92 [2005/03/19 13:08:22, 3] smbd/process.c:switch_message(886) switch message SMBsesssetupX (pid 349) conn 0x0 [2005/03/19 13:08:22, 3] smbd/sec_ctx.c:set_sec_ctx(288) setting sec ctx (0, 0) - sec_ctx_stack_ndx = 0 [2005/03/19 13:08:22, 3] smbd/sesssetup.c:reply_sesssetup_and_X(655) wct=13 flg2=0xc001 [2005/03/19 13:08:22, 3] smbd/sesssetup.c:reply_sesssetup_and_X(789) Domain=[] NativeOS=[Unix] NativeLanMan=[Samba] PrimaryDomain=[] [2005/03/19 13:08:22, 3] smbd/sesssetup.c:reply_sesssetup_and_X(804) sesssetupX:[EMAIL PROTECTED] [2005/03/19 13:08:22, 3] smbd/sesssetup.c:check_guest_password(116) Got anonymous request [2005/03/19 13:08:22, 3] auth/auth.c:check_ntlm_password(219) check_ntlm_password: Checking password for unmapped user [EMAIL PROTECTED] with the new password interface [2005/03/19 13:08:22, 3] auth/auth.c:check_ntlm_password(222) check_ntlm_password: mapped user is: [EMAIL PROTECTED] [2005/03/19 13:08:22, 3] auth/auth.c:check_ntlm_password(268) check_ntlm_password: guest authentication for user [] succeeded [2005/03/19 13:08:22, 3] smbd/password.c:register_vuid(222) User name: nobody Real name: Nobody [2005/03/19 13:08:22, 3] smbd/password.c:register_vuid(241) UNIX uid 99 is UNIX user nobody, and will be vuid 100 [2005/03/19 13:08:22, 3] smbd/process.c:process_smb(1091) Transaction 2 of length 88 [2005/03/19 13:08:22, 3] smbd/process.c:switch_message(886) switch message SMBtconX (pid 349) conn 0x0 [2005/03/19
[Samba] [patch 1/1] fs/smbfs/*: fix sparse warnings
Signed-off-by: Domen Puncer [EMAIL PROTECTED] --- kj-domen/include/linux/smb_fs.h | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) diff -puN include/linux/smb_fs.h~sparse-include_linux_smb_fs.h include/linux/smb_fs.h --- kj/include/linux/smb_fs.h~sparse-include_linux_smb_fs.h 2005-03-18 20:05:31.0 +0100 +++ kj-domen/include/linux/smb_fs.h 2005-03-18 20:05:31.0 +0100 @@ -43,17 +43,17 @@ static inline struct smb_inode_info *SMB /* macro names are short for word, double-word, long value (?) */ #define WVAL(buf,pos) \ - (le16_to_cpu(get_unaligned((u16 *)((u8 *)(buf) + (pos) + (le16_to_cpu(get_unaligned((__le16 *)((u8 *)(buf) + (pos) #define DVAL(buf,pos) \ - (le32_to_cpu(get_unaligned((u32 *)((u8 *)(buf) + (pos) + (le32_to_cpu(get_unaligned((__le32 *)((u8 *)(buf) + (pos) #define LVAL(buf,pos) \ - (le64_to_cpu(get_unaligned((u64 *)((u8 *)(buf) + (pos) + (le64_to_cpu(get_unaligned((__le64 *)((u8 *)(buf) + (pos) #define WSET(buf,pos,val) \ - put_unaligned(cpu_to_le16((u16)(val)), (u16 *)((u8 *)(buf) + (pos))) + put_unaligned(cpu_to_le16((u16)(val)), (__le16 *)((u8 *)(buf) + (pos))) #define DSET(buf,pos,val) \ - put_unaligned(cpu_to_le32((u32)(val)), (u32 *)((u8 *)(buf) + (pos))) + put_unaligned(cpu_to_le32((u32)(val)), (__le32 *)((u8 *)(buf) + (pos))) #define LSET(buf,pos,val) \ - put_unaligned(cpu_to_le64((u64)(val)), (u64 *)((u8 *)(buf) + (pos))) + put_unaligned(cpu_to_le64((u64)(val)), (__le64 *)((u8 *)(buf) + (pos))) /* where to find the base of the SMB packet proper */ #define smb_base(buf) ((u8 *)(((u8 *)(buf))+4)) _ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] PDC Samba 3+LDAP
Mccrory, Kevin B: Domain: ARZUR-NT ^ | There's your problem. Get rid of the - in the domain name. Windows machines can't handle anything other than alpha-numerics in the Domain name. I have a production Samba 3.011 PDC for domain BARLAEUS-1 running 75+ XP and 2000 workstations - no problems. --Tonni -- mail: [EMAIL PROTECTED] http://www.billy.demon.nl -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Password Generator
David Landgren: [...] Jeeze Tony, you spread your good humour and grace every where you go, don't you? The OP was asking the question because he didn't know of such things, and was seeking advice. We were all clueless newbies once. This is a very high traffic list: please engage your brain before posting such nonsense again. http://www.google.nl/search?hl=nlq=%22automatic+password+generator%22btnG=Google+zoekenmeta= --Tonni -- mail: [EMAIL PROTECTED] http://www.billy.demon.nl -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Strong Session Key and XP
I just finished debugging a Samba installation with Windows XP, and thought I'd share some findings. Thanks to MS screwing up our perfectly stable Windows 2000 network with the release of SP4 (which our security people demanded we install to stay current), we decided to upgrade to Windows XP Pro SP1 on the 8 computer lab windows machines. The crux of the problem was that SP4 for win2k disabled some important windows audit features (logoff and password change for starters). So to meet the security requirements, we upgraded. On the first machine I tried, the XP box joined the samba domain with no problems. I'm running one of the later 3.x releases of Samba with an OpenLDAP backend, using SMBLDAP perl scripts for account maintenance. It's worked near flawlessly for 8 months now. Then I tried to apply our standard security template. This is where the problem started. Now I could mount shares as administrator, but no users could log on. I got the domain could not be found error at the login screen. I figured it was probably the NTLMv2 requirement that the template enforces (v2 only, deny all others). So I configured the server to lanman auth=no and ntlm auth=no, which should force only NTLMv2. Still didn't work. I did a diff of the default Win XP security settings and what was applied by the template. Found the culprit: Domain Member -- Require Strong (Windows 2000 or later) Session Key: Enabled. Once I disabled that, it worked fine. Users could login now, no problems. So, I wanted to share that tidbit, in case anyone else is having this problem. Also, I was wondering if Samba can satisfy this security setting? That is, keep the Strong Session Key enabled on the XP workstation and configure the server to comply? I'm worried that my security people won't like me deviating from their default template -- but if it's the only way to make it work, then so be it. Thanks, Anthony -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] mapping groups
hello I am having problems mapping my windows groups to my Linux groups. I use the net groupmap tool. When I list the group mappings I see that /Domain Users/ is mapped to the group /users/ (there are two entries with two different SIDs and well)/. /I log on to my windows XP pro machine as administrator and added Domain Users to the Power Users group and deleted it from the Users group. When a member of the /users/ group logs in they have no wallpaper, their links are missing, they cannot change their homepage, and other such problems. However the same situation is true with the /Domain Admins/ group and my /adm/ unix group. They work perfectly. Does anyone have any idea what the problem could be? Thank you, Steve C -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] samba frond-end (load balancing)
Hi All,
I work on HA samba project for my company. My plan is use some samba server
like front-ends with remotely storage mouted by nfs to this servers.
Questions:
1) I read some information about this in official Samba HOW-TO, but i still
don't know if this solution is posible or not??
2) and which software or hardware must be use for balancing?
3) May I use dns for load balancig ( I think not, but I'm not sure)
4) Excuse me for my bad english and thanks for your time.
Look on picture (hope this will ok after send :) )
| LoadBalancing |
-
|
---
| | | |
| smb | | smb | | smb | | smb |
| | | |
---
|
| storage |
-
Best Regards
Vojtech Moravek
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] samba log gid doesn't exist warnings
Hello, i am running fedora core 3 kernel version = kernel-2.6.10-1.770_FC3 samba version = samba-3.0.10-1.fc3 i have it running as a PDC with roaming profiles. i get the below warnings. i checked both the /etc/passwd and /etc/group file. they are fine. so i am not sure what i can do to fix this problem. any help is appreciated. thanks. ib/util_sock.c:get_peer_addr(1000) getpeername failed. Error was Transport endpoint is not connected : 141 Time(s) rpc_server/srv_util.c:get_alias_user_groups(206) get_alias_user_groups: gid of user emilystation$ doesn't exist. Check your /etc/passwd and /etc/group files : 1 Time(s) rpc_server/srv_util.c:get_alias_user_groups(206) get_alias_user_groups: gid of user moviestation$ doesn't exist. Check your /etc/passwd and /etc/group files : 1 Time(s) rpc_server/srv_util.c:get_alias_user_groups(206) get_alias_user_groups: gid of user praisestation$ doesn't exist. Check your /etc/passwd and /etc/group files : 1 Time(s) rpc_server/srv_util.c:get_alias_user_groups(206) get_alias_user_groups: gid of user praystation$ doesn't exist. Check your /etc/passwd and /etc/group files : 1 Time(s) rpc_server/srv_util.c:get_alias_user_groups(206) get_alias_user_groups: gid of user root doesn't exist. Check your /etc/passwd and /etc/group files : 1 Time(s) rpc_server/srv_util.c:get_alias_user_groups(206) get_alias_user_groups: gid of user worshipstation$ doesn't exist. Check your /etc/passwd and /etc/group files : 1 Time(s) This message was sent using heavenbridge webmail. visit http://www.heavenbridge.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba frond-end (load balancing)
On Sat, 2005-03-19 at 22:14 +0100, [EMAIL PROTECTED] wrote: Hi All, I work on HA samba project for my company. My plan is use some samba server like front-ends with remotely storage mouted by nfs to this servers. I don't see how this provides any increased availability (have you shown the Samba server to be the point of failure, and as such be in need of redundancy?), and you only make life very complex by using NFS, and providing a conflicting locking view on each frontend CIFS server. You still have a single point of failure (the NFS server). You also seem unclear as to if this project is for HA, or load balancing - the two are different problems, with different solutions. Also, is the dataset read-only or read-write? Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org Student Network Administrator, Hawker College http://hawkerc.net signature.asc Description: This is a digitally signed message part -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] RPMs for SuSE Linux (was: Samba 3.0.12 Available for Download)
On Fri, Mar 18, 2005 at 04:00:30PM -0600, Gerald Carter wrote: [snip] Binary packages are available at http://download.samba.org/samba/ftp/Binary_Packages/ RPM packages of Samba 3.0.12 for SuSE Linux are available at ftp://ftp.SuSE.com/pub/projects/samba/3.0/ http://ftp.SuSE.com/pub/projects/samba/3.0/ The same packages are also available at http://download.Samba.org/samba/ftp/Binary_Packages/SuSE/3.0/ Please use a mirror close to your site. A list of Samba.org mirrors is available at http://Samba.org/ and hoose a mirror at the right top of the page. There are also a bunch of SuSE mirrors. A list of international mirrors sites is at http://www.Novell.com/products/linuxprofessional/downloads/ftp/int_mirrors.html A list of mirrors in Germany is at http://www.novell.com/products/linuxprofessional/downloads/ftp/germ_mirrors.html Currently there are 3.0.12 packages for SuSE Linux (x86 and x86_64) 9.0, 9.1, 9.2, UnitedLinux 1/ SLES 8, and SLES 9. Packages for 8.2 are only available for i386 as there was no x86_64 SuSE Linux product of these release. If you encounter any problem with these packages please don't blame the Samba Team. Instead file a bug to https://bugzilla.Samba.org/, pick product Samba 3.0, then select 'component' Packaging and set 'assign to' to lmuelle at suse dot de. Our customers, our products, our responsibility. Have a lot of fun... Lars -- Lars MLLER [la(r)z ml] SuSE Linux, Maxfeldstrae 5, 90409 Nrnberg, Germany pgpUByfgZMIWN.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] Solaris ACLs - Files Becoming Read Only
Solaris ACLs - Files Becoming Read Only --- Problem: Since we have upgraded to Microsoft Office 2003 from Microsoft Office 2000 we have had problems with files becoming Read Only. Background: --- We have read-only and write groups which have access to files. We control access using both the Samba configuration file and file system ACLs. This give our users the flexibilty to access files via NFS, FTP or Samba. We have had no problems until upgrading to Microsoft Office 2003 on our client devices. Rolling back to Microsoft Office 2000 is unfortunately not an option. When more than one users accesses a document using either Microsoft Word 2003 or Microsoft Excel 2003 Samba will change permissions on the file and also modify the underlying ACL. The access does NOT have to be concurrent. One user can finish working with the file and another user can attempt to edit the file and cause it to become read-only. System Information: --- Operating System - Solaris 9 (sparc) Samba Version - 3.08 Samba has been compiled with ACL support. Abridged Samba Configuration: - [global] kernel oplocks = No create mask = 0770 oplocks = No level2 oplocks = No [sharename] valid users = @readgroup,@writegroup read list = @readgroup write list = @writegroup force group = readgroup create mask = 0740 force create mode = 0740 inherit permissions = yes inherit acls = yes Solaris ACL Configuration - The following is the ACL information on a file. user::rwx group::--- #effective:--- group:readgroup:r-x#effective:r-x group:writegroup:rwx #effective:rwx mask:rwx other:--- Standard Unix permissions on this file appear as -rwx--+ (the + symbolises that the file has ACLs set) The following is the resulting file permissions and ACLs on an AFFECTED FILE. user::r-x user:username:rwx #effective:rwx group::r-x #effective:r-x group:writegroup:rwx #effective:rwx mask:rwx other:--- -r-xr-x---+ Whats Been Tried We have tried enabling and disabling OpLocks without success. We have also tried to disable ACLs on the file system and use standard UNIX permissions. This DOES stop files from becoming read only, but only provides the required access when accessing the file system via Samba. We need to continue using ACLs as Samba is not the only method used to access files. Any ideas on how we may solve this problem would be greatly appreciated. Thanks, Damien -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Solaris ACLs - Files Becoming Read Only
Any ideas on how we may solve this problem would be greatly appreciated. Have you tried the newest version, i.e. the one released a couple days ago? I know they mentioned Office problems in the release notes. -- Paul GiengerOffice: 701-281-1884 Applied Engineering Inc. Systems Architect Fax:701-281-1322 URL: www.ae-solutions.com mailto: [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba r5900 - in branches/SAMBA_4_0/source: . libnet
Author: abartlet
Date: 2005-03-19 08:11:49 + (Sat, 19 Mar 2005)
New Revision: 5900
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5900
Log:
Use flatname to specify the netbios domain name (matches what win2k3
uses for trusted domain records) in the secrets join records.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/libnet/libnet_join.c
branches/SAMBA_4_0/source/secrets.ldif
Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_join.c
===
--- branches/SAMBA_4_0/source/libnet/libnet_join.c 2005-03-19 06:49:03 UTC
(rev 5899)
+++ branches/SAMBA_4_0/source/libnet/libnet_join.c 2005-03-19 08:11:49 UTC
(rev 5900)
@@ -375,14 +375,14 @@
/* search for the secret record */
ret = samdb_search(ldb,
mem_ctx, base_dn, msgs, attrs,
- ((cn=%s)(objectclass=primaryDomain)),
+ ((flatname=%s)(objectclass=primaryDomain)),
r-generic.in.domain_name);
if (ret == 0) {
- msg-dn = talloc_asprintf(mem_ctx, cn=%s,%s,
+ msg-dn = talloc_asprintf(mem_ctx, flatname=%s,%s,
r-generic.in.domain_name,
base_dn);
- samdb_msg_add_string(ldb, mem_ctx, msg, cn,
r-generic.in.domain_name);
+ samdb_msg_add_string(ldb, mem_ctx, msg, flatname,
r-generic.in.domain_name);
samdb_msg_add_string(ldb, mem_ctx, msg, objectClass,
primaryDomain);
samdb_msg_add_string(ldb, mem_ctx, msg, secret,
r2.generic.out.join_password);
Modified: branches/SAMBA_4_0/source/secrets.ldif
===
--- branches/SAMBA_4_0/source/secrets.ldif 2005-03-19 06:49:03 UTC (rev
5899)
+++ branches/SAMBA_4_0/source/secrets.ldif 2005-03-19 08:11:49 UTC (rev
5900)
@@ -13,10 +13,10 @@
objectClass: container
cn: Primary Domains
-dn: CN=${DOMAIN},CN=Primary Domains
+dn: flatname=${DOMAIN},CN=Primary Domains
objectClass: top
objectClass: primaryDomain
-cn: ${DOMAIN}
+flatname: ${DOMAIN}
realm: ${REALM}
secret: ${JOINPASS}
whenCreated: ${LDAPTIME}
svn commit: samba r5901 - in branches/SAMBA_4_0/source/script/tests: .
Author: abartlet
Date: 2005-03-19 08:18:24 + (Sat, 19 Mar 2005)
New Revision: 5901
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5901
Log:
Add another option to the test script - the realm, which must match
the real ream, not just the short domain name.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/script/tests/test_w2k3.sh
Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/test_w2k3.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_w2k3.sh 2005-03-19 08:11:49 UTC
(rev 5900)
+++ branches/SAMBA_4_0/source/script/tests/test_w2k3.sh 2005-03-19 08:18:24 UTC
(rev 5901)
@@ -9,7 +9,7 @@
if [ $# -lt 4 ]; then
cat EOF
-Usage: test_w2k3.sh SERVER USERNAME PASSWORD DOMAIN
+Usage: test_w2k3.sh SERVER USERNAME PASSWORD DOMAIN REALM
EOF
exit 1;
fi
@@ -22,7 +22,8 @@
username=$2
password=$3
domain=$4
-shift 4
+realm=$5
+shift 5
testit() {
trap rm -f test.$$ EXIT
@@ -36,7 +37,7 @@
rm -f test.$$;
}
-OPTIONS=-U$username%$password -W $domain --option realm=$domain
+OPTIONS=-U$username%$password -W $domain --option realm=$realm
for transport in ncacn_ip_tcp ncacn_np; do
for bindoptions in padcheck connect sign seal spnego,sign spnego,seal
validate bigendian; do
svn commit: samba r5902 - in branches/SAMBA_4_0/source: client gtk/tools lib/com/dcom lib/registry libcli/auth libnet librpc/idl librpc/rpc ntvfs/ipc rpc_server rpc_server/epmapper rpc_server/netlogon rpc_server/remote torture torture/libnet torture/local torture/rpc utils
Author: abartlet Date: 2005-03-19 08:34:43 + (Sat, 19 Mar 2005) New Revision: 5902 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5902 Log: A rather large change... I wanted to add a simple 'workstation' argument to the DCERPC authenticated binding calls, but this patch kind of grew from there. With SCHANNEL, the 'workstation' name (the netbios name of the client) matters, as this is what ties the session between the NETLOGON ops and the SCHANNEL bind. This changes a lot of files, and these will again be changed when jelmer does the credentials work. I also correct some schannel IDL to distinguish between workstation names and account names. The distinction matters for domain trust accounts. Issues in handling this (issues with lifetime of talloc pointers) caused me to change the 'creds_CredentialsState' and 'struct dcerpc_binding' pointers to always be talloc()ed pointers. In the schannel DB, we now store both the domain and computername, and query on both. This should ensure we fault correctly when the domain is specified incorrectly in the SCHANNEL bind. In the RPC-SCHANNEL test, I finally fixed a bug that vl pointed out, where the comment claimed we re-used a connection, but in fact we made a new connection. This was achived by breaking apart some of the dcerpc_secondary_connection() logic. The addition of workstation handling was also propogated to NTLMSSP and GENSEC, for completeness. The RPC-SAMSYNC test has been cleaned up a little, using a loop over usernames/passwords rather than manually expanded tests. This will be expanded further (the code in #if 0 in this patch) to use a newly created user account for testing. In making this test pass test_rpc.sh, I found a bug in the RPC-ECHO server, caused by the removal of [ref] and the assoicated pointer from the IDL. This has been re-added, until the underlying pidl issues are solved. Modified: branches/SAMBA_4_0/source/client/client.c branches/SAMBA_4_0/source/gtk/tools/gepdump.c branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c branches/SAMBA_4_0/source/gtk/tools/gwsam.c branches/SAMBA_4_0/source/lib/com/dcom/main.c branches/SAMBA_4_0/source/lib/registry/reg_backend_rpc.c branches/SAMBA_4_0/source/libcli/auth/credentials.c branches/SAMBA_4_0/source/libcli/auth/credentials.h branches/SAMBA_4_0/source/libcli/auth/gensec.c branches/SAMBA_4_0/source/libcli/auth/gensec.h branches/SAMBA_4_0/source/libcli/auth/gensec_ntlmssp.c branches/SAMBA_4_0/source/libcli/auth/ntlmssp.c branches/SAMBA_4_0/source/libcli/auth/ntlmssp.h branches/SAMBA_4_0/source/libcli/auth/schannel.c branches/SAMBA_4_0/source/libcli/auth/schannel_state.c branches/SAMBA_4_0/source/libnet/libnet_rpc.c branches/SAMBA_4_0/source/librpc/idl/echo.idl branches/SAMBA_4_0/source/librpc/idl/schannel.idl branches/SAMBA_4_0/source/librpc/rpc/dcerpc_auth.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_schannel.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c branches/SAMBA_4_0/source/rpc_server/dcerpc_server.h branches/SAMBA_4_0/source/rpc_server/dcerpc_sock.c branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c branches/SAMBA_4_0/source/rpc_server/remote/dcesrv_remote.c branches/SAMBA_4_0/source/torture/libnet/userinfo.c branches/SAMBA_4_0/source/torture/local/binding_string.c branches/SAMBA_4_0/source/torture/rpc/bind.c branches/SAMBA_4_0/source/torture/rpc/epmapper.c branches/SAMBA_4_0/source/torture/rpc/mgmt.c branches/SAMBA_4_0/source/torture/rpc/netlogon.c branches/SAMBA_4_0/source/torture/rpc/samlogon.c branches/SAMBA_4_0/source/torture/rpc/samsync.c branches/SAMBA_4_0/source/torture/rpc/scanner.c branches/SAMBA_4_0/source/torture/rpc/schannel.c branches/SAMBA_4_0/source/torture/rpc/spoolss.c branches/SAMBA_4_0/source/torture/rpc/testjoin.c branches/SAMBA_4_0/source/torture/rpc/xplogin.c branches/SAMBA_4_0/source/torture/torture.c branches/SAMBA_4_0/source/utils/ntlm_auth.c Changeset: Sorry, the patch is too large (3228 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5902
svn commit: samba-web r592 - in trunk/news/advocacy: .
Author: deryck Date: 2005-03-19 09:30:46 + (Sat, 19 Mar 2005) New Revision: 592 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=592 Log: Adding news story on Volker's eweek piece. deryck Added: trunk/news/advocacy/eweek_vl_on_ms.html Changeset: Added: trunk/news/advocacy/eweek_vl_on_ms.html === --- trunk/news/advocacy/eweek_vl_on_ms.html 2005-03-19 03:17:45 UTC (rev 591) +++ trunk/news/advocacy/eweek_vl_on_ms.html 2005-03-19 09:30:46 UTC (rev 592) @@ -0,0 +1,21 @@ +h3a name=eweek_vl_on_msVolker Lendecke on EU/MS/a/h3 + +div class=article +pSamba Team member Volker Lendecke was interviewed for an eweek +piece on the recent EU/MS happenings (see +a href=/samba/news/#eu_not_satisfiedthe earlier news.samba.org +story/a)./p + +blockquoteThe commission's remedies still have an opportunity to +make a real difference, open-source competitors say. While Microsoft +effectively took RealNetworks and Netscape out of the game before +antitrust measures could make a difference, that isn't yet the case +with workgroup servers, Lendecke said./blockquote + +pThe article does a nice job of articulating the issues of concern +for open source developers as this case continues. To read more, see +a href=http://www.eweek.com/article2/0,1759,1777493,00.asp;Open-Source +Developers: Microsoft Licensing Must Be GPL-Compatible/a./p +/div + +
svn commit: samba-web r593 - in trunk/news/advocacy: .
Author: deryck Date: 2005-03-19 10:17:58 + (Sat, 19 Mar 2005) New Revision: 593 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=593 Log: Use permanent link and not the news page one when referencing older story. deryck Modified: trunk/news/advocacy/eweek_vl_on_ms.html Changeset: Modified: trunk/news/advocacy/eweek_vl_on_ms.html === --- trunk/news/advocacy/eweek_vl_on_ms.html 2005-03-19 09:30:46 UTC (rev 592) +++ trunk/news/advocacy/eweek_vl_on_ms.html 2005-03-19 10:17:58 UTC (rev 593) @@ -3,8 +3,8 @@ div class=article pSamba Team member Volker Lendecke was interviewed for an eweek piece on the recent EU/MS happenings (see -a href=/samba/news/#eu_not_satisfiedthe earlier news.samba.org -story/a)./p +a href=/samba/news/advocacy/#eu_not_satisfiedthe earlier +news.samba.org story/a)./p blockquoteThe commission's remedies still have an opportunity to make a real difference, open-source competitors say. While Microsoft
svn commit: samba r5903 - in branches/SAMBA_4_0/source/lib/socket: .
Author: abartlet
Date: 2005-03-19 10:28:31 + (Sat, 19 Mar 2005)
New Revision: 5903
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5903
Log:
While I can't test IPv6, metze asked me to commit a matching change
for unknown hosts that I just did for IPv4.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/lib/socket/socket_ipv6.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/socket/socket_ipv6.c
===
--- branches/SAMBA_4_0/source/lib/socket/socket_ipv6.c 2005-03-19 08:34:43 UTC
(rev 5902)
+++ branches/SAMBA_4_0/source/lib/socket/socket_ipv6.c 2005-03-19 10:28:31 UTC
(rev 5903)
@@ -105,6 +105,9 @@
}
srv_ip = interpret_addr6(srv_address);
+ if (memcmp(srv_ip, in6addr_any, sizeof(srv_ip)) == 0) {
+ return NT_STATUS_BAD_NETWORK_NAME;
+ }
ZERO_STRUCT(srv_addr);
srv_addr.sin6_addr = srv_ip;
svn commit: samba-docs r434 - in trunk/manpages: .
Author: jelmer Date: 2005-03-19 16:32:55 + (Sat, 19 Mar 2005) New Revision: 434 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=434 Log: Fix missing /listitem Modified: trunk/manpages/smb.conf.5.xml Changeset: Modified: trunk/manpages/smb.conf.5.xml === --- trunk/manpages/smb.conf.5.xml 2005-03-19 03:07:51 UTC (rev 433) +++ trunk/manpages/smb.conf.5.xml 2005-03-19 16:32:55 UTC (rev 434) @@ -386,6 +386,7 @@ Windows 2000 (constantWin2K/constant), Windows XP (constantWinXP/constant), and Windows 2003 (constantWin2K3/constant). Anything else will be known as constantUNKNOWN/constant./para + /listitem /varlistentry varlistentry
svn commit: samba r5905 - in branches/SAMBA_3_0/source/smbd: .
Author: vlendec
Date: 2005-03-19 18:21:39 + (Sat, 19 Mar 2005)
New Revision: 5905
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5905
Log:
Fix two warnings found by AIX. They might actually be bugs on 64-bit
platforms.
Volker
Modified:
branches/SAMBA_3_0/source/smbd/chgpasswd.c
branches/SAMBA_3_0/source/smbd/service.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/chgpasswd.c
===
--- branches/SAMBA_3_0/source/smbd/chgpasswd.c 2005-03-19 18:21:20 UTC (rev
5904)
+++ branches/SAMBA_3_0/source/smbd/chgpasswd.c 2005-03-19 18:21:39 UTC (rev
5905)
@@ -943,7 +943,8 @@
const uint8 *nt_pw;
const uint8 *pwhistory;
BOOL found = False;
- int i, pwHisLen, curr_pwHisLen;
+ int i;
+ uint32 pwHisLen, curr_pwHisLen;
account_policy_get(AP_PASSWORD_HISTORY, pwHisLen);
if (pwHisLen == 0) {
Modified: branches/SAMBA_3_0/source/smbd/service.c
===
--- branches/SAMBA_3_0/source/smbd/service.c2005-03-19 18:21:20 UTC (rev
5904)
+++ branches/SAMBA_3_0/source/smbd/service.c2005-03-19 18:21:39 UTC (rev
5905)
@@ -272,7 +272,7 @@
struct passwd *pass = NULL;
BOOL guest = False;
connection_struct *conn;
- struct stat st;
+ SMB_STRUCT_STAT st;
fstring user;
fstring dev;
svn commit: samba r5904 - in trunk/source/smbd: .
Author: vlendec
Date: 2005-03-19 18:21:20 + (Sat, 19 Mar 2005)
New Revision: 5904
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5904
Log:
Fix two warnings found by AIX. They might actually be bugs on 64-bit
platforms.
Volker
Modified:
trunk/source/smbd/chgpasswd.c
trunk/source/smbd/service.c
Changeset:
Modified: trunk/source/smbd/chgpasswd.c
===
--- trunk/source/smbd/chgpasswd.c 2005-03-19 10:28:31 UTC (rev 5903)
+++ trunk/source/smbd/chgpasswd.c 2005-03-19 18:21:20 UTC (rev 5904)
@@ -943,7 +943,8 @@
const uint8 *nt_pw;
const uint8 *pwhistory;
BOOL found = False;
- int i, pwHisLen, curr_pwHisLen;
+ int i;
+ uint32 pwHisLen, curr_pwHisLen;
pdb_get_account_policy(AP_PASSWORD_HISTORY, pwHisLen);
if (pwHisLen == 0) {
Modified: trunk/source/smbd/service.c
===
--- trunk/source/smbd/service.c 2005-03-19 10:28:31 UTC (rev 5903)
+++ trunk/source/smbd/service.c 2005-03-19 18:21:20 UTC (rev 5904)
@@ -272,7 +272,7 @@
struct passwd *pass = NULL;
BOOL guest = False;
connection_struct *conn;
- struct stat st;
+ SMB_STRUCT_STAT st;
fstring user;
fstring dev;
svn commit: samba r5906 - in branches/SAMBA_4_0/source: build/m4 build/smb_build lib/popt
Author: jelmer Date: 2005-03-19 19:31:25 + (Sat, 19 Mar 2005) New Revision: 5906 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5906 Log: Fix the usage of the internal popt (make proto should ignore it) Updated included popt to 1.7. Added: branches/SAMBA_4_0/source/lib/popt/config.mk Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4 branches/SAMBA_4_0/source/build/smb_build/main.pm branches/SAMBA_4_0/source/lib/popt/CHANGES branches/SAMBA_4_0/source/lib/popt/README branches/SAMBA_4_0/source/lib/popt/config.m4 branches/SAMBA_4_0/source/lib/popt/findme.c branches/SAMBA_4_0/source/lib/popt/findme.h branches/SAMBA_4_0/source/lib/popt/popt.c branches/SAMBA_4_0/source/lib/popt/popt.h branches/SAMBA_4_0/source/lib/popt/poptconfig.c branches/SAMBA_4_0/source/lib/popt/popthelp.c branches/SAMBA_4_0/source/lib/popt/poptint.h branches/SAMBA_4_0/source/lib/popt/poptparse.c branches/SAMBA_4_0/source/lib/popt/system.h Changeset: Sorry, the patch is too large (3905 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5906
svn commit: samba r5907 - in branches/SAMBA_3_0/source/lib: .
Author: jra
Date: 2005-03-19 20:49:09 + (Sat, 19 Mar 2005)
New Revision: 5907
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5907
Log:
Fix compile warning noticed by Jason Mader [EMAIL PROTECTED].
Bug #2483.
Jeremy.
Modified:
branches/SAMBA_3_0/source/lib/data_blob.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/data_blob.c
===
--- branches/SAMBA_3_0/source/lib/data_blob.c 2005-03-19 19:31:25 UTC (rev
5906)
+++ branches/SAMBA_3_0/source/lib/data_blob.c 2005-03-19 20:49:09 UTC (rev
5907)
@@ -47,7 +47,7 @@
if (p) {
ret.data = smb_xmemdup(p, length);
} else {
- ret.data = SMB_XMALLOC_ARRAY(char, length);
+ ret.data = SMB_XMALLOC_ARRAY(unsigned char, length);
}
ret.length = length;
ret.free = free_data_blob;
svn commit: samba r5908 - in trunk/source/lib: .
Author: jra
Date: 2005-03-19 20:49:17 + (Sat, 19 Mar 2005)
New Revision: 5908
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5908
Log:
Fix compile warning noticed by Jason Mader [EMAIL PROTECTED].
Bug #2483.
Jeremy.
Modified:
trunk/source/lib/data_blob.c
Changeset:
Modified: trunk/source/lib/data_blob.c
===
--- trunk/source/lib/data_blob.c2005-03-19 20:49:09 UTC (rev 5907)
+++ trunk/source/lib/data_blob.c2005-03-19 20:49:17 UTC (rev 5908)
@@ -47,7 +47,7 @@
if (p) {
ret.data = smb_xmemdup(p, length);
} else {
- ret.data = SMB_XMALLOC_ARRAY(char, length);
+ ret.data = SMB_XMALLOC_ARRAY(unsigned char, length);
}
ret.length = length;
ret.free = free_data_blob;
Build status as of Sun Mar 20 00:00:02 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-03-19 00:00:51.0 + +++ /home/build/master/cache/broken_results.txt 2005-03-20 00:00:22.0 + @@ -1,4 +1,4 @@ -Build status as of Sat Mar 19 00:00:02 2005 +Build status as of Sun Mar 20 00:00:02 2005 Build counts: Tree Total Broken Panic @@ -8,14 +8,14 @@ rsync36 5 0 samba1 1 1 samba-docs 0 0 0 -samba4 40 11 0 -samba_3_038 14 1 +samba4 40 12 0 +samba_3_038 13 1 Currently broken builds: Host Tree Compiler Status -aix1 samba_3_0gcc 127/?/?/? fusberta samba4 gccok/ 2/?/? fusberta samba_3_0gccok/ok/ok/ 6/PANIC +samba-s390 samba4 gccok/ 2/?/? rhonwynsamba4 gcc-4.0ok/ 2/?/? rhonwynsamba_3_0gcc-4.0ok/ 2/?/? rhonwynsamba4 tccok/ 2/?/?
svn commit: samba-web r594 - in trunk/scripts: .
Author: deryck
Date: 2005-03-20 02:31:41 + (Sun, 20 Mar 2005)
New Revision: 594
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=594
Log:
Don't include a links from article in RSS feed blurbs.
Easiest way to avoid malformed XML.
deryck
Modified:
trunk/scripts/updateNews.py
Changeset:
Modified: trunk/scripts/updateNews.py
===
--- trunk/scripts/updateNews.py 2005-03-19 10:17:58 UTC (rev 593)
+++ trunk/scripts/updateNews.py 2005-03-20 02:31:41 UTC (rev 594)
@@ -206,10 +206,16 @@
title = re.search('(?=\\).+(?=\\/a)', item_text)
link = re.search('(?=\div class=\reference\Link: \a
href=\/samba/news/).+(?=\\)', item_text)
- # Index out the HTML tags for XML
+ # Index by p to find first paragraph, but
+ # leave out the tags for XML
begin = item_text.find('p') + 3
end = item_text.find('/p')
descrip = item_text[begin:end]
+ # Remove links to avoid malformed XML
+ a_begin = re.compile('a href=(.*)')
+ a_end = re.compile('/a')
+ descrip = a_begin.sub('', descrip)
+ descrip = a_end.sub('', descrip)
feed.write('item\n')
feed.write('title' + title.group(0) + '/title\n')
svn commit: samba-web r595 - in trunk/scripts: .
Author: deryck
Date: 2005-03-20 02:54:33 + (Sun, 20 Mar 2005)
New Revision: 595
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=595
Log:
Formatting fix.
deryck
Modified:
trunk/scripts/updateNews.py
Changeset:
Modified: trunk/scripts/updateNews.py
===
--- trunk/scripts/updateNews.py 2005-03-20 02:31:41 UTC (rev 594)
+++ trunk/scripts/updateNews.py 2005-03-20 02:54:33 UTC (rev 595)
@@ -197,32 +197,32 @@
count = 10
for date in post_dates:
- item_text = all_stories[date]
- if '' in item_text and ';' in item_text:
- for ent in ents.keys():
- item_text = item_text.replace(ent, ents[ent])
-
- if count 0:
- title = re.search('(?=\\).+(?=\\/a)', item_text)
- link = re.search('(?=\div class=\reference\Link: \a
href=\/samba/news/).+(?=\\)', item_text)
+item_text = all_stories[date]
+if '' in item_text and ';' in item_text:
+for ent in ents.keys():
+item_text = item_text.replace(ent, ents[ent])
+
+if count 0:
+title = re.search('(?=\\).+(?=\\/a)', item_text)
+link = re.search('(?=\div class=\reference\Link: \a
href=\/samba/news/).+(?=\\)', item_text)
- # Index by p to find first paragraph, but
- # leave out the tags for XML
- begin = item_text.find('p') + 3
- end = item_text.find('/p')
- descrip = item_text[begin:end]
- # Remove links to avoid malformed XML
- a_begin = re.compile('a href=(.*)')
- a_end = re.compile('/a')
- descrip = a_begin.sub('', descrip)
- descrip = a_end.sub('', descrip)
+# Index by p to find first paragraph, but
+# leave out the tags for XML
+begin = item_text.find('p') + 3
+end = item_text.find('/p')
+descrip = item_text[begin:end]
+# Remove links to avoid malformed XML
+a_begin = re.compile('a href=(.*)')
+a_end = re.compile('/a')
+descrip = a_begin.sub('', descrip)
+descrip = a_end.sub('', descrip)
- feed.write('item\n')
- feed.write('title' + title.group(0) + '/title\n')
- feed.write('description' + descrip + '/description\n')
- feed.write('linkhttp://news.samba.org/' + link.group(0) +
'/link\n')
- feed.write('/item\n\n')
- count = count - 1
+feed.write('item\n')
+feed.write('title' + title.group(0) + '/title\n')
+feed.write('description' + descrip + '/description\n')
+feed.write('linkhttp://news.samba.org/' + link.group(0) +
'/link\n')
+feed.write('/item\n\n')
+count = count - 1
feed.write('/channel\n')
feed.write('/rss\n')
