[Samba] file size limitation
Dear sir I am using RedHat Enterprise Linux Release 3, which is having Samba-3.0.0- 14.3E i am trying to copy a file of size 6 gb from this server to a windows 2000 server through samba, but when 2 gb of file copied then i got a error FILE SIZE LIMIT EXCEEDED, plz tell me how can i copy this file to the window server. Waiting for your reply Amit Agarwal Network Engineer Agra Chains Pvt. Ltd. 132, Industrial Estate, Nunhai Agra-282005(U.P.), India Disclaimer: This email solely reflects the views and language of the person sending this email and the company cannot be held responsible for the accuracy and the content of this email. Privacy statement: This e-mail message and any attached files are confidential and are intended solely for the use of the addressee(s) named above. This communication may contain material protected by attorney-client, work product, or other privileges. If you are not the intended recipient or person responsible for delivering this confidential communication to the intended recipient, you have received this communication in error, and any review, use, dissemination, forwarding, printing, copying, or other distribution of this e-mail message and any attached files is strictly prohibited. If you have received this confidential communication in error, please notify the sender immediately by reply e-mail message and permanently delete the original message. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] UID of the windows Domain Administrator user?
I have installed lots of samba 3 servers as PDCs for little networks serving 10 users or so. I have always set up the user root as the domain administrator, by setting its group SID to domainSID-512 with pdbedit. My root user has usually a user SID of domainSID-1000 since it is the first user I add to Samba. I have never set up a username map to map administrator to root, I use root directly also on Windows boxes when I need to connect as the domain admin (to add workstations to the domain, for example) and I have never had issues. I have no user named administrator on the domain. Now I have read in the HOWTO collection that I should set the user SID to domainSID-500 for the administrator user since this is a predefined default SID. I have found that a NT server uses 500 indeed for its Administrator user. First, I'd like to understand why do I need an user with the 500 SID, since I have never had one and still it seems that my root user is working. Second, I'd like to know what will happen if I changhe the SID of root from 1000 to 500, now that my workstations already know the user root by its old SID. I suppose that generally is definitely NOT a good idea to change a user's SID, because this would make his files on his workstations owned by someone else. Am I right? -- Fabio Kurgan Muzzi -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] UID of the windows Domain Administrator user?
Fabio Muzzi a écrit : I have installed lots of samba 3 servers as PDCs for little networks serving 10 users or so. I have always set up the user root as the domain administrator, by setting its group SID to domainSID-512 with pdbedit. My root user has usually a user SID of domainSID-1000 since it is the first user I add to Samba. I have never set up a username map to map administrator to root, I use root directly also on Windows boxes when I need to connect as the domain admin (to add workstations to the domain, for example) and I have never had issues. I have no user named administrator on the domain. For joining a machine to domain, you must have a user with uid = 0. But, begin with samba 3.0.11, the privileges can be used for use a other user than root (uid = 0) You can read more information in this pages : http://us2.samba.org/samba/docs/man/Samba-HOWTO-Collection/rights.html Now I have read in the HOWTO collection that I should set the user SID to domainSID-500 for the administrator user since this is a predefined default SID. I have found that a NT server uses 500 indeed for its Administrator user. administrator it's the name of a user which have administrator rights like : add user manage ACL install applications in w2k workstation... First, I'd like to understand why do I need an user with the 500 SID, since I have never had one and still it seems that my root user is working. Second, I'd like to know what will happen if I changhe the SID of root from 1000 to 500, now that my workstations already know the user root by its old SID. I suppose that generally is definitely NOT a good idea to change a user's SID, because this would make his files on his workstations owned by someone else. Am I right? The root user is only used for that, but after joining a domain, changing the SID cause no problem. Actually, on my network I not enabled privileges (in my test network : yes and that work). But, I use root user only for adding machine to domain, for the rest of administration, I have a administrator user with SID = S-1-5-21-xx---500 and groupSID = S-1-5-21-xx-x-x-512 -- Stéphane Purnelle [EMAIL PROTECTED] Site Web : http://www.linuxplusvalue.be -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Unable to browse XP directory
I don't have a domain. And I can access the share, I just have to mount it manually. I can't use Konqueor, with a URL such as smb://xp/data, the way I can with OS/2 or other Linux shares. If I manually mount it, I can browse through the mount point, as normal. I seem to recall there was an XP registry setting for that, but I don't remember what it was. [EMAIL PROTECTED] wrote: James, it could have something to do with the fact that XP Home is a stripped down XP Pro that will not function in a domain. Point of fact, I have had trouble getting two XP Home boxes to peer to peer file share with each other. The amount of aggravation just gave way to an upgrade. James Knott [EMAIL PROTECTED] wrote on 06/04/2005, 04:54:56 AM: I'm trying to access a share on an XP Home system, from SuSE 9.3, using Samba. When I use Konqueror to browse, I can't see anything under the shared directory (D:\), though I can see the contents of the SharedDocs folder. If I mount the XP share manually, I can then see all the files. Any idea, why Konqueror can't browse that directory? tnx jk -- 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[2]: [Samba] UID of the windows Domain Administrator user?
Hello Stéphane, Saturday, June 4, 2005, 2:02:28 PM, you wrote: SP For joining a machine to domain, you must have a user with uid = 0. SP But, begin with samba 3.0.11, the privileges can be used for use a other SP user than root (uid = 0) SP You can read more information in this pages : SP http://us2.samba.org/samba/docs/man/Samba-HOWTO-Collection/rights.html Yes, i have read this even if i have not yet tried it. What I have not understood is why do I *need* an user with a SID ending in 500 (as the howto says), because I have never had one, and I had no problems at all. The howto says I need one, but id does not say why, and what happens id I don't have one. SP The root user is only used for that, but after joining a domain, SP changing the SID cause no problem. You say that I can change the SID of a domain user and the clients will not get confused by this change? SP Actually, on my network I not enabled privileges (in my test network : SP yes and that work). But, I use root user only for adding machine to SP domain, for the rest of administration, I have a administrator user SP with SID = S-1-5-21-xx---500 and groupSID = SP S-1-5-21-xx-x-x-512 Well, this seems to be a good idea anyway. -- Fabio Kurgan Muzzi -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Failure
www.JESUCRISTO.net Respuesta automática a su e-mail. No responda a este e-mail. Reponderemos personalmente a su mensaje a la mayor brevedad posible. Dios le bendiga muy grandemente. Webmaster -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] UID of the windows Domain Administrator user?
Fabio Muzzi a écrit : Hello Stéphane, Saturday, June 4, 2005, 2:02:28 PM, you wrote: SP For joining a machine to domain, you must have a user with uid = 0. SP But, begin with samba 3.0.11, the privileges can be used for use a other SP user than root (uid = 0) SP You can read more information in this pages : SP http://us2.samba.org/samba/docs/man/Samba-HOWTO-Collection/rights.html Yes, i have read this even if i have not yet tried it. What I have not understood is why do I *need* an user with a SID ending in 500 (as the howto says), because I have never had one, and I had no problems at all. The howto says I need one, but id does not say why, and what happens id I don't have one. I suppose can be cause problem in AD mode or with some communication with windows server. SP The root user is only used for that, but after joining a domain, SP changing the SID cause no problem. You say that I can change the SID of a domain user and the clients will not get confused by this change? sorry, I changed the SID to 500 for my administrator account, not for root user. I cannot says if changing root account can make some problem. SP Actually, on my network I not enabled privileges (in my test network : SP yes and that work). But, I use root user only for adding machine to SP domain, for the rest of administration, I have a administrator user SP with SID = S-1-5-21-xx---500 and groupSID = SP S-1-5-21-xx-x-x-512 Well, this seems to be a good idea anyway. -- Stéphane Purnelle [EMAIL PROTECTED] Site Web : http://www.linuxplusvalue.be -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] smbd slow to start when using ldapsam backend
Has anyone else experienced a nominal delay when starting smbd when the backend is ldapsam? I have noticed smbd slower to start after rebooting my linux box. The logs don't seem to reveal any errors. If anyone has experienced this and solved it, kindly enlighten me. Thanks in advance, Matt -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] smbd slow to start when using ldapsam backend
Matt Schwartz schrieb: Has anyone else experienced a nominal delay when starting smbd when the backend is ldapsam? I have noticed smbd slower to start after rebooting my linux box. The logs don't seem to reveal any errors. If anyone has experienced this and solved it, kindly enlighten me. What is your nominal delay? is it half a second or several seconds (20, 30, more)? Long delays when starting Samba may indicate: - problems communicating with an LDAP server (is your LDAP server on the same machine as Samba server)? - problems in the LDAP server itself - configuration problems You may increase the log level, both for Samba and LDAP, and see what's happening. Quick checks: Does getent passwd list all system users, including the ones in the LDAP server? Is getent passwd fast, or rather it begins to slow down when it starts to list the users from the LDAP database? -- Tomek -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] One User, One Ldap, Multiple Domains
b) We are going to be missing out on fun things like ldapsam:trusted=yes by staying with ldapsam_compat I believe so. I would suggest looking into speed improvements (such as the continuing work on this) before breaking your ldap into tiny pieces. One domain really should be the way to do this. I know :-/ Is 20,000+ users in a domain something that samba can do quickly yet? As far as I know we've done all the standard things - indexes in openldap, nscd on the PDC quick hardware. Openldap is certainly quick enough - the entire people OU comes back in about 5-6 seconds, so I've run out of obvious things to tweak. Is ldapsam *that much* quicker than ldapsam_compat for large numbers of users? I think trusted=yes would make a big difference, also if possible use LDAP over a domain socket ldapi:/// rather than a network socket. But no matter what I think enumerating that many users is going to be slow; I'm curious why you have to enumerate all the users, in the security tab don't you perform a search? Also make sure all you user's groups match to a samba mapped group; we saw awhile ago that having Samba users in groups that weren't mapped seemed to slow things down inside Samba somewhere. (Maybe this is resolved in more recent versions, this was awhile ago). 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] Winbind not mapping new user groups
Problem: When a user is added to a group on the W2K3, the group is not mapped to the user on the Samba server. System: FreeBSD 5.2.1-RELEASE #0: Mon Feb 23 20:45:55 GMT 2004 Network: Windows 2003 (no SP1) AD Samba Version: Version 3.0.14a Security = ads Kerberos: heimdal-0.6.3_2 Diagnosis: Winbind log shows the following errors: nsswitch/winbindd_user.c:winbindd_getpwuid(238) could not convert uid 10143 to SID wbinfo -r username doesn't show the uid of the new group More info: Samba running on another machine with the same BSD release, heimdal and Samba versions does not exhibit the same problems Troubleshooting: I removed the winbind.tdb files and restarted Samba and then reset the permissions on the files. This had no effect. Any ideas? Mark Irving -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] smbldap-tools and joining workstation to domain
Hi,
I've reported this before but I guess I'll have to do it again, since
it's not fixed yet or I'm understanding something wrong here.
The problem is that smbldap-useradd -w 'machinename' will add only
posixAccount entrys into ldap but it should add both posixAccount and
sambaSAMAccount entrys.
So if one doesn't add correct machine account entrys manually to ldap
the windows workstation domain joining is impossible.
The Samba Openldap howto clearly documents that smbldap-useradd -w
'worsktation' should produce following entrys in ldap:
dn: uid=testhost3$,ou=Computers,dc=IDEALX,dc=ORG
objectClass: top
objectClass: posixAccount
objectClass: sambaSAMAccount
cn: testhost3$
gidNumber: 553
homeDirectory: /dev/null
loginShell: /bin/false
uid: testhost3$
uidNumber: 1005
sambaPwdLastSet: 0
sambaLogonTime: 0
sambaLogoffTime: 2147483647
sambaKickoffTime: 2147483647
sambaPwdCanChange: 0
sambaPwdMustChange: 2147483647
description: Computer Account
rid: 0
primaryGroupID: 0
lmPassword: 7582BF7F733351347D485E46C8E6306E
ntPassword: 7582BF7F733351347D485E46C8E6306E
acctFlags: [W ]
Looking at smbldap-useradd script code I can see that sambaSAMAccount
entrys are only added when -i switch is used (trusted workstation account).
--- CODE SNIP
# MACHINE ACCOUNT
if (defined($Options{'w'}) or defined($Options{'i'})) {
#print About to create machine $userName:\n;
if (!add_posix_machine
($userName,$userUidNumber,$userGidNumber,$Options{'t'})) {
die $0: error while adding posix account\n;
}
if (defined($Options{'i'})) {
# For machine trust account
# Objectclass sambaSAMAccount must be added now !
my $pass;
my $pass2;
system stty -echo;
print New password : ;
chomp($pass=STDIN);
print \n;
system stty echo;
system stty -echo;
print Retype new password : ;
chomp($pass2=STDIN);
print \n;
system stty echo;
if ($pass ne $pass2) {
print New passwords don't match!\n;
exit (10);
}
my ($lmpassword,$ntpassword) = ntlmgen $pass;
my $date=time;
my $modify = $ldap_master-modify (
uid=$userName,$config{computersdn},
changes = [
replace = [objectClass = ['inetOrgPerson', 'posixAccount',
'sambaSAMAccount']],
add = [sambaLogonTime =
'0'],
add = [sambaLogoffTime =
'2147483647'],
add = [sambaKickoffTime =
'2147483647'],
add = [sambaPwdCanChange
= '0'],
add = [sambaPwdMustChange
= '2147483647'],
add = [sambaPwdLastSet =
$date],
add = [sambaAcctFlags =
'[I ]'],
add = [sambaLMPassword =
$lmpassword],
add = [sambaNTPassword =
$ntpassword],
add = [sambaSID =
$user_sid],
add = [sambaPrimaryGroupSID =
$config{SID}-515]
]
);
$modify-code die failed to add entry: , $modify-error ;
}
$ldap_master-unbind;
exit 0;
}
--- CODE SNIP END --
So whats the deal - misleading howto document or bug in smbldap-useradd
script or I'm getting something wrong here?
Cheers,
--
--
Andres Toomsalu, [EMAIL PROTECTED]
juhataja - general manager, OÜ Active Systems
Lille 4-205, Pärnu 80041, phone +372 44 70 595
GSM +372 56 496 124, IM: [EMAIL PROTECTED]
http://www.active.ee
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] apache authentication using ad kerberos
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Thanks Samba Team! I was able to utilize AD kerberos authentication to apache using mod_auth_kerb and samba. The 'net ads keytab create' enabled me to create a machine keytab for the webserver. The 'net ads keytab add' feature enabled me to add an 'HTTP' service principal to this keytab, which shows up in the AD machine object's attributes. I did not have to create a user in AD and map the attributes (as in this doc: http://www.microsoft.com/windows2000/techinfo/planning/security/kerbsteps.asp), so for all intents and purposes this is a seamless operation. AD single sign on using GSSAPI is working for windows firefox and internet exploiter clients beautifully! I will be writing up a doc on this soon (this weekend) at oslabs.mikro-net.com. Thanks again for the tireless efforts of the Samba Team! -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.1 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCodriKgGND9z3oKwRAgQaAJ4jxYwxj1qKxjJAwZGMwKXOEAcSqgCgmcTy e8rGiG2kV6bv1XkMzxNsV78= =VwZI -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] Broken Samba in OS X. Any Alternatives?
We all know that in Mac OS X 10.4, and in the upgrade 10.4.1, Apple managed to break Samba. Now, I am at a great loss for remote filesystem mounting. Not only is Samba broken, but NFS is questionable (I can never seem to get rid of that incorrect username/ password error and retain read/write abilities). Also, I'm have trouble with netatalkd for Debian. Are there any other filesystem sharing systems that could work with OS X? I mean until Samba gets fixed. Because of its continued use as a heating duct sealant, duct tape now surrounds us. Time and exposure to high temperatures slowly breaks duct tape down, and tiny particles drift into ducts where they are eventually carried into the air. And so, duct tape is like God. It's everywhere. --The Duct Tape Book editor, Tony -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] smbldap-tools and joining workstation to domain
Hi,
With samba-3.0, smbldap-tools msu add only PosixAccount, it's samba
which add samba attribute to LDAP.
NOTE : what is the ldap filter parameter in smb.conf
In samba.idealx.org, you must use the howto available here :
http://samba.idealx.org/smbldap-howto.fr.html
Andres Toomsalu a écrit :
Hi,
I've reported this before but I guess I'll have to do it again, since
it's not fixed yet or I'm understanding something wrong here.
The problem is that smbldap-useradd -w 'machinename' will add only
posixAccount entrys into ldap but it should add both posixAccount and
sambaSAMAccount entrys.
So if one doesn't add correct machine account entrys manually to ldap
the windows workstation domain joining is impossible.
The Samba Openldap howto clearly documents that smbldap-useradd -w
'worsktation' should produce following entrys in ldap:
dn: uid=testhost3$,ou=Computers,dc=IDEALX,dc=ORG
objectClass: top
objectClass: posixAccount
objectClass: sambaSAMAccount
cn: testhost3$
gidNumber: 553
homeDirectory: /dev/null
loginShell: /bin/false
uid: testhost3$
uidNumber: 1005
sambaPwdLastSet: 0
sambaLogonTime: 0
sambaLogoffTime: 2147483647
sambaKickoffTime: 2147483647
sambaPwdCanChange: 0
sambaPwdMustChange: 2147483647
description: Computer Account
rid: 0
primaryGroupID: 0
lmPassword: 7582BF7F733351347D485E46C8E6306E
ntPassword: 7582BF7F733351347D485E46C8E6306E
acctFlags: [W ]
Looking at smbldap-useradd script code I can see that sambaSAMAccount
entrys are only added when -i switch is used (trusted workstation
account).
--- CODE SNIP
# MACHINE ACCOUNT
if (defined($Options{'w'}) or defined($Options{'i'})) {
#print About to create machine $userName:\n;
if (!add_posix_machine
($userName,$userUidNumber,$userGidNumber,$Options{'t'})) {
die $0: error while adding posix account\n;
}
if (defined($Options{'i'})) {
# For machine trust account
# Objectclass sambaSAMAccount must be added now !
my $pass;
my $pass2;
system stty -echo;
print New password : ;
chomp($pass=STDIN);
print \n;
system stty echo;
system stty -echo;
print Retype new password : ;
chomp($pass2=STDIN);
print \n;
system stty echo;
if ($pass ne $pass2) {
print New passwords don't match!\n;
exit (10);
}
my ($lmpassword,$ntpassword) = ntlmgen $pass;
my $date=time;
my $modify = $ldap_master-modify (
uid=$userName,$config{computersdn},
changes = [
replace = [objectClass =
['inetOrgPerson', 'posixAccount', 'sambaSAMAccount']],
add = [sambaLogonTime = '0'],
add = [sambaLogoffTime = '2147483647'],
add = [sambaKickoffTime = '2147483647'],
add = [sambaPwdCanChange = '0'],
add = [sambaPwdMustChange = '2147483647'],
add = [sambaPwdLastSet = $date],
add = [sambaAcctFlags = '[I ]'],
add = [sambaLMPassword = $lmpassword],
add = [sambaNTPassword = $ntpassword],
add = [sambaSID = $user_sid],
add = [sambaPrimaryGroupSID =
$config{SID}-515]
]
);
$modify-code die failed to add entry: , $modify-error ;
}
$ldap_master-unbind;
exit 0;
}
--- CODE SNIP END --
So whats the deal - misleading howto document or bug in
smbldap-useradd script or I'm getting something wrong here?
Cheers,
--
Stéphane Purnelle [EMAIL PROTECTED]
Site Web : http://www.linuxplusvalue.be
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Broken Samba in OS X. Any Alternatives?
On Sat, Jun 04, 2005 at 11:51:44AM -0500, Kichigai Mentat wrote: We all know that in Mac OS X 10.4, and in the upgrade 10.4.1, Apple managed to break Samba. Now, I am at a great loss for remote filesystem mounting. Not only is Samba broken, but NFS is questionable (I can never seem to get rid of that incorrect username/ password error and retain read/write abilities). Also, I'm have trouble with netatalkd for Debian. Are there any other filesystem sharing systems that could work with OS X? I mean until Samba gets fixed. Is there a reason you can't just compile Samba source from samba.org on OS X to fix the problem ? Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: [idx-smbldap-tools ] smbldap-tools and joining workstation to domain
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Andres Andres Toomsalu schrieb: The problem is that smbldap-useradd -w 'machinename' will add only posixAccount entrys into ldap but it should add both posixAccount and sambaSAMAccount entrys. So if one doesn't add correct machine account entrys manually to ldap the windows workstation domain joining is impossible. As Jerome said samba would add the additional necessary attributes when the workstation joins the domain. The ldap script has only to add the posix stuff. I do not know if this is correct because sometimes I have also the problem that some workstations could not join the domain. If I check then the ldap I could only see the entries necessary for a posixAccount. If I delete this information from ldap my workstation is able to join the domain which failed before... But only 2 to 5 of 200 workstations will fail... I hope this will help you. kindly regards rOger -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.4 (MingW32) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCohFgpF3l9rYt4bARAowhAJ0QgNETJ8lMRO1lER3hAYwDJgSDDACcDy/C N4KB4IuE3zeVPn6WeKoFPfw= =P8d4 -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] Loading new profile: reverts to classic and cant change...
Please help! I'm really confused. I've been reinstalling windows on my windows xp box. The problems I had earlier with the roaming user not able to log in at all are sorted: I figured it must be samba caching the old sid of the old PC, and by forcing samba to recreate it (move /var/cache/samba to samba.old) I found I could log in with the roaming profile again. The problem now is that settings on the login have been changed. For example, before this I had Coffee bean background and the XP Themed appearance. Now, as it loads, it starts to set coffee bean, then replaces it with windows-blue, and the windows style is classic. Moreover, I can't change the desktop or theme at all, and icons refuse to stay put if I move them. In the old setup, I had Outlook all set up nicely. Now, although it starts up it says it can't load, and exits. What's gone wrong? Regards, Ruth -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] apache authentication using ad kerberos
On Sat, 2005-06-04 at 09:46 -0700, Michael Brown wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Thanks Samba Team! I was able to utilize AD kerberos authentication to apache using mod_auth_kerb and samba. The 'net ads keytab create' enabled me to create a machine keytab for the webserver. The 'net ads keytab add' feature enabled me to add an 'HTTP' service principal to this keytab, which shows up in the AD machine object's attributes. I did not have to create a user in AD and map the attributes (as in this doc: http://www.microsoft.com/windows2000/techinfo/planning/security/kerbsteps.asp), so for all intents and purposes this is a seamless operation. AD single sign on using GSSAPI is working for windows firefox and internet exploiter clients beautifully! I will be writing up a doc on this soon (this weekend) at oslabs.mikro-net.com. Make sure to bring all documentation to the attention of jht (cc'd). It is very good to see this working. Should you find yourself needing the NTLM side of things, look at: http://samba.org/ftp/unpacked/lorikeet/mod_ntlm_winbind/ 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
Re: [Samba] Help. . .read socket data errors
I am using the defaults that came with the samba RPM package on Mandrake 10.1. For socket options, it has: socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 Is that something that may fix the problem if I change it? Pablo [EMAIL PROTECTED] wrote: Pablo, you might have incorrectly set some settings in smb.conf. Check your settings for socket options. I don't mess with any of the options except for socket options = TCP_NODELAY because I get a dramatic speed increase. CompuGenic [EMAIL PROTECTED] wrote on 06/04/2005, 05:26:49 AM: I have samba setup as a fileserver with winbind on an NT 4 domain. I keep getting the errors shown below constantly, and have no clue what could be causing it. If you have any clues please let me know. Jun 3 18:08:27 baker smbd[7436]: [2005/06/03 18:08:27, 0] lib/util_sock.c:read_socket_data(384) Jun 3 18:08:27 baker smbd[7436]: read_socket_data: recv failure for 4. Error = Connection reset by peer Jun 3 18:15:15 baker smbd[6159]: [2005/06/03 18:15:15, 0] lib/util_sock.c:read_socket_data(384) Jun 3 18:15:15 baker smbd[6159]: read_socket_data: recv failure for 4. Error = Connection reset by peer Jun 3 18:36:17 baker smbd[7437]: [2005/06/03 18:36:17, 0] lib/util_sock.c:read_socket_data(384) Jun 3 18:36:17 baker smbd[7437]: read_socket_data: recv failure for 4. Error = Connection timed out Thanks, Pablo -- 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] Help. . .read socket data errors
Im having the same problem in several samba servers pdc with the latest version and old versions too. Clients are win98, nt4, win2k and win2k3. I was unable to find out the reason of this messages. CompuGenic wrote: I am using the defaults that came with the samba RPM package on Mandrake 10.1. For socket options, it has: socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 Is that something that may fix the problem if I change it? Pablo [EMAIL PROTECTED] wrote: Pablo, you might have incorrectly set some settings in smb.conf. Check your settings for socket options. I don't mess with any of the options except for socket options = TCP_NODELAY because I get a dramatic speed increase. CompuGenic [EMAIL PROTECTED] wrote on 06/04/2005, 05:26:49 AM: I have samba setup as a fileserver with winbind on an NT 4 domain. I keep getting the errors shown below constantly, and have no clue what could be causing it. If you have any clues please let me know. Jun 3 18:08:27 baker smbd[7436]: [2005/06/03 18:08:27, 0] lib/util_sock.c:read_socket_data(384) Jun 3 18:08:27 baker smbd[7436]: read_socket_data: recv failure for 4. Error = Connection reset by peer Jun 3 18:15:15 baker smbd[6159]: [2005/06/03 18:15:15, 0] lib/util_sock.c:read_socket_data(384) Jun 3 18:15:15 baker smbd[6159]: read_socket_data: recv failure for 4. Error = Connection reset by peer Jun 3 18:36:17 baker smbd[7437]: [2005/06/03 18:36:17, 0] lib/util_sock.c:read_socket_data(384) Jun 3 18:36:17 baker smbd[7437]: read_socket_data: recv failure for 4. Error = Connection timed out Thanks, Pablo -- 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] Help. . .read socket data errors
Matt, You're right. . .the options used by Mandrake are not all the defaults. The default is only the TCP_NODELAY. I will try removing the extra socket options, and even adding the IPTOS_LOWDELAY option and see if that fixes the issue. Any other ideas are more than welcome. Thanks, Pablo Matt Schwartz wrote: Pablo, consult the man page on smb.conf for the default settings of the socket options. I am not sure if the ones you used are defaults as per samba CompuGenic wrote: I am using the defaults that came with the samba RPM package on Mandrake 10.1. For socket options, it has: socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 Is that something that may fix the problem if I change it? Pablo [EMAIL PROTECTED] wrote: Pablo, you might have incorrectly set some settings in smb.conf. Check your settings for socket options. I don't mess with any of the options except for socket options = TCP_NODELAY because I get a dramatic speed increase. CompuGenic [EMAIL PROTECTED] wrote on 06/04/2005, 05:26:49 AM: I have samba setup as a fileserver with winbind on an NT 4 domain. I keep getting the errors shown below constantly, and have no clue what could be causing it. If you have any clues please let me know. Jun 3 18:08:27 baker smbd[7436]: [2005/06/03 18:08:27, 0] lib/util_sock.c:read_socket_data(384) Jun 3 18:08:27 baker smbd[7436]: read_socket_data: recv failure for 4. Error = Connection reset by peer Jun 3 18:15:15 baker smbd[6159]: [2005/06/03 18:15:15, 0] lib/util_sock.c:read_socket_data(384) Jun 3 18:15:15 baker smbd[6159]: read_socket_data: recv failure for 4. Error = Connection reset by peer Jun 3 18:36:17 baker smbd[7437]: [2005/06/03 18:36:17, 0] lib/util_sock.c:read_socket_data(384) Jun 3 18:36:17 baker smbd[7437]: read_socket_data: recv failure for 4. Error = Connection timed out Thanks, Pablo -- 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] SOLVED? HELP! After upgrade, can't get at my shares
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Commented this out in the homes share and the problem went away: ;hide special files = Yes What happened: 1. I rarely ever do upgrades. Since I keep good backups, I almost always do clean installs. Keeps me honest with the backups for one thing. Anyway, under these conditions Mandriva will sometimes assume that any subdirectory under /home is supposed to be a user. So what it does under the conditions of a clean install is it will create at least one user using one of these and assign that directory to them. In other words it created a user storeage (complete with mis-spelling) and assigned the /home/storeage directory to that user. This WAS my public directory assigned to nobody.nogroup. I had to change it back in order to make it available again. So anyway, that is not a Samba issue. I wish Mandriva had back-ported the Samba packages so that I wouldn't have had to cope with both an OS upgrade AND a Samba upgrade simultaneously. I think that in the future I will download the old packages first and use them after an OS upgrade for a while. 2. The line hide special files = Yes seems to be causing Samba to hide ALL files. That is why I could not access my homes share. It's definitely a bug but it is one I can life with now that I know how to get around it. Methodology for solving this was to disable the majority of the lines in the share and then enable them one at a time until the problem child was discovered. This was not a problem in 3.0.10 Jim C. -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (MingW32) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCooYYB4AhF6wVFMERAp5dAJ9OHSAWfpB5vu5kIgfnEaBHnS99qQCfcZPG QS+vhm32yQE1dvV39QXNwu4= =oC+M -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba r7265 - in branches/SAMBA_4_0/source/lib: .
Author: tridge
Date: 2005-06-04 06:45:11 + (Sat, 04 Jun 2005)
New Revision: 7265
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7265
Log:
fixed d_printf() so it works again.
Jelmer, can you give me a hint as to why you changed this? It
completely broke smbclient, and the change now makes d_printf() almost
equivalent to printf() as you removed the language translation
code. See your commit 7166.
Did you intend to reenable language handling by some other method? Or
do you just mean to remove it completely?
Modified:
branches/SAMBA_4_0/source/lib/dprintf.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/dprintf.c
===
--- branches/SAMBA_4_0/source/lib/dprintf.c 2005-06-04 05:35:27 UTC (rev
7264)
+++ branches/SAMBA_4_0/source/lib/dprintf.c 2005-06-04 06:45:11 UTC (rev
7265)
@@ -35,12 +35,12 @@
{
char *p, *p2;
int ret, maxlen, clen;
- char *msgstr;
va_list ap2;
+ /* do any message translations */
VA_COPY(ap2, ap);
- ret = vasprintf(p, msgstr, ap2);
+ ret = vasprintf(p, format, ap2);
if (ret = 0) return ret;
svn commit: samba r7266 - in branches/SAMBA_4_0/source/scripting: . ejs
Author: tpot Date: 2005-06-04 07:04:43 + (Sat, 04 Jun 2005) New Revision: 7266 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7266 Log: Split the different types of js function defines into separate files, as there are going to be a lot more of them. Added: branches/SAMBA_4_0/source/scripting/ejs/smbcalls.h branches/SAMBA_4_0/source/scripting/ejs/smbcalls_config.c branches/SAMBA_4_0/source/scripting/ejs/smbcalls_ldb.c branches/SAMBA_4_0/source/scripting/ejs/smbcalls_nbt.c Modified: branches/SAMBA_4_0/source/scripting/config.mk branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c Changeset: Sorry, the patch is too large (687 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7266
svn commit: samba r7267 - in branches/SAMBA_4_0: source/scripting/ejs swat
Author: idra
Date: 2005-06-04 08:23:15 + (Sat, 04 Jun 2005)
New Revision: 7267
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7267
Log:
REMOTE_HOST is a better choice
Modified:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c
branches/SAMBA_4_0/swat/login.esp
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c 2005-06-04 07:04:43 UTC
(rev 7266)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c 2005-06-04 08:23:15 UTC
(rev 7267)
@@ -71,54 +71,85 @@
ejsSetReturnValue(eid, mprList(name, list));
}
-static int ejs_userAuth(MprVarHandle eid, int argc, char **argv)
+static int ejs_systemAuth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char
*username, const char *password, const char *domain, const char *remote_host)
{
struct auth_usersupplied_info *user_info = NULL;
struct auth_serversupplied_info *server_info = NULL;
struct auth_context *auth_context;
- TALLOC_CTX *tmp_ctx;
- struct MprVar auth;
+ const char *auth_unix[] = { unix, NULL };
NTSTATUS nt_status;
DATA_BLOB pw_blob;
- if (argc != 3 || *argv[0] == 0 || *argv[2] == 0) {
- ejsSetErrorMsg(eid, userAuth invalid arguments);
+ nt_status = auth_context_create(tmp_ctx, auth_unix, auth_context);
+ if (!NT_STATUS_IS_OK(nt_status)) {
+ mprSetPropertyValue(auth, result, mprCreateBoolVar(False));
+ mprSetPropertyValue(auth, report, mprCreateStringVar(Auth
System Failure, 0));
+ goto done;
+ }
+
+ pw_blob = data_blob(password, strlen(password)),
+ make_user_info(tmp_ctx, username, username,
+ domain, domain,
+ remote_host, remote_host,
+ NULL, NULL,
+ NULL, NULL,
+ pw_blob, False,
+ USER_INFO_CASE_INSENSITIVE_USERNAME |
+ USER_INFO_DONT_CHECK_UNIX_ACCOUNT,
+ user_info);
+ nt_status = auth_check_password(auth_context, tmp_ctx, user_info,
server_info);
+ if (!NT_STATUS_IS_OK(nt_status)) {
+ mprSetPropertyValue(auth, result, mprCreateBoolVar(False));
+ mprSetPropertyValue(auth, report, mprCreateStringVar(Login
Failed, 0));
+ goto done;
+ }
+
+ mprSetPropertyValue(auth, result,
mprCreateBoolVar(server_info-authenticated));
+ mprSetPropertyValue(auth, username,
mprCreateStringVar(server_info-account_name, 0));
+ mprSetPropertyValue(auth, domain,
mprCreateStringVar(server_info-domain_name, 0));
+
+done:
+ return 0;
+}
+
+/*
+ perform user authentication, returning an array of results
+
+ syntax:
+var authinfo = new Object();
+authinfo.username = myname;
+authinfo.password = mypass;
+authinfo.domain = mydom;
+authinfo.rhost = request['REMOTE_HOST'];
+auth = userAuth(authinfo);
+*/
+static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+ TALLOC_CTX *tmp_ctx;
+ const char *username;
+ const char *password;
+ const char *domain;
+ const char *remote_host;
+ struct MprVar auth;
+
+ if (argc != 1 || argv[0]-type != MPR_TYPE_OBJECT) {
+ ejsSetErrorMsg(eid, userAuth invalid arguments, this function
requires an object.);
return -1;
}
+ username = mprToString(mprGetProperty(argv[0], username, NULL));
+ password = mprToString(mprGetProperty(argv[0], password, NULL));
+ domain = mprToString(mprGetProperty(argv[0], domain, NULL));
+ remote_host = mprToString(mprGetProperty(argv[0], rhost, NULL));
+
tmp_ctx = talloc_new(mprMemCtx());
auth = mprCreateObjVar(auth, MPR_DEFAULT_HASH_SIZE);
- if (strcmp(System User, argv[2]) == 0) {
- const char *auth_unix[] = { unix, NULL };
+ if (strcmp(System User, domain) == 0) {
- nt_status = auth_context_create(tmp_ctx, auth_unix,
auth_context);
- if (!NT_STATUS_IS_OK(nt_status)) {
- mprSetPropertyValue(auth, result,
mprCreateBoolVar(False));
- mprSetPropertyValue(auth, report,
mprCreateStringVar(Auth System Failure, 0));
- goto done;
- }
+ ejs_systemAuth(tmp_ctx, auth, username, password, domain,
remote_host);
+ } else {
- pw_blob = data_blob(argv[1], strlen(argv[1])),
- make_user_info(tmp_ctx, argv[0], argv[0],
- argv[2], argv[2],
- foowks, fooip,
- NULL, NULL,
-
svn commit: samba r7268 - in branches/SAMBA_4_0/source/scripting/ejs: .
Author: idra
Date: 2005-06-04 08:54:07 + (Sat, 04 Jun 2005)
New Revision: 7268
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7268
Log:
allocate the strings to avoid them disappearing under our feet
Modified:
branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c 2005-06-04 08:23:15 UTC
(rev 7267)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c 2005-06-04 08:54:07 UTC
(rev 7268)
@@ -83,7 +83,7 @@
nt_status = auth_context_create(tmp_ctx, auth_unix, auth_context);
if (!NT_STATUS_IS_OK(nt_status)) {
mprSetPropertyValue(auth, result, mprCreateBoolVar(False));
- mprSetPropertyValue(auth, report, mprCreateStringVar(Auth
System Failure, 0));
+ mprSetPropertyValue(auth, report, mprCreateStringVar(Auth
System Failure, 1));
goto done;
}
@@ -100,13 +100,13 @@
nt_status = auth_check_password(auth_context, tmp_ctx, user_info,
server_info);
if (!NT_STATUS_IS_OK(nt_status)) {
mprSetPropertyValue(auth, result, mprCreateBoolVar(False));
- mprSetPropertyValue(auth, report, mprCreateStringVar(Login
Failed, 0));
+ mprSetPropertyValue(auth, report, mprCreateStringVar(Login
Failed, 1));
goto done;
}
mprSetPropertyValue(auth, result,
mprCreateBoolVar(server_info-authenticated));
- mprSetPropertyValue(auth, username,
mprCreateStringVar(server_info-account_name, 0));
- mprSetPropertyValue(auth, domain,
mprCreateStringVar(server_info-domain_name, 0));
+ mprSetPropertyValue(auth, username,
mprCreateStringVar(server_info-account_name, 1));
+ mprSetPropertyValue(auth, domain,
mprCreateStringVar(server_info-domain_name, 1));
done:
return 0;
@@ -151,7 +151,7 @@
} else {
mprSetPropertyValue(auth, result, mprCreateBoolVar(False));
- mprSetPropertyValue(auth, report,
mprCreateStringVar(Unknown Domain, 0));
+ mprSetPropertyValue(auth, report,
mprCreateStringVar(Unknown Domain, 1));
}
done:
svn commit: samba r7269 - in branches/SAMBA_4_0/source/auth: .
Author: abartlet Date: 2005-06-04 11:10:57 + (Sat, 04 Jun 2005) New Revision: 7269 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7269 Log: talloc_steal() is preferred where possible, as it can't fail and does not have some of the issues of talloc_reference(). Andrew Bartlett Modified: branches/SAMBA_4_0/source/auth/auth_sam.c Changeset: Modified: branches/SAMBA_4_0/source/auth/auth_sam.c === --- branches/SAMBA_4_0/source/auth/auth_sam.c 2005-06-04 08:54:07 UTC (rev 7268) +++ branches/SAMBA_4_0/source/auth/auth_sam.c 2005-06-04 11:10:57 UTC (rev 7269) @@ -431,9 +431,9 @@ server_info-n_domain_groups = group_ret; server_info-domain_groups = groupSIDs; - server_info-account_name = talloc_reference(server_info, samdb_result_string(msgs[0], sAMAccountName, NULL)); + server_info-account_name = talloc_steal(server_info, samdb_result_string(msgs[0], sAMAccountName, NULL)); - server_info-domain_name = talloc_reference(server_info, samdb_result_string(msgs_domain[0], nETBIOSName, NULL)); + server_info-domain_name = talloc_steal(server_info, samdb_result_string(msgs_domain[0], nETBIOSName, NULL)); str = samdb_result_string(msgs[0], displayName, ); server_info-full_name = talloc_strdup(server_info, str);
svn commit: lorikeet r331 - in trunk/heimdal/lib/krb5: .
Author: abartlet
Date: 2005-06-04 11:16:40 + (Sat, 04 Jun 2005)
New Revision: 331
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=331
Log:
Add a function to free a kerberos logging facility. Previously we
could only close it.
Andrew Bartlett
Modified:
trunk/heimdal/lib/krb5/krb5-protos.h
trunk/heimdal/lib/krb5/log.c
Changeset:
Modified: trunk/heimdal/lib/krb5/krb5-protos.h
===
--- trunk/heimdal/lib/krb5/krb5-protos.h2005-06-04 02:02:08 UTC (rev
330)
+++ trunk/heimdal/lib/krb5/krb5-protos.h2005-06-04 11:16:40 UTC (rev
331)
@@ -1535,6 +1535,11 @@
krb5_ticket */*ticket*/);
krb5_error_code KRB5_LIB_FUNCTION
+krb5_freelog (
+ krb5_context /*context*/,
+ krb5_log_facility */*fac*/);
+
+krb5_error_code KRB5_LIB_FUNCTION
krb5_fwd_tgt_creds (
krb5_context /*context*/,
krb5_auth_context /*auth_context*/,
Modified: trunk/heimdal/lib/krb5/log.c
===
--- trunk/heimdal/lib/krb5/log.c2005-06-04 02:02:08 UTC (rev 330)
+++ trunk/heimdal/lib/krb5/log.c2005-06-04 11:16:40 UTC (rev 331)
@@ -135,6 +135,16 @@
}
krb5_error_code KRB5_LIB_FUNCTION
+krb5_freelog(krb5_context context,
+krb5_log_facility *fac)
+{
+krb5_closelog(context, fac);
+free(fac-program);
+free(fac);
+return 0;
+}
+
+krb5_error_code KRB5_LIB_FUNCTION
krb5_addlog_func(krb5_context context,
krb5_log_facility *fac,
int min,
@@ -367,6 +377,8 @@
int i;
for(i = 0; i fac-len; i++)
(*fac-val[i].close)(fac-val[i].data);
+
+fac-len = 0;
return 0;
}
svn commit: samba r7270 - in branches/SAMBA_4_0/source: auth/gensec auth/kerberos kdc
Author: abartlet Date: 2005-06-04 11:17:05 + (Sat, 04 Jun 2005) New Revision: 7270 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7270 Log: A big revamp to the way we handle kerberos errors in Samba4. We now fill in the function pointers to handle the logging, and catch all the kerberos warnings. (Currently at level 3). To avoid a memory leak, this requries a new function: krb5_freelog(), which I've added to lorikeet/heimdal. This also required a revamp to how we handle the krb5_context, so as to make it easier to handle with talloc destructors. Andrew Bartlett Modified: branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c branches/SAMBA_4_0/source/auth/kerberos/config.m4 branches/SAMBA_4_0/source/auth/kerberos/kerberos.h branches/SAMBA_4_0/source/auth/kerberos/kerberos_util.c branches/SAMBA_4_0/source/kdc/hdb-ldb.c branches/SAMBA_4_0/source/kdc/kdc.c branches/SAMBA_4_0/source/kdc/kdc.h Changeset: Sorry, the patch is too large (665 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7270
svn commit: samba r7271 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: tridge
Date: 2005-06-04 11:39:23 + (Sat, 04 Jun 2005)
New Revision: 7271
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7271
Log:
added the ability to specify a target specific set of CFLAGS for
binaries and libraries. This makes it possible to build heimdal with
our build system, which means users don't have to suffer two build
systems.
Modified:
branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2005-06-04
11:17:05 UTC (rev 7270)
+++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2005-06-04
11:39:23 UTC (rev 7271)
@@ -23,7 +23,8 @@
MAJOR_VERSION = string,
MINOR_VERSION = string,
RELEASE_VERSION = string,
- ENABLE = bool
+ ENABLE = bool,
+ TARGET_CFLAGS = string
);
###
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-06-04
11:17:05 UTC (rev 7270)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-06-04
11:39:23 UTC (rev 7271)
@@ -103,6 +103,24 @@
return $output;
}
+
+#
+# return makefile fragment for
+# target specific rules
+sub add_target_flags($$)
+{
+ my $ctx = shift;
+ my $name = shift;
+ my $output = ;
+ if ($ctx-{TARGET_CFLAGS}) {
+$output .= __EOD__;
+$name: TARGET_CFLAGS = $ctx-{TARGET_CFLAGS}
+__EOD__
+}
+return $output;
+}
+
+
sub _prepare_default_rule($)
{
my $ctx = shift;
@@ -215,7 +233,7 @@
# Start $comment
.$src.$dst:
[EMAIL PROTECTED] $message \$\*.$src
- [EMAIL PROTECTED](CC) \$(CC_FLAGS) $flags -c \$ -o \$\@
+ [EMAIL PROTECTED](CC) \$(TARGET_CFLAGS) \$(CC_FLAGS) $flags -c \$ -o
\$\@
[EMAIL PROTECTED]@ -mv `echo \$\@ | sed 's%^.*/%%g'` \$\@
#End $comment
###
@@ -400,11 +418,14 @@
$output .= __EOD__;
library_$ctx-{NAME}: basics bin/lib$ctx-{LIBRARY_NAME}
+
# End Library $ctx-{NAME}
###
__EOD__
+$output .= add_target_flags($ctx, library_ . $ctx-{NAME});
+
return $output;
}
@@ -461,6 +482,8 @@
__EOD__
+$output .= add_target_flags($ctx, library_ . $ctx-{NAME});
+
return $output;
}
@@ -514,6 +537,8 @@
__EOD__
+$output .= add_target_flags($ctx, binary_ . $ctx-{BINARY});
+
return $output;
}
svn commit: samba r7272 - in branches/SAMBA_4_0/source/kdc: .
Author: tridge Date: 2005-06-04 11:41:20 + (Sat, 04 Jun 2005) New Revision: 7272 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7272 Log: this is a sample mk file for building a heimdal library using the samba4 build system. It assumes we have source/heimdal/ with a current lorikeet heimdal tree. I haven't enabled this, its just an example of one possible approach to heimdal integration. Added: branches/SAMBA_4_0/source/kdc/heimdal_config.mk Changeset: Sorry, the patch is too large (345 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7272
Re: svn commit: samba r7265 - in branches/SAMBA_4_0/source/lib: .
Hi, On Sat, Jun 04, 2005 at 06:45:11AM +, [EMAIL PROTECTED] wrote about 'svn commit: samba r7265 - in branches/SAMBA_4_0/source/lib: .': fixed d_printf() so it works again. Jelmer, can you give me a hint as to why you changed this? It completely broke smbclient, and the change now makes d_printf() almost equivalent to printf() as you removed the language translation code. See your commit 7166. Did you intend to reenable language handling by some other method? Or do you just mean to remove it completely? I meant to disable it (for now) as the pot file is not generated nor are the translation files installed at the moment. Sorry, I didn't mean to break the build though... Cheers, Jelmer -- Jelmer Vernooij [EMAIL PROTECTED] - http://jelmer.vernstok.nl/ signature.asc Description: Digital signature
svn commit: samba r7273 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: jelmer Date: 2005-06-04 12:29:06 + (Sat, 04 Jun 2005) New Revision: 7273 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7273 Log: Update a bit Modified: branches/SAMBA_4_0/source/build/smb_build/README.txt Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/README.txt === --- branches/SAMBA_4_0/source/build/smb_build/README.txt2005-06-04 11:41:20 UTC (rev 7272) +++ branches/SAMBA_4_0/source/build/smb_build/README.txt2005-06-04 12:29:06 UTC (rev 7273) @@ -2,6 +2,11 @@ -- -- +The build system basically has two main parts: the autoconf-generated +shell scripts which check for availability of functions and libraries +which is stored in the .m4 files and the information about the various +subsystems which is stored in the .mk files. + Object Types the build system knows about the following object types @@ -36,12 +41,17 @@ a LIBRARY typicly has only glue code in it and depends on SUBSYSTEM's (required_subsystems/REQUIRED_SUBSYSTEMS). +File summary: +- +public.m4 - public M4 macros of the build system +config_mk.pm - Support for reading .mk files +dot.pm - Support for generating .dot files for analysis of dependencies +input.pm - Input validation +main.pm - Main +makefile.pm - Makefile generation +output.pm - Dependency calculation +smb_build_h.pm - smb_build.h generation -Macrodescriptions - -On top of build/smb_build/public.m4 is a list of all public macros of the build system. - - Layout --- @@ -54,16 +64,16 @@ (mostly compiler and basic C type and function checks) -- subsystem specific stuff should be included by 'SMB_INLUDE_M4()' +- subsystem specific stuff should be included by 'SMB_INCLUDE_M4()' -Generating of 'configure' +Generating the configure file - you need to rerun ./autogen.sh when 'configure.in' or any '.m4' file was modified, then you need to rerun configure. -Generating of 'config.status' +Generating config.status - you need to run ./config.status (or 'configure') after a '.mk' file was changed. @@ -73,10 +83,3 @@ for now please take a look at the .m4 and .mk files you find in the source tree, they should be a good reference to start. - - -README-TODO - -SMB_XYZ() vs. SMB_XYZ_MK() -meaning of the macros parameters and the .mk file handling -examples
svn commit: samba r7274 - in branches/SAMBA_4_0/source: . build/m4 build/pidl build/pidl/tests build/smb_build librpc
Author: jelmer Date: 2005-06-04 13:57:52 + (Sat, 04 Jun 2005) New Revision: 7274 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7274 Log: Move m4 files to seperate dir Added: branches/SAMBA_4_0/source/build/m4/check_cc.m4 branches/SAMBA_4_0/source/build/m4/check_ld.m4 branches/SAMBA_4_0/source/build/m4/check_path.m4 branches/SAMBA_4_0/source/build/m4/check_perl.m4 branches/SAMBA_4_0/source/build/m4/check_shld.m4 branches/SAMBA_4_0/source/build/m4/check_types.m4 branches/SAMBA_4_0/source/build/m4/core.m4 branches/SAMBA_4_0/source/build/m4/env.m4 branches/SAMBA_4_0/source/build/m4/public.m4 Removed: branches/SAMBA_4_0/source/build/smb_build/check_cc.m4 branches/SAMBA_4_0/source/build/smb_build/check_ld.m4 branches/SAMBA_4_0/source/build/smb_build/check_path.m4 branches/SAMBA_4_0/source/build/smb_build/check_perl.m4 branches/SAMBA_4_0/source/build/smb_build/check_shld.m4 branches/SAMBA_4_0/source/build/smb_build/check_types.m4 branches/SAMBA_4_0/source/build/smb_build/core.m4 branches/SAMBA_4_0/source/build/smb_build/env.m4 branches/SAMBA_4_0/source/build/smb_build/public.m4 Modified: branches/SAMBA_4_0/source/aclocal.m4 branches/SAMBA_4_0/source/build/pidl/tests/ndr_refptr.pl branches/SAMBA_4_0/source/build/pidl/validator.pm branches/SAMBA_4_0/source/build/smb_build/README.txt branches/SAMBA_4_0/source/configure.in branches/SAMBA_4_0/source/librpc/config.mk Changeset: Sorry, the patch is too large (938 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7274
svn commit: samba r7275 - in trunk/source/nsswitch: .
Author: vlendec
Date: 2005-06-04 16:05:58 + (Sat, 04 Jun 2005)
New Revision: 7275
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7275
Log:
Little cleanup work:
find_our_domain panics or returns != NULL, so there's no point checking that.
TALLOC_ZERO_P - TALLOC_P where we initialize anyway later.
async_request can't be called without a continuation.
Volker
Modified:
trunk/source/nsswitch/winbindd_async.c
trunk/source/nsswitch/winbindd_dual.c
trunk/source/nsswitch/winbindd_misc.c
trunk/source/nsswitch/winbindd_util.c
Changeset:
Modified: trunk/source/nsswitch/winbindd_async.c
===
--- trunk/source/nsswitch/winbindd_async.c 2005-06-04 13:57:52 UTC (rev
7274)
+++ trunk/source/nsswitch/winbindd_async.c 2005-06-04 16:05:58 UTC (rev
7275)
@@ -66,7 +66,7 @@
{
struct do_async_state *state;
- state = TALLOC_ZERO_P(mem_ctx, struct do_async_state);
+ state = TALLOC_P(mem_ctx, struct do_async_state);
if (state == NULL) {
DEBUG(0, (talloc failed\n));
cont(mem_ctx, False, NULL, c, private);
@@ -93,7 +93,7 @@
{
struct do_async_state *state;
- state = TALLOC_ZERO_P(mem_ctx, struct do_async_state);
+ state = TALLOC_P(mem_ctx, struct do_async_state);
if (state == NULL) {
DEBUG(0, (talloc failed\n));
cont(mem_ctx, False, NULL, c, private);
Modified: trunk/source/nsswitch/winbindd_dual.c
===
--- trunk/source/nsswitch/winbindd_dual.c 2005-06-04 13:57:52 UTC (rev
7274)
+++ trunk/source/nsswitch/winbindd_dual.c 2005-06-04 16:05:58 UTC (rev
7275)
@@ -4,7 +4,7 @@
Winbind background daemon
Copyright (C) Andrew Tridgell 2002
- Copyright (C) Volker Lendecke 2004
+ Copyright (C) Volker Lendecke 2004,2005
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
@@ -64,7 +64,9 @@
(char *)state-request,
sizeof(state-request) - state-read_buf_len);
- DEBUG(10,(client_read: read %d bytes. Need %ld more for a full
request.\n, n, (unsigned long)(sizeof(state-request) - n -
state-read_buf_len) ));
+ DEBUG(10,(client_read: read %d bytes. Need %ld more for a full
+ request.\n, n, (unsigned long)(sizeof(state-request) - n -
+ state-read_buf_len) ));
/* Read failed, kill client */
@@ -273,6 +275,8 @@
{
struct winbindd_async_request *state, *tmp;
+ SMB_ASSERT(continuation != NULL);
+
state = TALLOC_P(mem_ctx, struct winbindd_async_request);
if (state == NULL) {
@@ -338,8 +342,7 @@
schedule_async_request(child);
- if (state-continuation != NULL)
- state-continuation(state-private, True);
+ state-continuation(state-private, True);
}
static void schedule_async_request(struct winbindd_child *child)
Modified: trunk/source/nsswitch/winbindd_misc.c
===
--- trunk/source/nsswitch/winbindd_misc.c 2005-06-04 13:57:52 UTC (rev
7274)
+++ trunk/source/nsswitch/winbindd_misc.c 2005-06-04 16:05:58 UTC (rev
7275)
@@ -31,18 +31,10 @@
enum winbindd_result winbindd_check_machine_acct(struct winbindd_cli_state
*state)
{
- struct winbindd_domain *domain;
-
DEBUG(3, ([%5lu]: check machine account\n,
(unsigned long)state-pid));
- domain = find_our_domain();
- if (domain == NULL) {
- DEBUG(0, (Could not find our domain\n));
- return WINBINDD_ERROR;
- }
-
- async_domain_request(state-mem_ctx, domain,
+ async_domain_request(state-mem_ctx, find_our_domain(),
state-request, state-response,
request_finished_cont, state);
return WINBINDD_PENDING;
@@ -115,14 +107,10 @@
enum winbindd_result winbindd_list_trusted_domains(struct winbindd_cli_state
*state)
{
- struct winbindd_domain *domain;
-
DEBUG(3, ([%5lu]: list trusted domains\n,
(unsigned long)state-pid));
- domain = find_our_domain();
-
- async_domain_request(state-mem_ctx, domain,
+ async_domain_request(state-mem_ctx, find_our_domain(),
state-request, state-response,
request_finished_cont, state);
return WINBINDD_PENDING;
@@ -173,22 +161,13 @@
enum winbindd_result winbindd_getdcname(struct winbindd_cli_state *state)
{
- struct winbindd_domain *domain;
-
state-request.domain_name
[sizeof(state-request.domain_name)-1] = '\0';
DEBUG(3, ([%5lu]: Get DC name for %s\n, (unsigned
svn commit: samba r7276 - in branches/SAMBA_4_0/source: include lib/ldb lib/ldb/common lib/ldb/include lib/ldb/ldb_sqlite3 lib/ldb/ldb_tdb lib/ldb/tools lib/tdb/common nsswitch
Author: derrell Date: 2005-06-04 17:13:43 + (Sat, 04 Jun 2005) New Revision: 7276 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7276 Log: - moved static tdb function ltdb_dn_fold() into common/ so that it can be called from multiple backends. (ldb_sqlite3 needs it too.) Added parameter for a callback function that determines whether an attribute needs case folding. - begin to prepare for sqlite3 in build process - work-in-progress updates, on ldb_sqlite3 Modified: branches/SAMBA_4_0/source/include/smb_macros.h branches/SAMBA_4_0/source/lib/ldb/common/ldb.c branches/SAMBA_4_0/source/lib/ldb/common/ldb_utf8.c branches/SAMBA_4_0/source/lib/ldb/config.m4 branches/SAMBA_4_0/source/lib/ldb/config.mk branches/SAMBA_4_0/source/lib/ldb/include/ldb.h branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.h branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/schema branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c branches/SAMBA_4_0/source/lib/tdb/common/tdb.c branches/SAMBA_4_0/source/nsswitch/winbindd_nss.h Changeset: Sorry, the patch is too large (1514 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7276
svn commit: samba r7277 - in trunk/source/nsswitch: .
Author: vlendec
Date: 2005-06-04 17:40:44 + (Sat, 04 Jun 2005)
New Revision: 7277
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7277
Log:
Fix memleaks.
Volker
Modified:
trunk/source/nsswitch/winbindd_async.c
trunk/source/nsswitch/winbindd_rpc.c
Changeset:
Modified: trunk/source/nsswitch/winbindd_async.c
===
--- trunk/source/nsswitch/winbindd_async.c 2005-06-04 17:13:43 UTC (rev
7276)
+++ trunk/source/nsswitch/winbindd_async.c 2005-06-04 17:40:44 UTC (rev
7277)
@@ -785,6 +785,8 @@
return;
}
+ SAFE_FREE(response-extra_data);
+
cont(private, True, sids, num_sids);
}
@@ -991,6 +993,8 @@
return;
}
+ SAFE_FREE(response-extra_data);
+
if (state-alias_domain == NULL) {
DEBUG(10, (Don't expand domain local groups\n));
state-cont(state-private, True, state-sids,
Modified: trunk/source/nsswitch/winbindd_rpc.c
===
--- trunk/source/nsswitch/winbindd_rpc.c2005-06-04 17:13:43 UTC (rev
7276)
+++ trunk/source/nsswitch/winbindd_rpc.c2005-06-04 17:40:44 UTC (rev
7277)
@@ -773,8 +773,9 @@
#endif /* HAVE_LDAP */
result = cm_connect_sam(domain, mem_ctx, cli, dom_pol);
- if (!NT_STATUS_IS_OK(result))
- return result;
+ if (!NT_STATUS_IS_OK(result)) {
+ goto done;
+ }
/* Query domain info */
svn commit: samba r7278 - in branches/SAMBA_4_0/source/librpc: .
Author: jelmer Date: 2005-06-04 18:05:29 + (Sat, 04 Jun 2005) New Revision: 7278 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7278 Log: Oops, don't compile librpc as library.. Modified: branches/SAMBA_4_0/source/librpc/config.mk Changeset: Modified: branches/SAMBA_4_0/source/librpc/config.mk === --- branches/SAMBA_4_0/source/librpc/config.mk 2005-06-04 17:40:44 UTC (rev 7277) +++ branches/SAMBA_4_0/source/librpc/config.mk 2005-06-04 18:05:29 UTC (rev 7278) @@ -539,6 +539,5 @@ # Start SUBSYSTEM RPC [SUBSYSTEM::RPC] REQUIRED_SUBSYSTEMS = NDR_RAW RPC_RAW LIBSMB NDR_MISC NDR_DCERPC NDR_SCHANNEL NDR_LSA NDR_NETLOGON NDR_SAMR NDR_UNIXINFO RPC_NDR_NETLOGON RPC_NDR_EPMAPPER -OUTPUT_TYPE = SHARED_LIBRARY # End SUBSYSTEM RPC
svn commit: samba r7279 - in trunk/source: . lib libsmb
Author: vlendec Date: 2005-06-04 18:19:24 + (Sat, 04 Jun 2005) New Revision: 7279 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7279 Log: Remove the hand-crafted ldap lib from HEAD to reduce the diff between 3_0 and HEAD a bit further. For 3_0 this has not yet put into real use. Jeremy, read/write_data_until in HEAD is no longer used, can you remove them and merge the read_data stuff between 3_0 and HEAD? Thanks, Volker Removed: trunk/source/lib/smb_ldap.c Modified: trunk/source/Makefile.in trunk/source/configure.in trunk/source/libsmb/asn1.c Changeset: Sorry, the patch is too large (2464 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7279
svn commit: samba r7280 - in branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3: .
Author: derrell Date: 2005-06-04 18:33:21 + (Sat, 04 Jun 2005) New Revision: 7280 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7280 Log: taking advantage of previous research. this is documentation on which latest schema is based Added: branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/shi.pdf Changeset: Sorry, the patch is too large (4183 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7280
svn commit: samba r7281 - in branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3: .
Author: derrell Date: 2005-06-04 20:30:49 + (Sat, 04 Jun 2005) New Revision: 7281 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7281 Log: removing document Removed: branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/shi.pdf Changeset: Sorry, the patch is too large (4183 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7281
svn commit: samba r7282 - in branches/SAMBA_4_0/source/lib/ldb: . ldb_sqlite3
Author: derrell Date: 2005-06-04 21:16:54 + (Sat, 04 Jun 2005) New Revision: 7282 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7282 Log: ldb_sqlite3 work in progress. Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in branches/SAMBA_4_0/source/lib/ldb/config.mk branches/SAMBA_4_0/source/lib/ldb/configure.in branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/schema Changeset: Sorry, the patch is too large (941 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7282
svn commit: samba r7283 - in branches/SAMBA_4_0/source/lib/ldb: .
Author: derrell
Date: 2005-06-04 21:20:56 + (Sat, 04 Jun 2005)
New Revision: 7283
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7283
Log:
add sqlite3.m4
Added:
branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4
Changeset:
Added: branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4
===
--- branches/SAMBA_4_0/source/lib/ldb/sqlite3.m42005-06-04 21:16:54 UTC
(rev 7282)
+++ branches/SAMBA_4_0/source/lib/ldb/sqlite3.m42005-06-04 21:20:56 UTC
(rev 7283)
@@ -0,0 +1,49 @@
+
+# Compile with SQLITE3 support?
+
+SQLITE3_LIBS=
+with_sqlite3_support=auto
+AC_MSG_CHECKING([for SQLITE3 support])
+
+AC_ARG_WITH(sqlite3,
+[ --with-sqlite3 SQLITE3 support (default yes)],
+[ case $withval in
+yes|no)
+ with_sqlite3_support=$withval
+ ;;
+ esac ])
+
+AC_MSG_RESULT($with_sqlite3_support)
+
+if test x$with_sqlite3_support != xno; then
+
+ ##
+ # first test for sqlite3.h
+ AC_CHECK_HEADERS(sqlite3.h)
+
+ if test x$ac_cv_header_sqlite3_h != xyes; then
+ if test x$with_sqlite3_support = xyes; then
+AC_MSG_ERROR(sqlite3.h is needed for SQLITE3 support)
+ else
+AC_MSG_WARN(sqlite3.h is needed for SQLITE3 support)
+ fi
+
+ with_sqlite3_support=no
+ fi
+fi
+
+if test x$with_sqlite3_support != xno; then
+ ac_save_LIBS=$LIBS
+
+
+ # now see if we can find the sqlite3 libs in standard paths
+ AC_CHECK_LIB_EXT(sqlite3, SQLITE3_LIBS, sqlite3_open)
+
+ LIBS=$LIBS $SQLITE3_LIBS
+
+ AC_DEFINE(HAVE_SQLITE3,1,[Whether sqlite3 is available])
+ AC_MSG_CHECKING(whether SQLITE3 support is used)
+ AC_MSG_RESULT(yes)
+fi
+
+SMB_EXT_LIB(SQLITE3,[${SQLITE3_LIBS}],[${SQLITE3_CFLAGS}],[${SQLITE3_CPPFLAGS}],[${SQLITE3_LDFLAGS}])
svn commit: samba r7284 - in branches/SAMBA_4_0/source/build/m4: .
Author: derrell Date: 2005-06-04 21:24:10 + (Sat, 04 Jun 2005) New Revision: 7284 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7284 Log: more build issues for sqlite3 Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4 Changeset: Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4 === --- branches/SAMBA_4_0/source/build/m4/rewrite.m4 2005-06-04 21:20:56 UTC (rev 7283) +++ branches/SAMBA_4_0/source/build/m4/rewrite.m4 2005-06-04 21:24:10 UTC (rev 7284) @@ -737,6 +737,7 @@ AC_SUBST(SMBD_EXTRA_LIBS) SMB_INCLUDE_M4(lib/ldb/ldap.m4) +SMB_INCLUDE_M4(lib/ldb/sqlite3.m4) ### # test for where we get crypt() from
svn commit: samba r7285 - in branches/SAMBA_4_0/source/auth/kerberos: .
Author: abartlet
Date: 2005-06-04 22:27:33 + (Sat, 04 Jun 2005)
New Revision: 7285
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7285
Log:
It appears that MIT Kerberos does not have the log redirection
facility that I'm using. This should let us compile the non-KDC
components on MIT again.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c
branches/SAMBA_4_0/source/auth/kerberos/config.m4
branches/SAMBA_4_0/source/auth/kerberos/kerberos.h
Changeset:
Modified: branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c
===
--- branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c 2005-06-04 21:24:10 UTC
(rev 7284)
+++ branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c 2005-06-04 22:27:33 UTC
(rev 7285)
@@ -484,7 +484,7 @@
return 0;
}
-#if defined(HAVE_KRB5_INITLOG) defined(HAVE_KRB5_ADDLOG_FUNC)
defined(HAVE_KRB5_FREELOG)
+#ifdef HAVE_KRB5_LOGGING_CONTROL
static int smb_krb5_context_destory_2(void *ptr)
{
struct smb_krb5_context *ctx = ptr;
@@ -547,7 +547,7 @@
}
}
-#if defined(HAVE_KRB5_INITLOG) defined(HAVE_KRB5_ADDLOG_FUNC)
defined(HAVE_KRB5_FREELOG)
+#ifdef HAVE_KRB5_LOGGING_CONTROL
/* TODO: Should we have a different name here? */
ret = krb5_initlog((*smb_krb5_context)-krb5_context, Samba,
(*smb_krb5_context)-logf);
Modified: branches/SAMBA_4_0/source/auth/kerberos/config.m4
===
--- branches/SAMBA_4_0/source/auth/kerberos/config.m4 2005-06-04 21:24:10 UTC
(rev 7284)
+++ branches/SAMBA_4_0/source/auth/kerberos/config.m4 2005-06-04 22:27:33 UTC
(rev 7285)
@@ -263,9 +263,22 @@
AC_CHECK_FUNC_EXT(krb5_initlog, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_freelog, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_addlog_func, $KRB5_LIBS)
+ AC_CHECK_FUNC_EXT(krb5_set_warn_dest, $KRB5_LIBS)
LIBS=$LIBS $KRB5_LIBS
+ AC_CACHE_CHECK([for krb5_log_facility type],
+samba_cv_HAVE_KRB5_LOG_FACILITY,[
+ AC_TRY_COMPILE([#include krb5.h],
+ [krb5_log_facility block;],
+ samba_cv_HAVE_KRB5_LOG_FACILITY=yes,
+ samba_cv_HAVE_KRB5_LOG_FACILITY=no)])
+
+ if test x$samba_cv_HAVE_KRB5_LOG_FACILITY = xyes; then
+ AC_DEFINE(HAVE_KRB5_LOG_FACILITY,1,
+ [Whether the type krb5_log_facility exists])
+ fi
+
AC_CACHE_CHECK([for krb5_encrypt_block type],
samba_cv_HAVE_KRB5_ENCRYPT_BLOCK,[
AC_TRY_COMPILE([#include krb5.h],
Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos.h
===
--- branches/SAMBA_4_0/source/auth/kerberos/kerberos.h 2005-06-04 21:24:10 UTC
(rev 7284)
+++ branches/SAMBA_4_0/source/auth/kerberos/kerberos.h 2005-06-04 22:27:33 UTC
(rev 7285)
@@ -21,9 +21,17 @@
#if defined(HAVE_KRB5)
+#if defined(HAVE_KRB5_INITLOG) defined(HAVE_KRB5_ADDLOG_FUNC)
defined(HAVE_KRB5_FREELOG) defined (HAVE_KRB5_SET_WARN_DEST)
defined(HAVE_KRB5_LOG_FACILITY)
+#define HAVE_KRB5_LOGGGING_CONTROL
+#else
+#undef HAVE_KRB5_LOGGGING_CONTROL
+#endif
+
struct smb_krb5_context {
krb5_context krb5_context;
+#ifdef HAVE_KRB5_LOGGGING_CONTROL
krb5_log_facility *logf;
+#endif
};
svn commit: samba r7286 - in branches/SAMBA_4_0/source/lib/ldb/include: .
Author: derrell Date: 2005-06-04 22:30:38 + (Sat, 04 Jun 2005) New Revision: 7286 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7286 Log: add prototype for public connect function in ldb_sqlite3 Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb_private.h Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb_private.h === --- branches/SAMBA_4_0/source/lib/ldb/include/ldb_private.h 2005-06-04 22:27:33 UTC (rev 7285) +++ branches/SAMBA_4_0/source/lib/ldb/include/ldb_private.h 2005-06-04 22:30:38 UTC (rev 7286) @@ -109,6 +109,9 @@ struct ldb_context *lldb_connect(const char *url, unsigned int flags, const char *options[]); +struct ldb_context *lsqlite3_connect(const char *url, + unsigned int flags, + const char *options[]); struct ldb_module *timestamps_module_init(struct ldb_context *ldb, const char *options[]); struct ldb_module *schema_module_init(struct ldb_context *ldb, const char *options[]);
svn commit: samba r7287 - in branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3: .
Author: derrell
Date: 2005-06-04 23:19:41 + (Sat, 04 Jun 2005)
New Revision: 7287
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7287
Log:
work in progress. no more time to work on this right now. save latest changes.
Modified:
branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/README
branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/README
===
--- branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/README2005-06-04
22:30:38 UTC (rev 7286)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/README2005-06-04
23:19:41 UTC (rev 7287)
@@ -2,3 +2,6 @@
in Databases which is being used in ldb_sqlite3. Note that we use fgID
representation with 4 bytes per level, so we can represent 6.5E+08 subclasses
of any object class. This should be adequate for our purposes. :-)
+
+The following document is the primary basis for the schema currently being
+used here: http://www.research.ibm.com/journal/sj/392/shi.html
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
===
--- branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c 2005-06-04
22:30:38 UTC (rev 7286)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c 2005-06-04
23:19:41 UTC (rev 7287)
@@ -2,6 +2,7 @@
ldb database library
Copyright (C) Andrew Tridgell 2004
+ Copyright (C) Derrell Lipman 2005
** NOTE! The following LGPL license applies to the ldb
** library. This does NOT imply that all of Samba is released
@@ -32,6 +33,7 @@
* Author: Derrell Lipman (based on Andrew Tridgell's LDAP backend)
*/
+#include stdarg.h
#include includes.h
#include ldb/include/ldb.h
#include ldb/include/ldb_private.h
@@ -67,19 +69,62 @@
const char *pSql,
...)
{
+//int i;
+//int retval;
+int numRows;
+//int numColumns;
+int bFreeTable = False;
+//charerrorBuf[4096];
+char * p;
+//char * pError = NULL;
+char ** ppValues;
+va_list args;
+/* Begin access to variable argument list */
+va_start(args, pSql);
+
+/*
+ * If they didn't give us a place to put returned values, use our own
+ */
+if (pppValues == NULL)
+{
+pppValues = ppValues;
+bFreeTable = True;
+}
+
+/* Similarly for number of rows in result set */
+if (pNumRows == NULL)
+{
+pNumRows = numRows;
+}
+
+/* Format the query */
+if ((p = sqlite3_vmprintf(pSql, args)) == NULL) {
+return -1;
+}
+
+
+#warning *** FINISH QUERY FUNCTION. Catch timeouts, schema changed, etc. ***
+
+
+/* All done with variable argument list */
+va_end(args);
+
+/* Success! */
+return 0;
}
static int
lsqlite3_create_attr_table(struct ldb_module *module,
char * pAttr)
{
-
+#warning *** lsqlite3_create_attr_table() not yet written ***
+return -1;
}
#if 0
-p/*
+/*
* we don't need this right now, but will once we add some backend options
*
* find an option in an option list (a null terminated list of strings)
@@ -151,7 +196,7 @@
return -1;
}
-#if 0 /* not currently used * /
+#if 0 /* not currently used */
/*
* free a search result
*/
@@ -342,7 +387,7 @@
if (*res) lsqlite3_search_free(module, *res);
return -1;
#else
-return 0;
+return -1;
#endif
}
@@ -453,7 +498,8 @@
char * pDN,
long long * pEID)
{
-
+#warning *** lsqlite3_insert_dn() not yet implemented ***
+return -1;
}
@@ -877,7 +923,7 @@
lsqlite3-options = NULL;
lsqlite3-lock_count = 0;
- ret = lsqlite3_initialize(lsqlite3, url);
+ ret = lsqlite3_initialize(lsqlite3, url);
if (ret != SQLITE_OK) {
goto failed;
}
Re: svn commit: samba r4885 - in branches/SAMBA_4_0/source: include libcli libcli/nbt librpc librpc/idl librpc/ndr
Chris,
Building a client library was on the top of my
when-I-get-a-minute-to-breath list. Ah, well...
sorry :-)
- Why use IDL? The packet formats are well-known, simple, and not likely
to change. Hard-coding them might take a little more time and require a
bit more careful debugging, but once done they'd be done.
I am really delighted with how IDL has turned out for this. The Samba3
code for NBT name packet parsing was very complex and incomplete. The
full rfc1002 format is much more complex than it appears at first
glance (if you want to get all the details right), and is a
surpisingly good fit for IDL.
- I'm a big fan of randomizing packet IDs, but I can't think of a good
reason to do so for NBT TRNs since (as far as I know) there's nothing
that makes use of packet sequence. What is gained?
Nothing makes use of them? The name_trn_id is the key to matching
response records to queries. It is the _only_ field you can use to do
this! So if you want to have lots of queries in flight at once (which
we do) then you have to do two things:
1) guarantee that you don't use an id that is already in use by a
pending query
2) use an id that is less likely to accidentally collide (remember
that some NBT servers send replies to the wrong port).
The idtree code plus random() is ideal for this. Using idtree means
that even if we have 20 thousand outstanding packets we still only
take a instructions to find the matching record (no more linear linked
lists for response records!).
It also makes name takeover attacks on switched networks that use wins
much harder, as the attacker needs to send a huge number of packets to
have a good chance of getting a hit. That makes it more likely the
attack will be noticed. You can't make nbt completely secure, but this
is about as close as you can get.
Just to give you an idea of the advantages of using IDL, here is what
smbclient prints at maximum debug level. This printout comes from this
code:
if (DEBUGLVL(10)) {
DEBUG(10,(Received nbt packet of length %d from %s:%d\n,
blob.length, src_addr, src_port));
NDR_PRINT_DEBUG(nbt_name_packet, packet);
}
that tiny bit of code generates the following debug log.
Received nbt packet of length 62 from 192.168.115.5:137
packet: struct nbt_name_packet
name_trn_id : 0xeff2 (61426)
operation: 0x8580 (34176)
0x00: NBT_RCODE (0)
0: NBT_FLAG_BROADCAST
1: NBT_FLAG_RECURSION_AVAIL
1: NBT_FLAG_RECURSION_DESIRED
0: NBT_FLAG_TRUNCATION
1: NBT_FLAG_AUTHORITIVE
0x00: NBT_OPCODE(0)
1: NBT_FLAG_REPLY
qdcount : 0x (0)
ancount : 0x0001 (1)
nscount : 0x (0)
arcount : 0x (0)
questions: *
questions: ARRAY(0)
answers : *
answers: ARRAY(1)
[0]: struct nbt_res_rec
name: struct nbt_name
name : 'WIN2003'
scope: NULL
type : NBT_NAME_SERVER (0x20)
rr_type : NBT_QTYPE_NETBIOS (0x20)
rr_class : NBT_QCLASS_IP (0x1)
ttl : 0x (0)
rdata: union nbt_rdata(case 32)
netbios: struct nbt_rdata_netbios
nb_flags : 0x6000 (24576)
0: NBT_NM_PERMANENT
0: NBT_NM_ACTIVE
0: NBT_NM_CONFLICT
0: NBT_NM_DEREGISTER
0x03: NBT_NM_OWNER_TYPE (3)
0: NBT_NM_GROUP
ipaddr : 0xc0a87305 (3232264965)
nsrecs : *
nsrecs: ARRAY(0)
additional : *
additional: ARRAY(0)
padding : DATA_BLOB length=0
It's like having a little packet analyser built in, and makes
debugging difficult problems _much_ easier. It all comes for free with
pidl :-)
Cheers, Tridge
Re: svn commit: samba r7133 - in branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3: .
Derrell, branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/schema Could you please correct the copyright on ldb_sqlite3.c ? It's a common mistake to just cutpaste someone elses copyright notice, but we do need to be a bit more careful about this. Thanks! Cheers, Tridge
Re: svn commit: samba r7265 - in branches/SAMBA_4_0/source/lib: .
Jelmer, I meant to disable it (for now) as the pot file is not generated nor are the translation files installed at the moment. Sorry, I didn't mean to break the build though... no worries. I'd forgotten the language files were not being installed. That was probably something I disabled in the early hack-and-slash days of getting the Samba4 structures done. Just another thing for the todo list :-) Cheers, Tridge
Build status as of Sun Jun 5 00:00:01 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-06-04 00:00:06.0 + +++ /home/build/master/cache/broken_results.txt 2005-06-05 00:00:35.0 + @@ -1,15 +1,15 @@ -Build status as of Sat Jun 4 00:00:01 2005 +Build status as of Sun Jun 5 00:00:01 2005 Build counts: Tree Total Broken Panic ccache 42 8 0 distcc 41 1 0 -lorikeet-heimdal 37 14 0 +lorikeet-heimdal 37 13 0 ppp 23 1 0 rsync41 1 0 samba1 1 1 samba-docs 0 0 0 -samba4 44 38 0 +samba4 44 36 0 samba_3_042 12 0 talloc 37 20 0 tdb 37 37 0 @@ -28,9 +28,8 @@ oehmesrs6k talloc cc ok/ok/ 2/? oehmesrs6k tdb cc ok/ 2/?/? lithiumlorikeet-heimdal gccok/ 2/?/? -lithiumsamba4 gccok/ 2/?/? lithiumtdb gcc 2/?/?/? -cyberone lorikeet-heimdal gccok/ok/ok/ 2 +cyberone lorikeet-heimdal gccok/ 2/?/? cyberone samba4 gccok/ 2/?/? cyberone samba_3_0gcc 1/?/?/? cyberone tdb gcc 2/?/?/? @@ -38,13 +37,15 @@ fusberta samba4 gccok/ 2/?/? fusberta tdb gcc 2/?/?/? samba-s390 lorikeet-heimdal gccok/ 2/?/? +samba-s390 samba4 gcc 1/?/?/? samba-s390 talloc gccok/ 2/?/? samba-s390 tdb gcc 2/?/?/? tuxsamba4 gccok/ 2/?/? tuxtdb gcc 2/?/?/? -rhonwynsamba4 gcc-4.0ok/ 2/?/? +rhonwynsamba4 gcc 1/?/?/? +rhonwynsamba4 gcc-4.0 1/?/?/? rhonwynsamba_3_0gcc-4.0ok/ 2/?/? -rhonwynsamba4 tccok/ 2/?/? +rhonwynsamba4 tcc 1/?/?/? superego samba4 gccok/ 2/?/? superego tdb gcc 2/?/?/? cl012 lorikeet-heimdal gccok/ok/ok/ 2 @@ -52,9 +53,8 @@ dev4-003 lorikeet-heimdal gccok/ 2/?/? dev4-003 samba4 gccok/ 2/?/? dev4-003 tdb gcc 2/?/?/? -berks samba4 gccok/ 2/?/? +berks samba4 gcc 1/?/?/? berks tdb gcc 2/?/?/? -yowiee samba4 gccok/ 2/?/? yowiee samba_3_0gcc 1/?/?/? yowiee talloc gccok/ok/ 2/? yowiee tdb gcc 2/?/?/? @@ -64,21 +64,21 @@ shelob samba4 iccok/ 2/?/? shelob talloc iccok/ok/ 2/? shelob tdb icc 2/?/?/? -gc8lorikeet-heimdal gcc 1/?/?/? -gc8samba4 gccok/ 1/?/? +gc8lorikeet-heimdal gccok/ 1/?/? +gc8samba4 gcc 1/?/?/? gc8talloc gccok/ok/ 2/? gc8tdb gcc 2/?/?/? -aretnapsamba4 gccok/ok/ 1/? +aretnapsamba4 gccok/ 1/?/? aretnaptalloc gccok/ok/ 2/? aretnaptdb gcc 2/?/?/? aretnapccache iccok/ok/ok/ 1 -aretnapsamba4 iccok/ok/ 1/? +aretnapsamba4 icc 1/?/?/? aretnaptalloc iccok/ok/ 2/? aretnaptdb icc 2/?/?/? -gc4samba4 gccok/ok/ 1/? +gc4samba4 gccok/ 1/?/? gc4talloc gccok/ok/ 2/? gc4tdb gcc 2/?/?/? -manhattan samba4 cc ok/ok/ 1/? +manhattan samba4 cc ok/ 1/?/? sbfccache gccok/ 1/?/? sbfsamba4 gccok/ 1/?/? sbftalloc gccok/ok/ 2/? @@ -87,16 +87,16 @@ ragnarok lorikeet-heimdal gcc 1/?/?/? ragnarok talloc gccok/ok/ 2/? smartserv1 ccache gccok/ 1/?/? -smartserv1 samba4 gccok/ok/ 1/? +smartserv1 samba4 gccok/ 1/?/? smartserv1 talloc gccok/ok/ 2/? smartserv1 tdb gcc 2/?/?/? smartserv1 ccache gcc-4.0ok/ 1/?/? -smartserv1 samba4 gcc-4.0ok/ 1/?/? +smartserv1
svn commit: samba r7288 - in branches/SAMBA_4_0/source: . build/m4
Author: jelmer Date: 2005-06-05 00:28:32 + (Sun, 05 Jun 2005) New Revision: 7288 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7288 Log: Remove empty wrapper function Modified: branches/SAMBA_4_0/source/build/m4/public.m4 branches/SAMBA_4_0/source/build/m4/rewrite.m4 branches/SAMBA_4_0/source/configure.in Changeset: Modified: branches/SAMBA_4_0/source/build/m4/public.m4 === --- branches/SAMBA_4_0/source/build/m4/public.m42005-06-04 23:19:41 UTC (rev 7287) +++ branches/SAMBA_4_0/source/build/m4/public.m42005-06-05 00:28:32 UTC (rev 7288) @@ -55,11 +55,6 @@ dnl2:calledname dnl) dnl -dnl SMB_INCLUDE_M4( -dnl1: inputfile -dnl2: comment -dnl) -dnl dnl SMB_ENV_CHECK( dnl1:dummy dnl) @@ -264,20 +259,6 @@ echo #SMB_MAKE_TARGET TOTO ]) -dnl SMB_INCLUDE_M4( -dnl1: inputfile -dnl2: comment -dnl) -AC_DEFUN([SMB_INCLUDE_M4], -[ -### -# Start Include $1 -# $2 -sinclude($1) -# End Include $1 -### -]) - dnl SMB_ENV_CHECK( dnl1:dummy dnl) Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4 === --- branches/SAMBA_4_0/source/build/m4/rewrite.m4 2005-06-04 23:19:41 UTC (rev 7287) +++ branches/SAMBA_4_0/source/build/m4/rewrite.m4 2005-06-05 00:28:32 UTC (rev 7288) @@ -736,8 +736,8 @@ AC_SUBST(SMBD_EXTRA_OBJS) AC_SUBST(SMBD_EXTRA_LIBS) -SMB_INCLUDE_M4(lib/ldb/ldap.m4) -SMB_INCLUDE_M4(lib/ldb/sqlite3.m4) +sinclude(lib/ldb/ldap.m4) +sinclude(lib/ldb/sqlite3.m4) ### # test for where we get crypt() from Modified: branches/SAMBA_4_0/source/configure.in === --- branches/SAMBA_4_0/source/configure.in 2005-06-04 23:19:41 UTC (rev 7287) +++ branches/SAMBA_4_0/source/configure.in 2005-06-05 00:28:32 UTC (rev 7288) @@ -7,29 +7,29 @@ AC_INIT(include/includes.h) AC_CONFIG_HEADER(include/config.h) -SMB_INCLUDE_M4(build/m4/env.m4) -SMB_INCLUDE_M4(build/m4/rewrite.m4) +sinclude(build/m4/env.m4) +sinclude(build/m4/rewrite.m4) -SMB_INCLUDE_M4(lib/popt/config.m4) -SMB_INCLUDE_M4(lib/iconv.m4) -SMB_INCLUDE_M4(lib/socket/config.m4) -SMB_INCLUDE_M4(lib/talloc/config.m4) -SMB_INCLUDE_M4(lib/tdb/config.m4) -SMB_INCLUDE_M4(lib/ldb/config.m4) -SMB_INCLUDE_M4(lib/events/config.m4) -SMB_INCLUDE_M4(lib/cmdline/config.m4) -SMB_INCLUDE_M4(auth/kerberos/config.m4) -SMB_INCLUDE_M4(auth/gensec/config.m4) -SMB_INCLUDE_M4(libcli/config.m4) -SMB_INCLUDE_M4(smbd/process_model.m4) -SMB_INCLUDE_M4(lib/registry/config.m4) -SMB_INCLUDE_M4(scripting/config.m4) -SMB_INCLUDE_M4(gtk/config.m4) -SMB_INCLUDE_M4(ntvfs/posix/config.m4) -SMB_INCLUDE_M4(lib/socket_wrapper/config.m4) -SMB_INCLUDE_M4(web_server/config.m4) -SMB_INCLUDE_M4(auth/config.m4) -SMB_INCLUDE_M4(smbd/config.m4) +sinclude(lib/popt/config.m4) +sinclude(lib/iconv.m4) +sinclude(lib/socket/config.m4) +sinclude(lib/talloc/config.m4) +sinclude(lib/tdb/config.m4) +sinclude(lib/ldb/config.m4) +sinclude(lib/events/config.m4) +sinclude(lib/cmdline/config.m4) +sinclude(auth/kerberos/config.m4) +sinclude(auth/gensec/config.m4) +sinclude(libcli/config.m4) +sinclude(smbd/process_model.m4) +sinclude(lib/registry/config.m4) +sinclude(scripting/config.m4) +sinclude(gtk/config.m4) +sinclude(ntvfs/posix/config.m4) +sinclude(lib/socket_wrapper/config.m4) +sinclude(web_server/config.m4) +sinclude(auth/config.m4) +sinclude(smbd/config.m4) ALLLIBS_LIBS=$LIBS ALLLIBS_CFLAGS=$CFLAGS
Re: svn commit: samba r7133 - in branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3: .
Andrew Tridgell [EMAIL PROTECTED] writes: Derrell, branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/schema Could you please correct the copyright on ldb_sqlite3.c ? It's a common mistake to just cutpaste someone elses copyright notice, but we do need to be a bit more careful about this. My checkins from earlier today have two copyright notices, one from you (since the code is based on yours) and one from me. Is there something different you'd like in here? Cheers, Derrell
svn commit: samba r7289 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: tridge
Date: 2005-06-05 02:00:56 + (Sun, 05 Jun 2005)
New Revision: 7289
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7289
Log:
split out the list of *.mk files for the build, so you don't need to modify the
perl
code to add a new library
Added:
branches/SAMBA_4_0/source/build/smb_build/config.list
Modified:
branches/SAMBA_4_0/source/build/smb_build/main.pm
Changeset:
Added: branches/SAMBA_4_0/source/build/smb_build/config.list
===
--- branches/SAMBA_4_0/source/build/smb_build/config.list 2005-06-05
00:28:32 UTC (rev 7288)
+++ branches/SAMBA_4_0/source/build/smb_build/config.list 2005-06-05
02:00:56 UTC (rev 7289)
@@ -0,0 +1,48 @@
+# master list of build config files for Samba4
+dsdb/config.mk
+gtk/config.mk
+smbd/config.mk
+smbd/process_model.mk
+libnet/config.mk
+auth/config.mk
+nsswitch/config.mk
+lib/basic.mk
+lib/socket/config.mk
+lib/ldb/config.mk
+lib/talloc/config.mk
+lib/tdb/config.mk
+lib/registry/config.mk
+lib/messaging/config.mk
+lib/events/config.mk
+lib/popt/config.mk
+lib/cmdline/config.mk
+lib/socket_wrapper/config.mk
+lib/ejs/config.mk
+param/config.mk
+smb_server/config.mk
+rpc_server/config.mk
+ldap_server/config.mk
+web_server/config.mk
+winbind/config.mk
+nbt_server/config.mk
+cldap_server/config.mk
+auth/gensec/config.mk
+auth/kerberos/config.mk
+auth/ntlmssp/config.mk
+libcli/auth/config.mk
+libcli/ldap/config.mk
+libcli/config.mk
+utils/net/config.mk
+utils/config.mk
+ntvfs/posix/config.mk
+ntvfs/config.mk
+ntvfs/unixuid/config.mk
+torture/config.mk
+librpc/config.mk
+client/config.mk
+libcli/config.mk
+libcli/security/config.mk
+lib/com/config.mk
+scripting/config.mk
+kdc/config.mk
+heimdal/config.mk
Modified: branches/SAMBA_4_0/source/build/smb_build/main.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/main.pm 2005-06-05 00:28:32 UTC
(rev 7288)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pm 2005-06-05 02:00:56 UTC
(rev 7289)
@@ -14,58 +14,13 @@
use smb_build::dot;
use strict;
+my $config_list = build/smb_build/config.list;
+
sub smb_build_main($)
{
my $INPUT = shift;
- my @mkfiles = (
- dsdb/config.mk,
- gtk/config.mk,
- smbd/config.mk,
- smbd/process_model.mk,
- libnet/config.mk,
- auth/config.mk,
- nsswitch/config.mk,
- lib/basic.mk,
- lib/socket/config.mk,
- lib/ldb/config.mk,
- lib/talloc/config.mk,
- lib/tdb/config.mk,
- lib/registry/config.mk,
- lib/messaging/config.mk,
- lib/events/config.mk,
- lib/popt/config.mk,
- lib/cmdline/config.mk,
- lib/socket_wrapper/config.mk,
- lib/ejs/config.mk,
- param/config.mk,
- smb_server/config.mk,
- rpc_server/config.mk,
- ldap_server/config.mk,
- web_server/config.mk,
- winbind/config.mk,
- nbt_server/config.mk,
- cldap_server/config.mk,
- auth/gensec/config.mk,
- auth/kerberos/config.mk,
- auth/ntlmssp/config.mk,
- libcli/auth/config.mk,
- libcli/ldap/config.mk,
- libcli/config.mk,
- utils/net/config.mk,
- utils/config.mk,
- ntvfs/posix/config.mk,
- ntvfs/config.mk,
- ntvfs/unixuid/config.mk,
- torture/config.mk,
- librpc/config.mk,
- client/config.mk,
- libcli/config.mk,
- libcli/security/config.mk,
- lib/com/config.mk,
- scripting/config.mk,
- kdc/config.mk
- );
+ my @mkfiles = split('\n', `grep -v ^# $config_list`);
$| = 1;
svn commit: lorikeet r332 - in trunk/heimdal: . appl/ftp/ftpd cf kdc lib/des lib/kafs lib/krb5
Author: abartlet Date: 2005-06-05 02:19:50 + (Sun, 05 Jun 2005) New Revision: 332 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=332 Log: Update to Heimdal 20050605 Includes changes to pthread semantics Andrew Bartlett Modified: trunk/heimdal/ChangeLog trunk/heimdal/appl/ftp/ftpd/ftpd.c trunk/heimdal/cf/ChangeLog trunk/heimdal/cf/check-symbols.sh trunk/heimdal/cf/pthreads.m4 trunk/heimdal/kdc/mit_dump.c trunk/heimdal/lib/des/rnd_keys.c trunk/heimdal/lib/kafs/ChangeLog trunk/heimdal/lib/kafs/afskrb.c trunk/heimdal/lib/kafs/afskrb5.c trunk/heimdal/lib/kafs/afssys.c trunk/heimdal/lib/kafs/common.c trunk/heimdal/lib/kafs/kafs_locl.h trunk/heimdal/lib/kafs/roken_rename.h trunk/heimdal/lib/krb5/store.c trunk/heimdal/lib/krb5/verify_krb5_conf.c Changeset: Sorry, the patch is too large (631 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=332
svn commit: samba r7290 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: tridge Date: 2005-06-05 02:20:12 + (Sun, 05 Jun 2005) New Revision: 7290 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7290 Log: comment out heimdal config for now Modified: branches/SAMBA_4_0/source/build/smb_build/config.list Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/config.list === --- branches/SAMBA_4_0/source/build/smb_build/config.list 2005-06-05 02:00:56 UTC (rev 7289) +++ branches/SAMBA_4_0/source/build/smb_build/config.list 2005-06-05 02:20:12 UTC (rev 7290) @@ -45,4 +45,4 @@ lib/com/config.mk scripting/config.mk kdc/config.mk -heimdal/config.mk +#heimdal/config.mk
svn commit: samba r7291 - in branches/SAMBA_4_0/source/auth/kerberos: .
Author: abartlet Date: 2005-06-05 04:17:08 + (Sun, 05 Jun 2005) New Revision: 7291 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7291 Log: Additional notes on what we require from a kerberos implementation. Andrew Bartlett Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos-notes.txt Changeset: Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos-notes.txt === --- branches/SAMBA_4_0/source/auth/kerberos/kerberos-notes.txt 2005-06-05 02:20:12 UTC (rev 7290) +++ branches/SAMBA_4_0/source/auth/kerberos/kerberos-notes.txt 2005-06-05 04:17:08 UTC (rev 7291) @@ -67,7 +67,7 @@ any explicit entry. [EMAIL PROTECTED] remainds me: [EMAIL PROTECTED] reminds me: This is the SPNMappings attribute in Active Directory: @@ -219,6 +219,41 @@ I also now specify the kerberos principal as an explict parameter, not an in/out value on the entry itself. +libkdc +-- +Samba4 needs to be built as a single binary (design requirement), and +this should include the KDC. Samba also (and perhaps more +importantly) needs to control the configuration environment of the +KDC. +The interface we have defined for libkdc allow for packet injection +into the post-socket layer, with a defined krb5_context and +kdb5_kdc_configuration structure. These effectively redirect the +kerberos warnings, logging and database calls as we require. +Using our socket lib + + +An important detail in the use of libkdc is that we use our own socket +lib. This allows the KDC code to be as portable as the rest of samba +(this cuts both ways), but far more importantly it ensures a +consistancy in the handling of requests, binding to sockets etc. + +To handle TCP, we will use of our socket layer in much the same way as +we deal with TCP for CIFS. + +Kerberos logging support + + +Samba now (optionally in the main code, required for the KDC) uses the +krb5_log_facility from Heimdal. This allows us to redirect the +warnings and status from the KDC (and client/server kerberos code) to +Samba's DEBUG() system. + +We have added krb5_freelog() to be the opposite of krb5_initlog(), and +ensure we do not leak memeory in this operation. (krb5_closelog() does +not free everything that krb5_initlog creates). + + +
svn commit: samba r7292 - in branches/SAMBA_4_0/source: . lib/ldb lib/ldb/ldb_sqlite3
Author: abartlet
Date: 2005-06-05 04:18:57 + (Sun, 05 Jun 2005)
New Revision: 7292
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7292
Log:
Fix up the build system support for derrell's sqlite3 ldb backend.
It is on by default, so I've also fixed a build issue in it. I'll
show how to make it off be default in the next commit.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/configure.in
branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4
Changeset:
Modified: branches/SAMBA_4_0/source/configure.in
===
--- branches/SAMBA_4_0/source/configure.in 2005-06-05 04:17:08 UTC (rev
7291)
+++ branches/SAMBA_4_0/source/configure.in 2005-06-05 04:18:57 UTC (rev
7292)
@@ -15,6 +15,8 @@
sinclude(lib/socket/config.m4)
sinclude(lib/talloc/config.m4)
sinclude(lib/tdb/config.m4)
+sinclude(lib/ldb/ldap.m4)
+sinclude(lib/ldb/sqlite3.m4)
sinclude(lib/ldb/config.m4)
sinclude(lib/events/config.m4)
sinclude(lib/cmdline/config.m4)
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
===
--- branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c 2005-06-05
04:17:08 UTC (rev 7291)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c 2005-06-05
04:18:57 UTC (rev 7292)
@@ -35,6 +35,7 @@
#include stdarg.h
#include includes.h
+#include system/filesys.h
#include ldb/include/ldb.h
#include ldb/include/ldb_private.h
#include ldb/ldb_sqlite3/ldb_sqlite3.h
Modified: branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4
===
--- branches/SAMBA_4_0/source/lib/ldb/sqlite3.m42005-06-05 04:17:08 UTC
(rev 7291)
+++ branches/SAMBA_4_0/source/lib/ldb/sqlite3.m42005-06-05 04:18:57 UTC
(rev 7292)
@@ -39,11 +39,24 @@
# now see if we can find the sqlite3 libs in standard paths
AC_CHECK_LIB_EXT(sqlite3, SQLITE3_LIBS, sqlite3_open)
- LIBS=$LIBS $SQLITE3_LIBS
-
- AC_DEFINE(HAVE_SQLITE3,1,[Whether sqlite3 is available])
- AC_MSG_CHECKING(whether SQLITE3 support is used)
- AC_MSG_RESULT(yes)
+ if test x$ac_cv_lib_ext_sqlite3_sqlite3_open = xyes; then
+AC_DEFINE(HAVE_SQLITE3,1,[Whether sqlite3 is available])
+AC_MSG_CHECKING(whether SQLITE3 support is used)
+AC_MSG_RESULT(yes)
+with_sqlite3_support=yes
+SMB_EXT_LIB_ENABLE(SQLITE3,YES)
+ else
+if test x$with_sqlite3_support = xyes; then
+ AC_MSG_ERROR(libsqlite3 is needed for SQLITE3 support)
+else
+ AC_MSG_WARN(libsqlite3 is needed for SQLITE3 support)
+fi
+
+SQLITE3_LIBS=
+with_sqlite3_support=no
+ fi
+
+ LIBS=$ac_save_LIBS;
fi
SMB_EXT_LIB(SQLITE3,[${SQLITE3_LIBS}],[${SQLITE3_CFLAGS}],[${SQLITE3_CPPFLAGS}],[${SQLITE3_LDFLAGS}])
svn commit: samba r7293 - in branches/SAMBA_4_0/source/lib/ldb: .
Author: abartlet Date: 2005-06-05 04:27:12 + (Sun, 05 Jun 2005) New Revision: 7293 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7293 Log: Turn sqlite3 support off by default, use --with-sqlite3 to re-enable. Andrew Bartlett Modified: branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4 Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4 === --- branches/SAMBA_4_0/source/lib/ldb/sqlite3.m42005-06-05 04:18:57 UTC (rev 7292) +++ branches/SAMBA_4_0/source/lib/ldb/sqlite3.m42005-06-05 04:27:12 UTC (rev 7293) @@ -6,7 +6,7 @@ AC_MSG_CHECKING([for SQLITE3 support]) AC_ARG_WITH(sqlite3, -[ --with-sqlite3 SQLITE3 support (default yes)], +[ --with-sqlite3 SQLITE3 support (default no)], [ case $withval in yes|no) with_sqlite3_support=$withval @@ -15,8 +15,9 @@ AC_MSG_RESULT($with_sqlite3_support) -if test x$with_sqlite3_support != xno; then - +if test x$with_sqlite3_support != xyes; then + with_sqlite3_support=no +else ## # first test for sqlite3.h AC_CHECK_HEADERS(sqlite3.h)
