[Samba] Réception de votre candidature
Bonjour, Nous avons bien reçu votre candidature et nous vous en remercions. Nous la traitons dans les meilleurs délais et nous nous engageons à vous apporter une réponse dans les 45 jours qui suivent cet envoi. Cordialement, Le Département Ressources Humaines-ING DIRECT -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] Winbind type email
Hello all Sorry to post this hugely off-topic, but i have no clue where to start. We are looking to replace an Exchange server with something with less licencing issues, is there a way to use windbind (or winbind-ish behaviour) for an email server (ie users authenticate through winbind to log on to imap server etc). Once again, sorry for the mispost, even a push in the right direction will help! Thanks, H -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Winbind type email
Sorry to post this hugely off-topic, but i have no clue where to start. We are looking to replace an Exchange server with something with less licencing issues, is there a way to use windbind (or winbind-ish behaviour) for an email server (ie users authenticate through winbind to log on to imap server etc). cyrus sasl mechanism can be used. Look at option ntlm_server. exim can send ntlm auth too, but doesn't forwad it to another server -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
Re: [Samba] NIS as user authentication
Greg, Thanks for confirming that I am not completely Crazy ( at least not in this case ). I just noticed that I did one of the things that is done way too often with Email lists, I failed to keep this on list when I replied to you... Thus leaving impression on the list that there was a ready solution to this issue... List members, I apologize for my oversight ... At 09:20 PM 11/1/2004, you wrote: heya Kevin, yes i may of jumped the gun there, sorry about that. will read all of a post next time. but anyway there are a few things you could do, on the nis server create a smbpasswd file and push that to your servers. keeping the files in sync will still be required but a script can take care of that for you. while poking around after reading this letter i did find something which might get you started: http://perlmonks.thepen.com/135685.html good luck with things greg Kevin M. Barrett wrote: Greg, Thanks for the reply, but I have also done a google search and also get some 21K hits on samba NIS Passwd and none of them seem to have the How-to's that you elude to. Could you please send me the link to one of the how-to's that you speak of? Thanks Kevin . All of the How-Tos that I see have to do with changing the samba password as well as the YP password at the same time ... not in using the NIS maps directly .. Thanks. At 07:31 AM 11/1/2004, you wrote: Kevin, My understanding is Samba has been able to authenticate against a passwd map for a very long time. For kicks I did a google search on samba NIS passwd and it returned over 36k results, 7 of the first 10 results have howto links... have a great day, greg Hi all, I believe that I have asked this in one form or another, but I did not see an answer. ( it could be that I missed it ) do please forgive me if I did, but could I ask you all to humor me for a moment. Is there any way to get Samba to use YP ( NIS ) as the basis for user authentication? If not at this time ( as I have not been able to determine that it is available) is it on any todo list at all ? Thanks .. Kevin Kevin M. Barrett KMB IT Consulting, Inc 508-450-7717 -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba Kevin M. Barrett KMB IT Consulting, Inc 508-450-7717 Kevin M. Barrett KMB IT Consulting, Inc 508-450-7717 -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] Samba3 and public = yes
Samba3 and public = yes I have trouble with samba3 and allowing everyone to access a share. With everyone I also think of users that are not defined in samba or in any domain/workgroup. This is working OK with the old Samba2. What is wrong with this config in Samba3? [public] path = /public public = yes only guest = yes writable = yes printable = no Regards Atle -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: Trusting and trusted domain (home mapping) problem
Hi Igor, Do you have trustdomains in your auth methods? Currently I removed the winbind from nsswitch.conf. And smbclient //domain_B_PDC//shared -U domain_A/domain_A_user does not work. If I put winbind in the nsswitch.conf, then I will be able to authenticated but cannot connect to shared folder with the following error:- Domain=[Domain_B] OS=[Unix] Server=[Samba 3.0.7-Debian] tree connect failed: NT_STATUS_ACCESS_DENIED The log file from the Domain_B_PDC:- [2004/11/02 20:50:03, 4] smbd/reply.c:reply_tcon_and_X(408) Client requested device type [?] for share [SHARED] [2004/11/02 20:50:03, 5] smbd/service.c:make_connection(812) making a connection to 'normal' service shared [2004/11/02 20:50:03, 5] lib/username.c:user_in_netgroup_list(315) Unable to get default yp domain [2004/11/02 20:50:03, 5] lib/username.c:user_in_netgroup_list(315) Unable to get default yp domain [2004/11/02 20:50:03, 2] smbd/service.c:make_connection_snum(314) user 'Domain_A\domain_a_user' (from session setup) not permitted to access this share (Shared) [2004/11/02 20:50:03, 3] smbd/error.c:error_packet(105) error string = No such file or directory [2004/11/02 20:50:03, 3] smbd/error.c:error_packet(129) error packet at smbd/reply.c(416) cmd=117 (SMBtconX) NT_STATUS_ACCESS_DENIED -- My smb.conf :- [Shared] path = /shared valid users = @Domain Users, @Domain_A\Domain Users write list = @Domain Users, @Domain_A\Domain Users browsable = yes guest ok = no writeable =no --- Do you have winbind in your nsswitch.conf? How did you managed to get the mapped home directory for domain_a_user when he log on to the joined_domain_B_computer? Hope to hear from you on this... thanks a lot. adrian p/s: hope you got my previous mail cos I forgotten to cc to sambalists Igor Belyi wrote: == (Header) e-mail Filtrado == I would guess that it means that DomainA trust DomainB but DomainB does not trust DomainA. Can you verify that trust is mutual between them? Check 'net rpc trustom list' on both machines. No, I do not use winbind for NSS (no winbind in /etc/nsswitch.conf). Winbind is used only by Samba when it maps users from trust domain into local space. Adrian Chow wrote: Hi Igor, I got stuck now. I did my best. I got stuck at the winbind which I suspected is the reason why the domainA_computer cannot map the domain_B user's home directory. 1. What are the settings of your winbind? I have the following winbind related entries in smb.conf: ldap idmap suffix = ou=Idmap idmap backend = ldap:ldap://localhost idmap uid = 1-2 idmap gid = 1-2 To see if winbind works you can also try to resolve a name into SID and SID into gid. For examle, if wbinfo -g returns you 'STAFF\wheel'. Try to do the following: wbinfo -n 'STAFF\wheel' wbinfo -Y SID return in a previous command 2. Do you use only winbind in your libnss_ldap or use ldap as well? In my /etc/nsswitch.conf I have only ldap without winbind. As far as I understand this, winbind usage via NSS can confuse Samba into thinking that those users and groups are defined locally and maybe allowing Samba to use winbind directly is a better approach for trust between domains. I don't know why would you want to put winbind into libnss_ldap which is configuration for LDAP interface for NSS (when you use 'ldap' in /etc/nssswitch.conf file) 3. My winbind works with :- (For both sides) wbinfo -t wbinfo -p wbinfo -u wbinfo -g getent passwd (For DomainA) getent group shows all the local groups and also the groups shown in wbinfo -g (For DomainB) getent group shows all the local groups and only the GUESTs group. Very weird. The rest of the groups in wbinfo -g does not come up. The logs is something like this:- --- nsswitch/winbindd_group.c:fill_grent_mem(133) could not lookup membership for group rid S-1-5-21-1803233979-822103454-943392455-3005 in domain STAFF (error: NT_STATUS_NO_SUCH_GROUP) [2004/11/01 00:13:10, 0] nsswitch/winbindd_group.c:winbindd_getgrent(795) could not lookup domain group STAFF\wheel --- Do you mean that this error message was reported during getent group in DomainB? Because, without this error message I would assume that you have winbind written in /etc/nsswithc.conf on your DomainA server but not on your DomainB server. The error message means that Samba thinks that 'wheel' is a Domain group of the 'STAFF' domain and fails to find its mapping. I would expect this error to come up during login of a Domain user whose primary group is a local 'wheel' group instead of a Domain group. If this user is supposed to have 'wheel' as a primary group you probably forgot to create a groupmap from a Domain group for it. Igor -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] Logon Problems with Samba3.0.7 and LDAP
Hi, i´ve been searching the web for similar problems, but not successfull. Hope you can help me, because this problem is driving me crazy. I am able to join to my domain with my winXP Clients. Even the Computeraccount is created successfully. After rebooting the client, I just want to login to the domain. but that is not possible! he cannot find the domain or computeraccount (I have problems writing it down in english- my windows is just german ;-) My config: SuSE 9.1 with Openldap, Bind, Samba 3.0.7. DNS works fine. This server is also router for my two subnets (192.168.1.0 and 192.168.10.0/24). IP: 192.168.1.250 (eth0) and IP 192.168.10.250 (eth1) Client: Windows XP SP1. IP: 192.168.1.11/24 Has anybody an idea how to solve this problem? ___ Gesendet von Yahoo! Mail - Jetzt mit 100MB Speicher kostenlos - Hier anmelden: http://mail.yahoo.de -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] Domain merging problems
The network I'm adminning was until recently physically separated into two networks, each with a Samba 3 PDC/fileserver, a couple of WinXP Pro workstations, and about ten users. I used tdbsam as backend for both Samba servers. Recently, the networks were physically joined. There were no problems with that, but as one of the servers was ripe for retirement I wanted to join the two domains into one, letting the other server do everything. Thus (here is where you start counting my mistakes) I copied /home and /var/lib/samba from the old server to a temporary directory on the new one, and got rid of the old server. On the new server, I exported the passdb of the old server to smbpasswd, edited it to avoid UID conflicts, created the new users, merged the edited smbpasswd file, untarred the home directories and chown:ed them. Then I created machine accounts for the workstations in the old domain, and joined them to the domain, and expected everything to work. It sort of did. The users of the old domain could log in with their old passwords, and access their home directories. However, there were problems with Word - on startup, it asks twice for the user's name and initials, and then complains about the assistant not being correctly installed, which does not happen for the users originally in the new domain. They can't access C:\Documents and settings\username, since the SID recorded in the ACL no longer points to a valid user. Thus directories called username.domainname are created instead. Further, some users have the same SID. I tried to change that using pdbedit -u username -U new-sid, but it complained about not finding the RID in the database. It worked when I did: tdbtool passdb.tdb insert RID_new-sid username\0 first. I have done this for one user, but it's not the magical solution I hoped it would be - in the ACL, the user still appears as OLDDOMAIN\username, and problems with Word persist. pdbedit -L -v shows the old domain name in the user record - is there any way to change that? All in all, I feel like starting over, wiping the users of the old domain from the database, recreate them one by one, and change the ownership of c:\Documents and settings\* on the workstations. But I can't see how I could do that without resetting their passwords, as pdbedit can't change the hashed passwords directly but requires the cleartext one. Is there another way to do that? Or is there a simpler solution to my problems? Finally, how would I have done this properly from the beginning? Magnus -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] Samba3 + LDAP - w2k says it couldn't change password (but it did)
Hello, I have a following test environment: 1) Samba PDC + OpenLDAP Slave (192.168.1.2) 2) OpenLDAP Master (192.168.1.1). Whatever is changed/added on the Master, it gets replicated to Slave. Now, when a user is logged in, and tries to change the password - he/she must supply the old password, and twice new one (normal behaviour). After pressing OK the user is said that the password wasn't changed, check BIG/small characters etc. (although old password and new were correctly typed). However, the password was changed in LDAP master, and replicated to the slave - so after a logout, user can log in with a new password (though this user was said that the password wasn't changed). This is what I have in log.machine with log level = 9: [2004/11/02 15:24:20, 0] libsmb/smbencrypt.c:decode_pw_buffer(519) decode_pw_buffer: incorrect password length (-954408756). [2004/11/02 15:24:20, 0] libsmb/smbencrypt.c:decode_pw_buffer(520) decode_pw_buffer: check that 'encrypt passwords = yes' The log is the same whether I have encrypt passwords = yes or don't have it at all. Any clue? Tomek -- Startuj z INTERIA.PL!!! http://link.interia.pl/f1837 -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba3 + LDAP - w2k says it couldn't change password (but it did)
[EMAIL PROTECTED] wrote: [2004/11/02 15:24:20, 0] libsmb/smbencrypt.c:decode_pw_buffer(519) decode_pw_buffer: incorrect password length (-954408756). [2004/11/02 15:24:20, 0] libsmb/smbencrypt.c:decode_pw_buffer(520) decode_pw_buffer: check that 'encrypt passwords = yes' I thought maybe it has something to do with passwd sync program, as thee output it gives is different as in examples hanging around (in examples it is like below: passwd chat = *New*password* %n\n *Retype*new*password* %n\n *passwd:*all*authentication*tokens*updated* In my case (I use smbldap-tools 0.85) it's like that: # /usr/local/sbin/smbpasswd Changing password for bella New password : Retype new password : # So I changed this line to: passwd chat = *Changing*password*for*'%u'*\n *New*password* %n\n *Retype*new*password* %n\n* And now it says I don't have necessary permissions to change the password. Any clue? Below my smb.conf (passwd chat is like above though, I tried other possibilities too): [global] unix charset = LOCALE workgroup = MAGISTA netbios name = SERVER interfaces = eth0, lo bind interfaces only = Yes passdb backend = ldapsam:ldap://127.0.0.1 #ldap filter = (uid=%u) username map = /etc/samba/smbusers log level = 9 syslog = 0 log file = /var/log/samba/log.%m max log size = 50 smb ports = 139 445 name resolve order = wins bcast hosts time server = Yes #printcap name = CUPS #show add printer wizard = No encrypt passwords = yes add user script = /usr/local/sbin/smbldap-useradd -a -m '%u' delete user script = /usr/local/sbin/smbldap-userdel '%u' add group script = /usr/local/sbin/smbldap-groupadd -p '%g' delete group script = /usr/local/sbin/smbldap-groupdel '%g' add user to group script = /usr/local/sbin/smbldap-groupmod -m '%u' '%g' delete user from group script = /usr/local/sbin/smbldap-groupmod -x '%u' '%g' set primary group script = /usr/local/sbin/smbldap-usermod -g '%g' '%u' # must be %m, contrary to what HOWTOs say (they say %u) add machine script = /usr/local/sbin/smbldap-useradd -w '%m' ;password sync passwd program = /usr/local/sbin/smbldap-passwd %u # passwd chat = *New*password* %n\n *Retype*new*password* %n\n *passwd:*all*authentication*tokens*updated* passwd chat = *New*password* %n\n *Retype*new*password* %n\n unix password sync = Yes logon script = scripts\logon.bat logon path = \\%L\profiles\%U logon drive = U: domain logons = Yes preferred master = Yes wins support = Yes ldap suffix = dc=magista,dc=de ldap machine suffix = ou=Computers ldap user suffix = ou=Users ldap group suffix = ou=Groups ldap idmap suffix = ou=Idmap ldap admin dn = cn=replica,dc=magista,dc=de ldap replication sleep = 5000 idmap backend = ldap:ldap://127.0.0.1 idmap uid = 1000-2 idmap gid = 500-2 map acl inherit = Yes #printing = cups #printer admin = Administrator, chrisr [Shared] path = /home/samba/shared comment = Shared folder browseable = yes writeable = yes create mask = 1666 directory mask = 1777 [profiles] path = /home/samba/profiles writeable = yes browseable = no create mask = 0600 directory mask = 0700 [netlogon] comment = Network Logon Service path = /home/netlogon read only = yes browseable = no write list = tom [unattended] comment = Installation Sources path = /home/unattended read only = yes browseable = no valid users = unattended -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] debug level on version 2.28a
Greetings How do I go about configuring the smb.conf file so that I don't receive the following informational message? snip added interface ip=192.168.0.1 bcast=192.168.0.255 nmask=255.255.255.0 Domain=[NHA-CTN] OS=[Windows Server 2003 3790] Server=[Windows Server 2003 5.2] snip I realise that I can easily put the -d0 in the command line, but want to use the config file instead of yet another option in the command line. Can anyone assist? Luq A -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] Problem with smbmount
Hello list, Sorry for the reposting, but I think someone may have an idea, I don't think I'm the only one with this kind of problem. I have a problem with my samba shares. I have a server with samba installed on it (3.0.7-Debian). I have workstations under wxp and workstations under linux. I have a common share which looks like this : [Archive] available = yes valid users = user1, user2 comment = Repertoire Archive browseable = yes write list = user1, user2 writable = yes admin users = user1 path = /home/archives user = user1, user2 force user = root I connect my wxp to the share without problem and can read/write. Of course all new files are created under the root user as requested by the force user option. I can connect my linux to this share using mount -t smbfs -o rw,username=user1,password=xxx //server/Archive /mnt/server/archive, (either using smbmount does the same behaviour) I can do all the read I want, but I can't make any write. It looks like my workstation get confused by the rights. If I go in a directory where the user1 have RW access, I can create a file, and it is automaticllay given to root (according to the option force user), but I can't make any write where the user root is the owner of the directory. It works well under Windows XP workstation, it does not works under linux workstation (which is a Kanotix/Knoppix/Debian distribution), that's why I think it's a problem with smbmount/mount -t smbfs Any idea ? Thanks -- Jérôme Tytgat Administrateur Réseau et Sécurité -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
Update Re: [Samba] Samba, print$, HP Laserjet 8500, XP
The below-mentioned problem is caused by Microsoft bug 286902. I just wanted to post the resolution so it would make it into the archives. Thanks, Misty On Monday 01 November 2004 14:59, Misty Stanley-Jones wrote: On Monday 01 November 2004 10:41, Misty Stanley-Jones wrote: Hi, If anyone is successfully using the HP LJ8500 driver that comes with Windows XP in your print$ share in Samba 3.0.x, can you please mail me privately. I understand the issues I am seeing are probably not Samba related. In case they ARE Samba related, here is the main issue. Printing color graphics onto an envelope from MS Word 2000. The first time an envelope is printed, the background in the graphic is black, even though on the screen it's white. Second time you print the envelope it is fine. UPDATE - It is only the first copy that has the black background on the graphic. All you have to do to make the problem 'go away' is click Print' again. We are doing a test right now to see what will happen on the third time. We have chosen Envelope as the media type, and Envelope #10 as the size. We are using the manual feed tray in the printer. I do have the printer set up in Cups, but I think Samba is bypassing the PPD set up in Cups, because I have the following command in smb.conf: print command = /usr/bin/lpr -P %p -o raw %s -r If it is a Samba-related problem, please respond on the list. Otherwise if you have some info about this particular driver (developed jointly by HP and Microsoft, only available on the XP cd, not through the HP website) I would appreciate any help you could give. Thanks so much, Misty -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] More AD integration questions
Getting the following on startup: [2004/11/02 09:57:15, 0] smbd/server.c:main(760) smbd version 3.0.7 started. Copyright Andrew Tridgell and the Samba Team 1992-2004 [2004/11/02 09:57:15, 0] lib/smbldap.c:smbldap_open_connection(623) Failed to issue the StartTLS instruction: Decoding error [2004/11/02 09:57:15, 1] lib/smbldap.c:another_ldap_try(936) Connection to LDAP server failed for the 1 try! [2004/11/02 09:57:15, 1] smbd/files.c:file_init(186) file_init: Information only: requested 1 open files, 7244 are available. [2004/11/02 09:57:15, 0] lib/smbldap.c:smbldap_open_connection(623) Failed to issue the StartTLS instruction: Decoding error [2004/11/02 09:57:15, 1] lib/smbldap.c:another_ldap_try(936) Connection to LDAP server failed for the 1 try! [2004/11/02 09:57:16, 1] lib/smbldap.c:add_new_domain_info(1289) failed to add domain dn= sambaDomainName=ATARASHII,DC=inscriber,DC=local with: No such attribute 0057: LdapErr: DSID-0C09098B, comment: Error in attribute conversion operation, data 0, v893 [2004/11/02 09:57:16, 0] lib/smbldap.c:smbldap_search_domain_info(1338) Adding domain info for ATARASHII failed with NT_STATUS_UNSUCCESSFUL [2004/11/02 09:57:16, 1] lib/smbldap.c:add_new_domain_info(1289) failed to add domain dn= sambaDomainName=ATARASHII,DC=inscriber,DC=local with: No such attribute 0057: LdapErr: DSID-0C09098B, comment: Error in attribute conversion operation, data 0, v893 [2004/11/02 09:57:16, 0] lib/smbldap.c:smbldap_search_domain_info(1338) Adding domain info for ATARASHII failed with NT_STATUS_UNSUCCESSFUL Are there errors with my ldap configuration, or are these just problems with the AD schema? Thanks, Graham smb.conf is: [global] workgroup = DEV realm = INSCRIBER.LOCAL server string = Samba File Server %v interfaces = fxp0 security = ADS client schannel = Yes server schannel = Yes passdb backend = ldapsam:ldap://omega.inscriber.local socket options = TCP_NODELAY IPTOS_LOWDELAY SO_KEEPALIVE SO_SNDBUF=8192 SO_RCVBUF=8192 dns proxy = No wins server = 10.0.0.25 ldap admin dn = cn=Administrator,cn=users,DC=inscriber,DC=local ldap suffix = DC=inscriber,DC=local ldap ssl = start tls idmap uid = 1-2 idmap gid = 1-2 winbind separator = . winbind enum users = No winbind enum groups = No winbind use default domain = Yes force create mode = 0664 force directory mode = 0775 dos filemode = Yes [public] comment = Archive path = /mnt/test/public read only = No [homes] comment = Home Directories read only = No browseable = No -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] Network failure?
Hi to the list. SuSE 9.1, Samba 3.04, + cups, dns, dhcp, apache2, squid, SuSEfirewall2. 2 x 2.0 GHz cpu + 2GB mem. Essentially LAN only. Problem: Server stops responding to logons, logged on users kicked out of home-drives. This happens twice a normal working day. Memory seems to dribble away steadily but surely... My link via ssh (PUtty) stays good. Question: This has been frustrating me for some time, and I can't seem to pin down the cause (my knowledge is in puberty). I have come to the point of re-instalation, (copout?), but maybe someone came across this before and is willing to point me in the right direction (please)? TIA Best regards, Darryl -- Edgemead High School, Cape Town Tel +27215581132 Fax +27215584407 Cell +27823752081 - Powered by SuSE 9.1 and the OpenWebmail project -- -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
Re: [samba] users in multiple groups?
Ok i have removed all of my groups from LDAP, downloaded smbldap-tools-0.8.5 used smbldap-populate to create my groups again. however when i add a user to a group the users still seem not to be registered in the group. This is how i created and added a user to a group. quigon1:~ #./smbldap-useradd -a test123 quigon1:~#./smbldap-passwd test123 quigon1:~#./smbldap-groupmod -m test123 Domain Admins In theory the user should now be a member of both Domain Users and Domain Admins, however quigon1:/opt/smbldap-tools-0.8.5 # groups test123 test123 : users quigon1:/opt/smbldap-tools-0.8.5 # id test123 uid=21690(test123) gid=100(users) groups=100(users) it doesnt show the user in the domain admin groups, also says the gid =100 when its set to 513 in LDAP???... if i do a lookup on the group.it says the user is in the group. quigon1:~ # getent group Domain Users Domain Users:x:513:test123 quigon1:~ # getent group Domain Admins Domain Admins:x:512:Administrator,test123 on a different note how do you go about creating a new group? The way i think is 1) Create a new PosixGroup in LDAP 2) quigon1:~# net groupmap add unixgroup=group ntgroup=group type=domain is this the way? Regards Daniel Paul Gienger wrote: quigon1:~ # getent groups Unknown database: groups Oh yeah, duh... you know, I thought I made a mistake once, but then when I reexamined the situation, it turned out that I didn't... NYWAY the populate script made this for me: [fgoserv:tmp]# getent group Domain Admins Domain Admins::512:Administrator,pgienger,smoorhou,rklose,speterso but I see you have a ntadmin and nothing like the Domain Users so I wonder if you used an old version of the script package. I would suggest getting the newest version of the tool package and re-running the populate script. quigon1:~ # groups ws0dwi id: cannot find name for group ID 901 quigon1:~ # id ws0dwi uid=186712(ws0dwi) gid=901 groups=901 This leads me to ask where group 901 is/should be coming from. Did you start making samba groups in LDAP without creating them as posix groups first? The procedure should be to make the group in unix, presumably you should do this in ldap with whatever tool you like (gq, phpldapadmin, bare metal LDIF file input) and then do a groupmapping with a net groupmap add command. yes my groups were created using smbldap-populate.pl, but i cant see it being mapped to any UNIX group, which group should it be mapped to and how is the done? Again, this should all be taken care of for you. You should end up with this: (among some others perhaps) [fgoserv:tmp]# /opt/samba/bin/net groupmap list Domain Admins (S-1-5-21-112718084-1284083569-2990761952-512) - Domain Admins Domain Users (S-1-5-21-112718084-1284083569-2990761952-513) - Domain Users Domain Guests (S-1-5-21-112718084-1284083569-2990761952-514) - Domain Guests Print Operators (S-1-5-32-550) - Print Operators Backup Operators (S-1-5-32-551) - Backup Operators Replicators (S-1-5-32-552) - Replicators Domain Computers (S-1-5-21-112718084-1284083569-2990761952-515) - Domain Computers Administrators (S-1-5-32-544) - Administrators Power Users (S-1-5-32-547) - Power Users -- Daniel Wilson Systems Administrator IT Communications Service University of Sunderland Unit1 Technology Park Chester Road Sunderland SR2 7PT Tel: 0191 515 2695 This e-mail contains information which is confidential and may be privileged and is for the exclusive use of the recipient. It is the responsibility of the recipient to ensure that this message and its attachments are virus free. Any views or opinions presented are solely those of the author and do not necessarily represent those of the University, unless otherwise specifically stated. -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Network failure?
Hi Darryl Could you post the part of your samba logs where it seems to stop? (it would normally be in /var/log/samba/log.smbd for suse i think) it might also be an idea to check all your tdb files with `tdbbackup -v /var/lib/samba/*.tdb` - these files should be in /var/lib/samba on suse I think. After that try restarting samba with `/etc/init.d/smb restart` and `/etc/init.d/nmb restart`. darryl penny wrote: Hi to the list. SuSE 9.1, Samba 3.04, + cups, dns, dhcp, apache2, squid, SuSEfirewall2. 2 x 2.0 GHz cpu + 2GB mem. Essentially LAN only. Problem: Server stops responding to logons, logged on users kicked out of home-drives. This happens twice a normal working day. Memory seems to dribble away steadily but surely... My link via ssh (PUtty) stays good. Question: This has been frustrating me for some time, and I can't seem to pin down the cause (my knowledge is in puberty). I have come to the point of re-instalation, (copout?), but maybe someone came across this before and is willing to point me in the right direction (please)? TIA Best regards, Darryl -- Edgemead High School, Cape Town Tel +27215581132 Fax +27215584407 Cell +27823752081 - Powered by SuSE 9.1 and the OpenWebmail project -- signature.asc Description: OpenPGP digital signature -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] Question about Samba 3.0.2a with Windows XP client
Hi All, I run into problem with Samba version 3.0.2a. Any help would be appreciated! Following is the description of the problems: 1. Samba version 3.0.2a works fine with windows 2000 and NT client, but after we upgrade workstation to XP with service pack 1, we can't map the drives which we can use with windows 2000 server. 2. The basic configuration is : [global] security = server encrypt passwords = Yes password server = password_server log level = 4 preferred master = False local master = No domain master = False win server = win_server_IP Does anybody know about this issue? Any suggestions to get it over? Thanks and regards, Shirley -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] A couple of questions.
Hello Samba Folks, Two things. 1. With winbind, is there a way to specify more then one type of shell with the template shell directive? I'm thinking of doing common logins between Solaris and Active Directory, but, my users use various shells. Tcsh, csh, bash, ksh. I'd like to be able to specify shells based on userid if I could. 2. Organizational Units. When I first joined my Solaris Samba servers to our AD structure, I used a specific OU. The AD supporters (3rd party company) tell me this OU will change in the near future. Will I have to re-join my servers when this happens? Will communications between Samba and AD stop when they change the OU structure? I would test this but I don't have the environment to test with. Thanks! ...Joe Joseph A. Gaude' Systems Engineer - CSM General Dynamics Advanced Information Systems IES -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] Name resolution
I am using Samba release 3.0.7-2 on a Fedora Core 2 box. I am unable to receive proper name resolution for a machine because my client seems to be requesting resolution for the machine by its workstation service aliased name rather than its file server registered name. Here are the machines registered names: NetBIOS Remote Machine Name Table Name Type Status - INet~Services 1C GROUP Registered IS~LIGHTTYPERDT00 UNIQUE Registered LIGHTTYPERDT 00 UNIQUE Registered LIGHTTYPERDT 03 UNIQUE Registered DNASEQ 00 GROUP Registered IWAM_LIGHTTYPER03 UNIQUE Registered DNASEQ 1E GROUP Registered LIGHTTYPERDT 20 UNIQUE Registered DNASEQ 1D UNIQUE Registered ..__MSBROWSE__.01 GROUP Registered A Windows machine (or OS X) will try to resolve it will broadcast a request like this (using the fileserver name): Name query NB LIGHTTYPERDT20 The Linux box will try to resolve it this way (using the workstation service alias, instead of the fileserver name): Name query NB IS~LIGHTTYPERDT20 This, of course, doesn't resolve because it doesn't exist. Has anyone else seen this behavior or know of a remedy? In case it matters, I'm sniffing the packets using Ethereal. Thanks for any advice anyone can throw my way! Nathan -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] problem with profiles
hi, i've stup samba 3 as a PDC with ldap as sam backend. everything works as expected - but: the profiles. i've to migrate a w2k pdc to samba. to migrate the profiles i've copied them using profiles at he my computer proerties. at the first sight it seems to work but my problem is that the profiles oviousely are not writen back to the server at the end of a session. windows does not stat any kind of error. when i relogon all my changes are lost. i've had a look at the rights of the profile folders. they are owend by the user the profile is for and this usere ist able to write to this folders and it's files. can any one give me a clue where the problem may be ? TIA matthias -- Matthias Henze[EMAIL PROTECTED] Use PGP!! http://www.mhcsoftware.de/MatthiasHenze.asc - - - - - - - - - - - - - - - - - - - - - - - - - - - - MHC SoftWare GmbH voice: +49-(0)9533-92006-0 Fichtera 17 fax: +49-(0)9533-92006-6 96274 Itzgrund/Germanye-Mail: [EMAIL PROTECTED] - - - - - - - - - - - - - - - - - - - - - - - - - - - - pgpiodWmx54Iv.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] FWD: Letters Only LM Hash Database
http://it.slashdot.org/article.pl?sid=04/11/02/1523212tid=93 mailto:[EMAIL PROTECTED]Petermailto:[EMAIL PROTECTED] Clark writes Disk storage has increased tremendously in the past 5 years and the blatant insecurities in the antiquated LM hashing technique have not gone away; though functionality has been added to disable LM hashes, this is not set by default. With some help from Elcomsoft, simple flat files have been created that hold http://www.beginningtoseethelight.org/ntsecurity/index.php#0FEB224E21024B8Cevery combination of LM hash for letters only passwords. Jesko has coded a server application which allows you to access this database. Simply telnet to: beginningtoseethelight.no-ip.org on port 2501 and paste in a LM hash. So how does this differ from Rainbow tables? Well this will return a password 100% of the time, using minimal processor power, in approximately less than 0.2 seconds. -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] Wierd 8.3 Name Mangling
I've installed Samba 3.0.7 (stock Debian package), but I'm having some wierd problems with name mangling. The relevant lines in smb.conf are: preserve case = yes short preserve case = yes mangled names = yes mangle prefix = 5 mangling method = hash2 In a share, I did touch test-file.GHO to create a long filename. When I do a dir under DOS, however, it shows: TVTSSK~S GHO 0 11-02-04 3:07p test-file.GHO I can't see how samba came up with this mangled name. I tried changing the mangle prefix and/or mangle method but it made no difference. I made sure I killed the smbd process after any changes I made and can see it being restarted and a new TCP connection established to it. Any ideas? Thanks! Brian ( [EMAIL PROTECTED] ) --- Diplomacy: the art of letting someone have your own way. --- ( Couldn't verify my signature? Use http://www.precidia.com/precidia.crt ) -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Wierd 8.3 Name Mangling
On Tue, Nov 02, 2004 at 03:28:57PM -0500, Brian White wrote: I've installed Samba 3.0.7 (stock Debian package), but I'm having some wierd problems with name mangling. The relevant lines in smb.conf are: preserve case = yes short preserve case = yes mangled names = yes mangle prefix = 5 mangling method = hash2 In a share, I did touch test-file.GHO to create a long filename. When I do a dir under DOS, however, it shows: TVTSSK~S GHO 0 11-02-04 3:07p test-file.GHO I can't see how samba came up with this mangled name. I tried changing the mangle prefix and/or mangle method but it made no difference. I made sure I killed the smbd process after any changes I made and can see it being restarted and a new TCP connection established to it. Any ideas? Thanks! I've had similar problems before. I never did get to the root cause but chnageing the value of max protocol and restarting generally got me to a workign setup. Yours Tony linux.conf.au http://linux.conf.au/ || http://lca2005.linux.org.au/ Apr 18-23 2005 The Australian Linux Technical Conference! -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] Samba groups and LDAP, and printer question
Hi, Is it possible for me to add @Some_Group as a memberUID for a Samba group mapping? Will it expand that @Some_Group to include all the members of that group in this group? Another question -- is there a way to make everyone able to add printers to their local workstation, but not be able to delete other people's jobs from the print queue? It seems sort of all-or-nothing. Is this a group policy thing instead? I hope I can do it from within Samba. :) Thanks, Misty -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Wierd 8.3 Name Mangling
On Tue, Nov 02, 2004 at 03:28:57PM -0500, Brian White wrote: I've installed Samba 3.0.7 (stock Debian package), but I'm having some wierd problems with name mangling. The relevant lines in smb.conf are: preserve case = yes short preserve case = yes mangled names = yes mangle prefix = 5 mangling method = hash2 In a share, I did touch test-file.GHO to create a long filename. When I do a dir under DOS, however, it shows: TVTSSK~S GHO 0 11-02-04 3:07p test-file.GHO I can't see how samba came up with this mangled name. I tried changing the mangle prefix and/or mangle method but it made no difference. I made sure I killed the smbd process after any changes I made and can see it being restarted and a new TCP connection established to it. The mangle prefix is only used in the hash mangling method. The name shown (TVTSSK~S GHO) is a has2 mangled name, as to be expected. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Wierd 8.3 Name Mangling
I've installed Samba 3.0.7 (stock Debian package), but I'm having some wierd problems with name mangling. The relevant lines in smb.conf are: preserve case = yes short preserve case = yes mangled names = yes mangle prefix = 5 mangling method = hash2 In a share, I did touch test-file.GHO to create a long filename. When I do a dir under DOS, however, it shows: TVTSSK~S GHO 0 11-02-04 3:07p test-file.GHO I can't see how samba came up with this mangled name. I tried changing the mangle prefix and/or mangle method but it made no difference. I made sure I killed the smbd process after any changes I made and can see it being restarted and a new TCP connection established to it. The mangle prefix is only used in the hash mangling method. The name shown (TVTSSK~S GHO) is a has2 mangled name, as to be expected. Okay, but, as I said, I tried changing the mangle method (to just hash) and still got the same results. Perhaps my Windoze box has cached the result somehow or the correct process did not restart... Yup, sure enough... Reboot Windoze and the now it shows TEST-~AM.GHO. Thanks! Brian ( [EMAIL PROTECTED] ) --- Don't go around saying the world owes you a living. The world owes you nothing. It was here first. -- Mark Twain --- ( Couldn't verify my signature? Use http://www.precidia.com/precidia.crt ) -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] net ads join fails
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 ~ /usr/bin/net ads join -Udennisb dennisb password: [2004/11/02 17:31:56, 0] libads/ldap.c:ads_add_machine_acct(1006) ~ Host account for if-srv-hos1 already exists - modifying old account [2004/11/02 17:31:56, 0] libads/ldap.c:ads_join_realm(1342) ~ ads_add_machine_acct: No such object ads_join_realm: No such object Also: net user | wc -l reports 106000 users, but wbinfo -u | wc -l only reports 5000. Is this because I haven't been able to join sucessfully yet? Also, if I try to change the name to if-srv-hos2, I get an error about insufficient access. Do I need to have the ability to create domain machine accounts to join the machine to a domain? ~ klist seems to work: Ticket cache: FILE:/tmp/krb5cc_0 Default principal: [EMAIL PROTECTED] Valid starting ExpiresService principal 11/02/04 16:37:16 11/03/04 02:37:17 krbtgt/[EMAIL PROTECTED] ~renew until 11/03/04 16:37:16 11/02/04 16:44:12 11/03/04 02:37:17 [EMAIL PROTECTED] ~renew until 11/03/04 16:37:16 11/02/04 17:06:11 11/03/04 02:37:17 [EMAIL PROTECTED] ~renew until 11/03/04 16:37:16 Kerberos 4 ticket cache: /tmp/tkt0 klist: You have no tickets cached -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFBiAtn2dxAfYNwANIRAi7pAJ9KIbtLorr1nvJxIrLtyIdurbAhHACgiCwB XRZRdtJDatDArhua6CGap+E= =I2IY -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] (no subject)
join -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
Re: [Samba] net ads join fails
On Tue, 02 Nov 2004 14:34:15 -0800, Tom Dickson [EMAIL PROTECTED] wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 ~ /usr/bin/net ads join -Udennisb dennisb password: [2004/11/02 17:31:56, 0] libads/ldap.c:ads_add_machine_acct(1006) ~ Host account for if-srv-hos1 already exists - modifying old account [2004/11/02 17:31:56, 0] libads/ldap.c:ads_join_realm(1342) ~ ads_add_machine_acct: No such object ads_join_realm: No such object What version of samba and kerberos are you using? I had problems with the version that comes with redhat. I wasn't able to get ads work with it. samba.3.0.7 and krb1.3.5 worked for me. And make sure on smb.conf , you have 'security=ADS'. -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] samba and domain local groups
Quick question about Samba and Domain Local groups. Ive got a Samba 3.0.7 server (redhat 8) as a domain member of a 2K Domain in native mode. (security = domain). Std Windows group mgmt says: Users are members of Global Groups. Global Groups are members of local groups Local Groups control access to resources. So ive got a Domain Local group I want to use to restrict access to a samba share: valid users = @DL_FILE_iCABS_Server Problem is, when I browse the share from a 2K/XP PC im prompted for a username and password. log.winbind says: [2004/11/02 15:59:36, 0] nsswitch/winbindd_group.c:winbindd_getgrent(795) could not lookup domain group DL_FILE_iCABS_Server [2004/11/02 15:59:36, 1] nsswitch/winbindd_group.c:fill_grent_mem(133) could not lookup membership for group rid S-1-5-21-1078081533-1682526488-725345543-1633 in domain RENTOKILINITIAL (error: NT_STATUS_NO_SUCH_GROUP) If I do a 'getent group' I see all the Global Groups but not the Domain Local groups and an error similar to the one above is logged for each Domain Local group. So, am I missing something really basic here, ie Samba/Winbind doesnt let me use Domain Local groups like this or is this a bug in Samba/Winbind? -- If you wash lousy clothing at low temperatures, all you get is cleaner lice - Dr John Maunder -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] Compiling Samba 3.0.7 on FreeBSD 5.2.1
I am desperately seeking help. I get an error related to not being able to find ldap.h when I know that it is there. It is located in my /usr/local/include directory. I have built and installed openldap from the source. When I use ./configure -with-readline=/usr/local, I get an error that libldap cannot be found. How do I compile from the source on samba 3.0.7? What mandatory pre-reqs are there? -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] Re: users in multiple groups?
We are going to lots of departmental shares, firstly we want only people ... anybody have sugesstions? I was thinking of groupmappings to either /etc/group or a posixGroup in LDAP (net groupmap) There's something you should know in regards to posixGroup if you don't already. The LDAP schema for it is way out of date and the consequence is that group based access to the database using posixgroup is broken. Use duplicate groups of the type groupofnames until they get it fixed. Jim C. -- - | I can be reached on the following Instant Messenger services: | |---| | MSN: j_c_llings @ hotmail.com AIM: WyteLi0n ICQ: 123291844 | |---| | Y!: j_c_llingsJabber: jcllings @ njs.netlab.cz| - -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
[Samba] Cups and Samba paper size mismatech
Hi, We have a CUPS/SAMBA installation: Debian Sarge CUPS 1.1.21 SAMBA 3.0.7 We have come across a strange issue with HP printers (Laserjet 5, PCL and LaserJet 5SI, Postscript): CUPS was setup with a default of A4 paper size. However, in SAMBA the users see only Letter size and cannot change this option. The document is sent to the printer as Letter, which stops printing until there is a user intervention. This does not seem to happen in the other printer (Phaser 350, Phaser 8400, and other printers using PCL5 and PCL6 Emulation). Any pointers on how this can be changed? Thanks Gil -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Compiling Samba 3.0.7 on FreeBSD 5.2.1
On Wednesday 03 November 2004 04:44, Matt Schwartz wrote: I am desperately seeking help. I get an error related to not being able to find ldap.h when I know that it is there. It is located in my /usr/local/include directory. I have built and installed openldap from the source. When I use ./configure -with-readline=/usr/local, I get an error that libldap cannot be found. How do I compile from the source on samba 3.0.7? What mandatory pre-reqs are there? readline and ldan have nothing in common. Try CFLAGS=-I/usr/local/include Also, configure --help says: --with-ldap LDAP support (default yes) and I'd try --with-ldap=/usr/local, maybe help is not complete. -- vda -- To unsubscribe from this list go to the following URL and read the instructions: http://lists.samba.org/mailman/listinfo/samba
RE: SAMBA stopped working
John wrote: This may or may not be an issue. I have not looked totally at this, but I think it is how LANMAN usernames that can not be represented on the host OS are mapped to host usernames. Here's the contents of my USER.MAP: tillman = tillmabg tillman I do not see the code in the smb.conf that enables the use of the guest account if the account does not exist, What would this code look like? so my next guess is that in this map file, it maps the Administrator account to something. See above. My guess is that the password for that Administrator account must be in the SMB PASSWORD database, and if you change it on the client system, it also must be changed on the host, if you are not passing through the authentication to a domain controller. The only password in the database is my own and I can't get Samba to recognize it any more. With out setting the Map to guest parameter that Jean-Yves pointed out to me about a month ago, the guest account basically does nothing. Did you change the Administrator account about 2 months ago? I changed nothing. -- Brian Tillman ** The information contained in, or attached to, this e-mail, may contain confidential information and is intended solely for the use of the individual or entity to whom they are addressed and may be subject to legal privilege. If you have received this e-mail in error you should notify the sender immediately by reply e-mail, delete the message from your system and notify your system manager. Please do not copy it for any purpose, or disclose its contents to any other person. The views or opinions presented in this e-mail are solely those of the author and do not necessarily represent those of the company. The recipient should check this e-mail and any attachments for the presence of viruses. The company accepts no liability for any damage caused, directly or indirectly, by any virus transmitted in this email. ** PLEASE READ THIS IMPORTANT ETIQUETTE MESSAGE BEFORE POSTING: http://www.catb.org/~esr/faqs/smart-questions.html
RE: SAMBA stopped working
In article [EMAIL PROTECTED], Tillman, Brian (AGRE) [EMAIL PROTECTED] writes: John wrote: This may or may not be an issue. I have not looked totally at this, but I think it is how LANMAN usernames that can not be represented on the host OS are mapped to host usernames. Here's the contents of my USER.MAP: tillman = tillmabg tillman I do not see the code in the smb.conf that enables the use of the guest account if the account does not exist, What would this code look like? map to guest = bad user so my next guess is that in this map file, it maps the Administrator account to something. See above. My guess is that the password for that Administrator account must be in the SMB PASSWORD database, and if you change it on the client system, it also must be changed on the host, if you are not passing through the authentication to a domain controller. The only password in the database is my own and I can't get Samba to recognize it any more. When some clients connect to SAMBA, they first connect as Administrator to get a list of shares, and then connect as the logged in user. If you do not have the Administrator mapped to a VMS account and for a standalone SAMBA installation, have the LANMAN password for it in the Samba password database, then the only other way for the Adminstrator account to get a list of shares is to use guest access. Otherwise the access will fail. You have so far indicated that you do not have the map to guest parameter set, nor do you have the Administrator account mapped. One of them seems to be a requirement. I changed nothing. The other possiblity is that one or more of the databases that SAMBA uses have gotten corrupted. Setting the log level for the SMBD up to 4 may give better information as to what is wrong. Some of the tools in the SAMBA_ROOT:[BIN] may also help do the diagnostics. I have not had the chance to look at most of them though. -John [EMAIL PROTECTED] Personal Opinion Only PLEASE READ THIS IMPORTANT ETIQUETTE MESSAGE BEFORE POSTING: http://www.catb.org/~esr/faqs/smart-questions.html
svn commit: samba r3469 - branches/SAMBA_3_0/source trunk/source
Author: gd Date: 2004-11-02 08:49:18 + (Tue, 02 Nov 2004) New Revision: 3469 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3469 Log: Fix build of smbmount. Guenther Modified: branches/SAMBA_3_0/source/Makefile.in trunk/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2004-11-02 07:42:47 UTC (rev 3468) +++ branches/SAMBA_3_0/source/Makefile.in 2004-11-02 08:49:18 UTC (rev 3469) @@ -546,7 +546,7 @@ $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ) MOUNT_OBJ = client/smbmount.o \ - $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(UBIQX_OBJ) $(LIB_NONSMBD_OBJ) + $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(UBIQX_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ) MNT_OBJ = client/smbmnt.o $(VERSION_OBJ) $(SNPRINTF_OBJ) Modified: trunk/source/Makefile.in === --- trunk/source/Makefile.in2004-11-02 07:42:47 UTC (rev 3468) +++ trunk/source/Makefile.in2004-11-02 08:49:18 UTC (rev 3469) @@ -555,7 +555,7 @@ $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ) MOUNT_OBJ = client/smbmount.o \ - $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(UBIQX_OBJ) $(LIB_NONSMBD_OBJ) + $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(UBIQX_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ) MNT_OBJ = client/smbmnt.o $(VERSION_OBJ) $(SNPRINTF_OBJ)
svn commit: samba r3470 - in branches/SAMBA_4_0/source/lib: .
Author: tridge
Date: 2004-11-02 09:55:57 + (Tue, 02 Nov 2004)
New Revision: 3470
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3470
Log:
removed some unused functions (should fix the build on IRIX 6.4)
Modified:
branches/SAMBA_4_0/source/lib/system.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/system.c
===
--- branches/SAMBA_4_0/source/lib/system.c 2004-11-02 08:49:18 UTC (rev 3469)
+++ branches/SAMBA_4_0/source/lib/system.c 2004-11-02 09:55:57 UTC (rev 3470)
@@ -75,7 +75,22 @@
#endif /* HAVE_USLEEP */
}
+
/***
+ System wrapper for getwd
+/
+char *sys_getwd(char *s)
+{
+ char *wd;
+#ifdef HAVE_GETCWD
+ wd = (char *)getcwd(s, sizeof (pstring));
+#else
+ wd = (char *)getwd(s);
+#endif
+ return wd;
+}
+
+/***
A read wrapper that will deal with EINTR.
/
@@ -103,65 +118,9 @@
return ret;
}
-/***
-A send wrapper that will deal with EINTR.
-/
-ssize_t sys_send(int s, const void *msg, size_t len, int flags)
-{
- ssize_t ret;
- do {
- ret = send(s, msg, len, flags);
- } while (ret == -1 errno == EINTR);
- return ret;
-}
-
/***
-A sendto wrapper that will deal with EINTR.
-/
-
-ssize_t sys_sendto(int s, const void *msg, size_t len, int flags, const struct
sockaddr *to, socklen_t tolen)
-{
- ssize_t ret;
-
- do {
- ret = sendto(s, msg, len, flags, to, tolen);
- } while (ret == -1 errno == EINTR);
- return ret;
-}
-
-
-/***
- System wrapper for getwd
-/
-
-char *sys_getwd(char *s)
-{
- char *wd;
-#ifdef HAVE_GETCWD
- wd = (char *)getcwd(s, sizeof (pstring));
-#else
- wd = (char *)getwd(s);
-#endif
- return wd;
-}
-
-/***
-system wrapper for link
-/
-
-int sys_link(const char *oldpath, const char *newpath)
-{
-#ifndef HAVE_LINK
- errno = ENOSYS;
- return -1;
-#else
- return link(oldpath, newpath);
-#endif
-}
-
-/***
os/2 also doesn't have chroot
/
int sys_chroot(const char *dname)
@@ -335,42 +294,7 @@
#endif
}
-struct passwd *sys_getpwent(void)
-{
- return getpwent();
-}
-
-void sys_endpwent(void)
-{
- endpwent();
-}
-
/**
- Wrappers for getpwnam(), getpwuid(), getgrnam(), getgrgid()
-/
-
-struct passwd *sys_getpwnam(const char *name)
-{
- return getpwnam(name);
-}
-
-struct passwd *sys_getpwuid(uid_t uid)
-{
- return getpwuid(uid);
-}
-
-struct group *sys_getgrnam(const char *name)
-{
- return getgrnam(name);
-}
-
-struct group *sys_getgrgid(gid_t gid)
-{
- return getgrgid(gid);
-}
-
-
-/**
Wrappers for dlopen, dlsym, dlclose.
/
@@ -392,15 +316,6 @@
#endif
}
-int sys_dlclose (void *handle)
-{
-#if defined(HAVE_DLCLOSE)
- return dlclose(handle);
-#else
- return 0;
-#endif
-}
-
const char *sys_dlerror(void)
{
#if defined(HAVE_DLERROR)
@@ -410,17 +325,6 @@
#endif
}
-int sys_dup2(int oldfd, int newfd)
-{
-#if defined(HAVE_DUP2)
- return dup2(oldfd, newfd);
-#else
- errno = ENOSYS;
- return -1;
-#endif
-}
-
-
const char *sys_inet_ntoa(struct ipv4_addr in)
{
struct in_addr in2;
svn commit: samba r3471 - in branches/SAMBA_4_0/source/lib: .
Author: tridge
Date: 2004-11-02 09:59:19 + (Tue, 02 Nov 2004)
New Revision: 3471
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3471
Log:
split out capabilities code from lib/system.c - should fix IRIX 6.5 build
Added:
branches/SAMBA_4_0/source/lib/capability.c
Modified:
branches/SAMBA_4_0/source/lib/system.c
Changeset:
Added: branches/SAMBA_4_0/source/lib/capability.c
===
--- branches/SAMBA_4_0/source/lib/capability.c 2004-11-02 09:55:57 UTC (rev 3470)
+++ branches/SAMBA_4_0/source/lib/capability.c 2004-11-02 09:59:19 UTC (rev 3471)
@@ -0,0 +1,112 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ Copyright (C) Andrew Tridgell 1992-1998
+ Copyright (C) Jeremy Allison 1998-2002
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/*
+ capabilities fns - will be needed when we enable kernel oplocks
+*/
+
+#include includes.h
+#include system/network.h
+#include system/wait.h
+#include system/filesys.h
+
+
+#if defined(HAVE_IRIX_SPECIFIC_CAPABILITIES)
+/**
+ Try and abstract process capabilities (for systems that have them).
+/
+static BOOL set_process_capability( uint32_t cap_flag, BOOL enable )
+{
+ if(cap_flag == KERNEL_OPLOCK_CAPABILITY) {
+ cap_t cap = cap_get_proc();
+
+ if (cap == NULL) {
+ DEBUG(0,(set_process_capability: cap_get_proc failed. Error
was %s\n,
+ strerror(errno)));
+ return False;
+ }
+
+ if(enable)
+ cap-cap_effective |= CAP_NETWORK_MGT;
+ else
+ cap-cap_effective = ~CAP_NETWORK_MGT;
+
+ if (cap_set_proc(cap) == -1) {
+ DEBUG(0,(set_process_capability: cap_set_proc failed. Error
was %s\n,
+ strerror(errno)));
+ cap_free(cap);
+ return False;
+ }
+
+ cap_free(cap);
+
+ DEBUG(10,(set_process_capability: Set KERNEL_OPLOCK_CAPABILITY.\n));
+ }
+ return True;
+}
+
+/**
+ Try and abstract inherited process capabilities (for systems that have them).
+/
+
+static BOOL set_inherited_process_capability( uint32_t cap_flag, BOOL enable )
+{
+ if(cap_flag == KERNEL_OPLOCK_CAPABILITY) {
+ cap_t cap = cap_get_proc();
+
+ if (cap == NULL) {
+ DEBUG(0,(set_inherited_process_capability: cap_get_proc
failed. Error was %s\n,
+ strerror(errno)));
+ return False;
+ }
+
+ if(enable)
+ cap-cap_inheritable |= CAP_NETWORK_MGT;
+ else
+ cap-cap_inheritable = ~CAP_NETWORK_MGT;
+
+ if (cap_set_proc(cap) == -1) {
+ DEBUG(0,(set_inherited_process_capability: cap_set_proc
failed. Error was %s\n,
+ strerror(errno)));
+ cap_free(cap);
+ return False;
+ }
+
+ cap_free(cap);
+
+ DEBUG(10,(set_inherited_process_capability: Set
KERNEL_OPLOCK_CAPABILITY.\n));
+ }
+ return True;
+}
+#endif
+
+/
+ Gain the oplock capability from the kernel if possible.
+/
+
+void oplock_set_capability(BOOL this_process, BOOL inherit)
+{
+#if HAVE_KERNEL_OPLOCKS_IRIX
+ set_process_capability(KERNEL_OPLOCK_CAPABILITY,this_process);
+ set_inherited_process_capability(KERNEL_OPLOCK_CAPABILITY,inherit);
+#endif
+}
+
Modified: branches/SAMBA_4_0/source/lib/system.c
===
--- branches/SAMBA_4_0/source/lib/system.c 2004-11-02 09:55:57 UTC (rev 3470)
+++
svn commit: samba r3472 - in branches/SAMBA_4_0/source/lib/registry/reg_backend_gconf: .
Author: tridge Date: 2004-11-02 10:13:26 + (Tue, 02 Nov 2004) New Revision: 3472 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3472 Log: fixed build of reg_backend_gconf Modified: branches/SAMBA_4_0/source/lib/registry/reg_backend_gconf/reg_backend_gconf.c Changeset: Modified: branches/SAMBA_4_0/source/lib/registry/reg_backend_gconf/reg_backend_gconf.c === --- branches/SAMBA_4_0/source/lib/registry/reg_backend_gconf/reg_backend_gconf.c 2004-11-02 09:59:19 UTC (rev 3471) +++ branches/SAMBA_4_0/source/lib/registry/reg_backend_gconf/reg_backend_gconf.c 2004-11-02 10:13:26 UTC (rev 3472) @@ -19,6 +19,7 @@ */ #include includes.h +#include registry.h #include gconf/gconf-client.h static WERROR gerror_to_werror(GError *error)
svn commit: samba r3473 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: tpot Date: 2004-11-02 11:05:25 + (Tue, 02 Nov 2004) New Revision: 3473 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3473 Log: Add LIBCRYPTO_OBJS to python extensions. Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pl Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pl === --- branches/SAMBA_4_0/source/build/smb_build/makefile.pl 2004-11-02 10:13:26 UTC (rev 3472) +++ branches/SAMBA_4_0/source/build/smb_build/makefile.pl 2004-11-02 11:05:25 UTC (rev 3473) @@ -778,7 +778,8 @@ \$(SUBSYSTEM_LIB_WINBIND_CLIENT_OBJS) \\ \$(SUBSYSTEM_SOCKET_OBJS) \\ \$(SUBSYSTEM_LIBREPLACE_OBJS) \\ -\$(SUBSYSTEM_LIBNETIF_OBJS) +\$(SUBSYSTEM_LIBNETIF_OBJS) \\ +\$(SUBSYSTEM_LIBCRYPTO_OBJS) PYTHON_DCERPC_LIBS = -lldap
svn commit: samba r3474 - in branches/SAMBA_4_0/source/scripting/swig: .
Author: tpot
Date: 2004-11-02 11:06:00 + (Tue, 02 Nov 2004)
New Revision: 3474
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3474
Log:
Add conversion functions for the time_t type.
Modified:
branches/SAMBA_4_0/source/scripting/swig/dcerpc.i
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/swig/dcerpc.i
===
--- branches/SAMBA_4_0/source/scripting/swig/dcerpc.i 2004-11-02 11:05:25 UTC (rev
3473)
+++ branches/SAMBA_4_0/source/scripting/swig/dcerpc.i 2004-11-02 11:06:00 UTC (rev
3474)
@@ -197,6 +197,29 @@
return PyLong_FromUnsignedLongLong(obj);
}
+time_t time_t_from_python(PyObject *obj, char *name)
+{
+ if (obj == NULL) {
+ PyErr_Format(PyExc_ValueError, Expecting key %s, name);
+ return 0;
+ }
+
+ if (!PyLong_Check(obj) !PyInt_Check(obj)) {
+ PyErr_Format(PyExc_TypeError, Expecting int or long value for %s,
name);
+ return 0;
+ }
+
+ if (PyLong_Check(obj))
+ return (time_t)PyLong_AsUnsignedLongLong(obj);
+ else
+ return (time_t)PyInt_AsUnsignedLongMask(obj);
+}
+
+PyObject *time_t_to_python(time_t obj)
+{
+ return PyLong_FromUnsignedLongLong(obj);
+}
+
HYPER_T HYPER_T_from_python(PyObject *obj, char *name)
{
if (obj == NULL) {
svn commit: samba r3477 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: metze Date: 2004-11-02 11:31:58 + (Tue, 02 Nov 2004) New Revision: 3477 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3477 Log: add '--with-disable-ext-lib=LIB' option to be able to disable the usage of external libraries. (works currently only with the pkg-config detected libs) metze Modified: branches/SAMBA_4_0/source/build/smb_build/check_path.m4 branches/SAMBA_4_0/source/build/smb_build/public.m4 Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/check_path.m4 === --- branches/SAMBA_4_0/source/build/smb_build/check_path.m4 2004-11-02 11:17:06 UTC (rev 3476) +++ branches/SAMBA_4_0/source/build/smb_build/check_path.m4 2004-11-02 11:31:58 UTC (rev 3477) @@ -155,6 +155,15 @@ fi]) +dnl disable these external libs +AC_ARG_WITH(disable-ext-lib, +[ --with-disable-ext-lib=LIB Comma-seperated list of external libraries], +[ if test $withval; then + for i in `echo $withval | sed -e's/,/ /g'` + do + eval SMB_EXT_LIB_$i=NO + done +fi ]) dnl exclude these modules AC_ARG_WITH(exclude-modules, Modified: branches/SAMBA_4_0/source/build/smb_build/public.m4 === --- branches/SAMBA_4_0/source/build/smb_build/public.m4 2004-11-02 11:17:06 UTC (rev 3476) +++ branches/SAMBA_4_0/source/build/smb_build/public.m4 2004-11-02 11:31:58 UTC (rev 3477) @@ -374,7 +374,10 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.9.0; then AC_MSG_CHECKING(for $2) - if $PKG_CONFIG --exists '$2' ; then + if test $SMB_EXT_LIB_$1x = NOx ; then + SMB_EXT_LIB_ENABLE($1, NO) + AC_MSG_RESULT(disabled) + elif $PKG_CONFIG --exists '$2' ; then AC_MSG_RESULT(yes) SMB_EXT_LIB_ENABLE($1, YES)
svn commit: samba r3478 - in branches/SAMBA_4_0/source: client include include/system lib libnet param utils/net
Author: tridge Date: 2004-11-02 11:42:35 + (Tue, 02 Nov 2004) New Revision: 3478 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3478 Log: split out some more pieces of includes.h Added: branches/SAMBA_4_0/source/include/system/printing.h Modified: branches/SAMBA_4_0/source/client/clitar.c branches/SAMBA_4_0/source/include/includes.h branches/SAMBA_4_0/source/include/structs.h branches/SAMBA_4_0/source/include/system/filesys.h branches/SAMBA_4_0/source/include/system/network.h branches/SAMBA_4_0/source/include/system/passwd.h branches/SAMBA_4_0/source/include/system/shmem.h branches/SAMBA_4_0/source/include/system/terminal.h branches/SAMBA_4_0/source/include/system/time.h branches/SAMBA_4_0/source/include/system/wait.h branches/SAMBA_4_0/source/lib/util_strlist.c branches/SAMBA_4_0/source/libnet/libnet.c branches/SAMBA_4_0/source/libnet/libnet_passwd.c branches/SAMBA_4_0/source/libnet/libnet_rpc.c branches/SAMBA_4_0/source/libnet/libnet_time.c branches/SAMBA_4_0/source/param/loadparm.c branches/SAMBA_4_0/source/utils/net/net.c branches/SAMBA_4_0/source/utils/net/net_password.c branches/SAMBA_4_0/source/utils/net/net_time.c Changeset: Sorry, the patch is too large (459 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3478
svn commit: samba r3479 - in branches/tmp: .
Author: jelmer Date: 2004-11-02 11:53:37 + (Tue, 02 Nov 2004) New Revision: 3479 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3479 Log: Create the new branch that will be used for the replacing the m4 in the build system with perl Added: branches/tmp/4.0-buildsys-perl/ Changeset: Copied: branches/tmp/4.0-buildsys-perl (from rev 3478, branches/SAMBA_4_0)
svn commit: samba r3480 - in branches/SAMBA_4_0/source: include include/system lib/tdb/common
Author: tridge Date: 2004-11-02 11:53:44 + (Tue, 02 Nov 2004) New Revision: 3480 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3480 Log: moved some signal defines into include/system Modified: branches/SAMBA_4_0/source/include/rewrite.h branches/SAMBA_4_0/source/include/system/select.h branches/SAMBA_4_0/source/include/system/wait.h branches/SAMBA_4_0/source/lib/tdb/common/tdbutil.c Changeset: Modified: branches/SAMBA_4_0/source/include/rewrite.h === --- branches/SAMBA_4_0/source/include/rewrite.h 2004-11-02 11:53:37 UTC (rev 3479) +++ branches/SAMBA_4_0/source/include/rewrite.h 2004-11-02 11:53:44 UTC (rev 3480) @@ -54,18 +54,6 @@ #include enums.h #include events.h -#ifndef LOCKING_VERSION -#define LOCKING_VERSION 4 -#endif /* LOCKING_VERSION */ - -#ifndef SIGNAL_CAST -#define SIGNAL_CAST (RETSIGTYPE (*)(int)) -#endif - -#ifndef SELECT_CAST -#define SELECT_CAST -#endif - /* * Loopback command offsets. */ Modified: branches/SAMBA_4_0/source/include/system/select.h === --- branches/SAMBA_4_0/source/include/system/select.h 2004-11-02 11:53:37 UTC (rev 3479) +++ branches/SAMBA_4_0/source/include/system/select.h 2004-11-02 11:53:44 UTC (rev 3480) @@ -24,3 +24,7 @@ #include sys/select.h #endif +#ifndef SELECT_CAST +#define SELECT_CAST +#endif + Modified: branches/SAMBA_4_0/source/include/system/wait.h === --- branches/SAMBA_4_0/source/include/system/wait.h 2004-11-02 11:53:37 UTC (rev 3479) +++ branches/SAMBA_4_0/source/include/system/wait.h 2004-11-02 11:53:44 UTC (rev 3480) @@ -35,3 +35,7 @@ #define SIGCLD SIGCHLD #endif +#ifndef SIGNAL_CAST +#define SIGNAL_CAST (RETSIGTYPE (*)(int)) +#endif + Modified: branches/SAMBA_4_0/source/lib/tdb/common/tdbutil.c === --- branches/SAMBA_4_0/source/lib/tdb/common/tdbutil.c 2004-11-02 11:53:37 UTC (rev 3479) +++ branches/SAMBA_4_0/source/lib/tdb/common/tdbutil.c 2004-11-02 11:53:44 UTC (rev 3480) @@ -20,6 +20,7 @@ #include includes.h #include system/glob.h +#include system/wait.h #include dlinklist.h /* these are little tdb utility functions that are meant to make
svn commit: samba r3481 - in branches/SAMBA_4_0/source: client include ldap_server lib lib/messaging libcli libcli/raw librpc/rpc ntvfs/cifs ntvfs/posix rpc_server smb_server smbd torture torture/basic
Author: tridge Date: 2004-11-02 12:15:17 + (Tue, 02 Nov 2004) New Revision: 3481 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3481 Log: split out client.h and events.h Modified: branches/SAMBA_4_0/source/client/client.c branches/SAMBA_4_0/source/client/clitar.c branches/SAMBA_4_0/source/include/client.h branches/SAMBA_4_0/source/include/rewrite.h branches/SAMBA_4_0/source/include/structs.h branches/SAMBA_4_0/source/ldap_server/ldap_server.c branches/SAMBA_4_0/source/lib/events.c branches/SAMBA_4_0/source/lib/messaging/messaging.c branches/SAMBA_4_0/source/libcli/clideltree.c branches/SAMBA_4_0/source/libcli/clilist.c branches/SAMBA_4_0/source/libcli/raw/clitransport.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c branches/SAMBA_4_0/source/ntvfs/posix/pvfs_wait.c branches/SAMBA_4_0/source/rpc_server/dcerpc_sock.c branches/SAMBA_4_0/source/smb_server/request.c branches/SAMBA_4_0/source/smb_server/smb_server.c branches/SAMBA_4_0/source/smbd/process_model.c branches/SAMBA_4_0/source/smbd/process_single.c branches/SAMBA_4_0/source/smbd/process_standard.c branches/SAMBA_4_0/source/smbd/service.c branches/SAMBA_4_0/source/torture/basic/dir.c branches/SAMBA_4_0/source/torture/masktest.c branches/SAMBA_4_0/source/torture/torture.c Changeset: Sorry, the patch is too large (522 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3481
svn commit: samba r3482 - in branches/SAMBA_4_0/source/lib: . socket
Author: tridge
Date: 2004-11-02 12:43:25 + (Tue, 02 Nov 2004)
New Revision: 3482
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3482
Log:
fixed a warning and an error from the IRIX 6.4 build
Modified:
branches/SAMBA_4_0/source/lib/iconv.c
branches/SAMBA_4_0/source/lib/socket/socket_unix.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/iconv.c
===
--- branches/SAMBA_4_0/source/lib/iconv.c 2004-11-02 12:15:17 UTC (rev 3481)
+++ branches/SAMBA_4_0/source/lib/iconv.c 2004-11-02 12:43:25 UTC (rev 3482)
@@ -56,7 +56,7 @@
static size_t iconv_copy (void *,const char **, size_t *, char **, size_t *);
static size_t iconv_swab (void *,const char **, size_t *, char **, size_t *);
-static const struct charset_functions const builtin_functions[] = {
+static const struct charset_functions builtin_functions[] = {
/* windows is closest to UTF-16 */
{UCS-2LE, iconv_copy, iconv_copy},
{UTF-16LE, iconv_copy, iconv_copy},
Modified: branches/SAMBA_4_0/source/lib/socket/socket_unix.c
===
--- branches/SAMBA_4_0/source/lib/socket/socket_unix.c 2004-11-02 12:15:17 UTC (rev
3481)
+++ branches/SAMBA_4_0/source/lib/socket/socket_unix.c 2004-11-02 12:43:25 UTC (rev
3482)
@@ -22,6 +22,7 @@
*/
#include includes.h
+#include system/network.h
svn commit: samba r3483 - in branches/SAMBA_4_0/source/client: .
Author: tridge Date: 2004-11-02 12:55:38 + (Tue, 02 Nov 2004) New Revision: 3483 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3483 Log: IRIX 6.4 now builds Modified: branches/SAMBA_4_0/source/client/client.c Changeset: Modified: branches/SAMBA_4_0/source/client/client.c === --- branches/SAMBA_4_0/source/client/client.c 2004-11-02 12:43:25 UTC (rev 3482) +++ branches/SAMBA_4_0/source/client/client.c 2004-11-02 12:55:38 UTC (rev 3483) @@ -28,6 +28,7 @@ #include libcli/raw/libcliraw.h #include system/time.h #include system/dir.h +#include system/filesys.h #include dlinklist.h #ifndef REGISTER
svn commit: samba r3484 - in branches/SAMBA_4_0/source: build/pidl librpc/idl librpc/ndr
Author: metze Date: 2004-11-02 13:46:39 + (Tue, 02 Nov 2004) New Revision: 3484 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3484 Log: - add support for conformant string arrays at the end of a struct - add support for strings where the length excludes the NULLTERM metze Modified: branches/SAMBA_4_0/source/build/pidl/parser.pm branches/SAMBA_4_0/source/build/pidl/util.pm branches/SAMBA_4_0/source/librpc/idl/idl_types.h branches/SAMBA_4_0/source/librpc/ndr/libndr.h branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c Changeset: Sorry, the patch is too large (278 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3484
svn commit: samba r3485 - in branches/tmp/4.0-buildsys-perl/source: . build/m4 build/smb_build lib/popt
Author: jelmer Date: 2004-11-02 13:59:14 + (Tue, 02 Nov 2004) New Revision: 3485 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3485 Log: Some work on getting rid of M4 and moving towards perl Added: branches/tmp/4.0-buildsys-perl/source/build/m4/rewrite.pm branches/tmp/4.0-buildsys-perl/source/build/smb_build/check.pm branches/tmp/4.0-buildsys-perl/source/build/smb_build/check_cc.pm branches/tmp/4.0-buildsys-perl/source/build/smb_build/check_ld.pm branches/tmp/4.0-buildsys-perl/source/build/smb_build/check_path.pm branches/tmp/4.0-buildsys-perl/source/build/smb_build/check_types.pm branches/tmp/4.0-buildsys-perl/source/build/smb_build/core.pm branches/tmp/4.0-buildsys-perl/source/build/smb_build/env.pm branches/tmp/4.0-buildsys-perl/source/build/smb_build/public.pm branches/tmp/4.0-buildsys-perl/source/configure branches/tmp/4.0-buildsys-perl/source/lib/popt/config.pm Removed: branches/tmp/4.0-buildsys-perl/source/build/m4/rewrite.m4 branches/tmp/4.0-buildsys-perl/source/build/smb_build/check_cc.m4 branches/tmp/4.0-buildsys-perl/source/build/smb_build/check_ld.m4 branches/tmp/4.0-buildsys-perl/source/build/smb_build/check_path.m4 branches/tmp/4.0-buildsys-perl/source/build/smb_build/check_perl.m4 branches/tmp/4.0-buildsys-perl/source/build/smb_build/check_shld.m4 branches/tmp/4.0-buildsys-perl/source/build/smb_build/check_types.m4 branches/tmp/4.0-buildsys-perl/source/build/smb_build/config_mk.pl branches/tmp/4.0-buildsys-perl/source/build/smb_build/core.m4 branches/tmp/4.0-buildsys-perl/source/build/smb_build/env.m4 branches/tmp/4.0-buildsys-perl/source/build/smb_build/public.m4 branches/tmp/4.0-buildsys-perl/source/configure.in branches/tmp/4.0-buildsys-perl/source/lib/popt/config.m4 Changeset: Sorry, the patch is too large (5489 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3485
svn commit: samba r3486 - in branches/SAMBA_4_0/source/rpc_server: . dcom
Author: jelmer
Date: 2004-11-02 14:52:45 + (Tue, 02 Nov 2004)
New Revision: 3486
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3486
Log:
Add RemoteActivation server
Added:
branches/SAMBA_4_0/source/rpc_server/dcom/remact.c
Modified:
branches/SAMBA_4_0/source/rpc_server/config.m4
branches/SAMBA_4_0/source/rpc_server/config.mk
branches/SAMBA_4_0/source/rpc_server/dcom/oxidresolver.c
Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/config.m4
===
--- branches/SAMBA_4_0/source/rpc_server/config.m4 2004-11-02 13:59:14 UTC (rev
3485)
+++ branches/SAMBA_4_0/source/rpc_server/config.m4 2004-11-02 14:52:45 UTC (rev
3486)
@@ -16,6 +16,7 @@
SMB_MODULE_MK(dcerpc_lsarpc,DCERPC,STATIC,rpc_server/config.mk)
SMB_MODULE_MK(dcerpc_spoolss,DCERPC,STATIC,rpc_server/config.mk)
SMB_MODULE_MK(dcerpc_IOXIDResolver,DCERPC,STATIC,rpc_server/config.mk)
+SMB_MODULE_MK(dcerpc_IRemoteActivation,DCERPC,STATIC,rpc_server/config.mk)
SMB_MODULE_MK(dcerpc_drsuapi,DCERPC,STATIC,rpc_server/config.mk)
SMB_SUBSYSTEM_MK(DCERPC,rpc_server/config.mk)
Modified: branches/SAMBA_4_0/source/rpc_server/config.mk
===
--- branches/SAMBA_4_0/source/rpc_server/config.mk 2004-11-02 13:59:14 UTC (rev
3485)
+++ branches/SAMBA_4_0/source/rpc_server/config.mk 2004-11-02 14:52:45 UTC (rev
3486)
@@ -21,8 +21,18 @@
# End MODULE dcerpc_IOXIDResolver
+
+# Start MODULE dcerpc_IRemoteActivation
+[MODULE::dcerpc_IRemoteActivation]
+INIT_OBJ_FILES = \
+ rpc_server/dcom/remact.o
+REQUIRED_SUBSYSTEMS = \
+ DCERPC_COMMON
+# End MODULE dcerpc_IRemoteActivation
+
+
# Start SUBSYSTEM SAMDB
[SUBSYSTEM::SAMDB]
Modified: branches/SAMBA_4_0/source/rpc_server/dcom/oxidresolver.c
===
--- branches/SAMBA_4_0/source/rpc_server/dcom/oxidresolver.c2004-11-02 13:59:14
UTC (rev 3485)
+++ branches/SAMBA_4_0/source/rpc_server/dcom/oxidresolver.c2004-11-02 14:52:45
UTC (rev 3486)
@@ -24,7 +24,25 @@
#include librpc/gen_ndr/ndr_oxidresolver.h
#include rpc_server/dcerpc_server.h
+struct OXIDObject
+{
+ struct GUID OID;
+};
+struct PingSet
+{
+ HYPER_T id;
+ struct OXIDObject *objects;
+ struct PingSet *prev, *next;
+};
+
+/* Maximum number of missed ping calls before a client is presumed
+ * gone */
+#define MAX_MISSED_PINGS 3
+
+/* Maximum number of seconds between two ping calls */
+#define MAX_PING_TIME 60
+
/*
ResolveOxid
*/
@@ -44,13 +62,18 @@
return WERR_NOT_SUPPORTED;
}
-
/*
ComplexPing
*/
static WERROR ComplexPing(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct ComplexPing *r)
{
+ struct PingSet *ps;
+
+ /* If r-in.SetId == 0, create new PingSet */
+
+ /* Otherwise, look up pingset by id */
+
return WERR_NOT_SUPPORTED;
}
@@ -61,7 +84,7 @@
static WERROR ServerAlive(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct ServerAlive *r)
{
- return WERR_NOT_SUPPORTED;
+ return WERR_OK;
}
@@ -84,6 +107,9 @@
return WERR_NOT_SUPPORTED;
}
+/* FIXME: Regularly ping objects in use by local programs on
+ * remote servers */
+
/* include the generated boilerplate */
#include librpc/gen_ndr/ndr_oxidresolver_s.c
Added: branches/SAMBA_4_0/source/rpc_server/dcom/remact.c
===
--- branches/SAMBA_4_0/source/rpc_server/dcom/remact.c 2004-11-02 13:59:14 UTC (rev
3485)
+++ branches/SAMBA_4_0/source/rpc_server/dcom/remact.c 2004-11-02 14:52:45 UTC (rev
3486)
@@ -0,0 +1,42 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ endpoint server for the IRemoteActivation pipe
+
+ Copyright (C) Jelmer Vernooij 2004
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include includes.h
+#include rpc_server/dcerpc_server.h
+#include
svn commit: samba r3487 - in branches/SAMBA_4_0/source: librpc/idl torture/rpc
Author: jelmer
Date: 2004-11-02 15:32:58 + (Tue, 02 Nov 2004)
New Revision: 3487
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3487
Log:
RemoteActivation works! The only odd bit is that I get either a
NT_STATUS_BUFFER_TOO_SMALL or a NT_STATUS_NET_WRITE_FAULT if I try other user
accounts. Must've got something to do with the auth padding...
Modified:
branches/SAMBA_4_0/source/librpc/idl/dcom.idl
branches/SAMBA_4_0/source/torture/rpc/remact.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/dcom.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/dcom.idl 2004-11-02 14:52:45 UTC (rev
3486)
+++ branches/SAMBA_4_0/source/librpc/idl/dcom.idl 2004-11-02 15:32:58 UTC (rev
3487)
@@ -234,7 +234,7 @@
GUID clsid; /* Clsid of unmarshaling code */
uint32 cbExtension; /* size of extension data */
uint32 size; /* size of data that follows */
- [size_is(size), ref] uint8 *pData; /* extension + class specific data
*/
+ [size_is(size)] uint8 pData[]; /* extension + class specific data */
} u_custom;
typedef struct
@@ -262,7 +262,7 @@
typedef [public] struct
{
uint32 size;
- [size_is(size)] uint8 data[];
+ [subcontext(4)] OBJREF obj;
} MInterfacePointer;
}
@@ -278,8 +278,8 @@
/* Function 0x00 */
/* Returns the interface with the specified IID
if implemented by this object */
- [local] WERROR QueryInterface([in] IID *riid
- /*FIXME, [out] void **data*/);
+ [local] WERROR QueryInterface([in] IID *riid,
+ [out,iid_is(riid)] MInterfacePointer *data);
/*/
/* Function 0x01 */
@@ -297,9 +297,9 @@
pointer_default(unique)
] interface IClassFactory : IUnknown
{
- [local] WERROR CreateInstance(/*FIXME[in] IUnknown *pUnknown,
+ [local] WERROR CreateInstance(/*FIXME[in] IUnknown *pUnknown*/,
[in] IID *riid,
- [out, iid_is(riid)] void **ppv*/);
+ [out, iid_is(riid)] MInterfacePointer *ppv);
[call_as(CreateInstance)] WERROR RemoteCreateInstance();
@@ -338,7 +338,7 @@
[in] uint32 cRefs, /* count of AddRefs requested */
[in] uint16 cIids, /* count of IIDs that follow */
[in, size_is(cIids)] IID* iids, /*, // IIDs to QI for */
-[out] MInterfacePointer *ip
+ [out, size_is(cIids)] MInterfacePointer *ip
);
typedef struct
@@ -368,8 +368,8 @@
void RemoteGetClassObject([in] GUID clsid,
[in] uint32 context,
[in] LCID locale,
-
[in] GUID iid/*FIXME,
-
[out, iid_is(iid)] void *data */);
+
[in] GUID iid,
+
[out, iid_is(iid)] MInterfacePointer data);
}
/* Looks like this is the equivalent of .NET's
Modified: branches/SAMBA_4_0/source/torture/rpc/remact.c
===
--- branches/SAMBA_4_0/source/torture/rpc/remact.c 2004-11-02 14:52:45 UTC (rev
3486)
+++ branches/SAMBA_4_0/source/torture/rpc/remact.c 2004-11-02 15:32:58 UTC (rev
3487)
@@ -32,7 +32,7 @@
struct RemoteActivation r;
NTSTATUS status;
struct GUID iids[2];
- uint16 protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC };
+ uint16 protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC,
EPM_PROTOCOL_UUID };
ZERO_STRUCT(r.in);
r.in.this.version.MajorVersion = 5;
@@ -40,7 +40,7 @@
uuid_generate_random(r.in.this.cid);
GUID_from_string(CLSID_SIMPLE, r.in.Clsid);
r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY;
- r.in.num_protseqs = 2;
+ r.in.num_protseqs = 3;
r.in.protseq = protseq;
r.in.Interfaces = 1;
GUID_from_string(DCERPC_IUNKNOWN_UUID, iids[0]);
svn commit: samba-docs r265 - in trunk/Samba-HOWTO-Collection: .
Author: jelmer Date: 2004-11-02 16:00:35 + (Tue, 02 Nov 2004) New Revision: 265 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=265 Log: Latest patch for TCP/IP in WFW 3.11 is 3.11b, not 3.11a Modified: trunk/Samba-HOWTO-Collection/Other-Clients.xml Changeset: Modified: trunk/Samba-HOWTO-Collection/Other-Clients.xml === --- trunk/Samba-HOWTO-Collection/Other-Clients.xml 2004-10-31 23:24:33 UTC (rev 264) +++ trunk/Samba-HOWTO-Collection/Other-Clients.xml 2004-11-02 16:00:35 UTC (rev 265) @@ -146,7 +146,7 @@ para Microsoft has released an incremental upgrade to their TCP/IP 32-bit VxD drivers. The latest release can be found on their ftp site at -ftp.microsoft.com, located in filename/peropsys/windows/public/tcpip/wfwt32.exe/filename. +ftp.microsoft.com, located in filename/Softlib/MSLFILES/TCP32B.EXE/filename. There is an update.txt file there that describes the problems that were fixed. New files include filenameWINSOCK.DLL/filename, filenameTELNET.EXE/filename, @@ -158,6 +158,8 @@ filenameNBTSTAT.EXE/filename. /para +paraMore information about this patch is available in ulink url=http://support.microsoft.com/kb/q99891/;Knowledge base article 99891/ulink./para + /sect2 sect2
svn commit: samba-docs r266 - in trunk/xslt: .
Author: jelmer Date: 2004-11-02 16:08:36 + (Tue, 02 Nov 2004) New Revision: 266 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=266 Log: Default to 100% sized images for HTML Modified: trunk/xslt/expand-sambadoc.xsl Changeset: Modified: trunk/xslt/expand-sambadoc.xsl === --- trunk/xslt/expand-sambadoc.xsl 2004-11-02 16:00:35 UTC (rev 265) +++ trunk/xslt/expand-sambadoc.xsl 2004-11-02 16:08:36 UTC (rev 266) @@ -277,7 +277,7 @@ /xsl:when xsl:otherwise - xsl:text50/xsl:text + xsl:text100/xsl:text /xsl:otherwise /xsl:choose /xsl:attribute
svn commit: samba r3488 - in branches/SAMBA_4_0/source/lib/dcom: . common
Author: jelmer
Date: 2004-11-02 17:09:06 + (Tue, 02 Nov 2004)
New Revision: 3488
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3488
Log:
Start using RemoteActivation
Added:
branches/SAMBA_4_0/source/lib/dcom/common/
branches/SAMBA_4_0/source/lib/dcom/common/main.c
Removed:
branches/SAMBA_4_0/source/lib/dcom/main.c
branches/SAMBA_4_0/source/lib/dcom/procedure
Modified:
branches/SAMBA_4_0/source/lib/dcom/config.mk
Changeset:
Copied: branches/SAMBA_4_0/source/lib/dcom/common/main.c (from rev 3393,
branches/SAMBA_4_0/source/lib/dcom/main.c)
===
--- branches/SAMBA_4_0/source/lib/dcom/main.c 2004-10-30 11:53:36 UTC (rev 3393)
+++ branches/SAMBA_4_0/source/lib/dcom/common/main.c2004-11-02 17:09:06 UTC (rev
3488)
@@ -0,0 +1,92 @@
+/*
+ Unix SMB/CIFS implementation.
+ Main DCOM functionality
+ Copyright (C) 2004 Jelmer Vernooij [EMAIL PROTECTED]
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include includes.h
+#include librpc/gen_ndr/ndr_epmapper.h
+#include librpc/gen_ndr/ndr_remact.h
+
+static WERROR dcom_binding_from_oxid(TALLOC_CTX *mem_ctx, HYPER_T oxid, struct
dcerpc_binding *bd)
+{
+ /* FIXME */
+ return WERR_NOT_SUPPORTED;
+}
+
+static WERROR dcom_tower_from_oxid(TALLOC_CTX *mem_ctx, HYPER_T oxid, struct
epm_tower *bd)
+{
+ /* FIXME */
+ return WERR_NOT_SUPPORTED;
+}
+
+static WERROR dcom_get_class_object (struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
struct GUID clsid)
+{
+ struct RemoteActivation r;
+ NTSTATUS status;
+ struct GUID iids[2];
+ uint16 protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC,
EPM_PROTOCOL_UUID };
+
+ ZERO_STRUCT(r.in);
+ r.in.this.version.MajorVersion = 5;
+ r.in.this.version.MinorVersion = 1;
+ uuid_generate_random(r.in.this.cid);
+ r.in.Clsid = clsid;
+ r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY;
+ r.in.num_protseqs = 3;
+ r.in.protseq = protseq;
+ r.in.Interfaces = 1;
+ GUID_from_string(DCERPC_IUNKNOWN_UUID, iids[0]);
+ r.in.pIIDs = iids;
+ r.in.Mode = MODE_GET_CLASS_OBJECT;
+
+ status = dcerpc_RemoteActivation(p, mem_ctx, r);
+ if(NT_STATUS_IS_ERR(status)) {
+ fprintf(stderr, RemoteActivation: %s\n, nt_errstr(status));
+ return ntstatus_to_werror(status);
+ }
+
+ if(!W_ERROR_IS_OK(r.out.result)) { return r.out.result; }
+ if(!W_ERROR_IS_OK(r.out.hr)) { return r.out.hr; }
+ if(!W_ERROR_IS_OK(r.out.results[0])) { return r.out.results[0]; }
+
+ return WERR_OK;
+}
+
+static WERROR dcom_create_instance (struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
struct GUID clsid)
+{
+ return WERR_NOT_SUPPORTED;
+}
+
+static uint32 IUnknown_AddRef(void)
+{
+ /* FIXME: Tell local server we're adding a reference to this interface on this
object. Local server can then call RemAddRef() if necessary */
+ return 0;
+}
+
+static uint32 IUnknown_Release(void)
+{
+ /* FIXME: Tell local server we're releasing a reference to this interface on
this object. Local server can then call RemRelease() if necessary */
+ return 0;
+}
+
+static WERROR IUnknown_QueryInterface(struct GUID *riid, void **data)
+{
+ /* FIXME: Ask local server for interface pointer. Local server can then
+* call RemQueryInterface if necessary */
+ return WERR_NOT_SUPPORTED;
+}
Modified: branches/SAMBA_4_0/source/lib/dcom/config.mk
===
--- branches/SAMBA_4_0/source/lib/dcom/config.mk2004-11-02 15:32:58 UTC (rev
3487)
+++ branches/SAMBA_4_0/source/lib/dcom/config.mk2004-11-02 17:09:06 UTC (rev
3488)
@@ -2,7 +2,7 @@
# Start SUBSYSTEM LIBDCOM
[SUBSYSTEM::LIBDCOM]
INIT_OBJ_FILES = \
- lib/dcom/main.o
+ lib/dcom/common/main.o
#
# End SUBSYSTEM LIBDCOM
Deleted: branches/SAMBA_4_0/source/lib/dcom/main.c
===
--- branches/SAMBA_4_0/source/lib/dcom/main.c 2004-11-02 15:32:58 UTC (rev 3487)
+++ branches/SAMBA_4_0/source/lib/dcom/main.c 2004-11-02 17:09:06 UTC (rev 3488)
@@ -1,65 +0,0 @@
svn commit: samba r3489 - in branches/SAMBA_4_0/source: torture/rpc utils
Author: jelmer Date: 2004-11-02 17:38:11 + (Tue, 02 Nov 2004) New Revision: 3489 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3489 Log: Add a couple more DCOM tests (Both OxidResolver and RemoteActivation are completely covered now) Modified: branches/SAMBA_4_0/source/torture/rpc/oxidresolve.c branches/SAMBA_4_0/source/torture/rpc/remact.c branches/SAMBA_4_0/source/utils/ndrdump.c Changeset: Sorry, the patch is too large (253 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3489
svn commit: samba r3490 - in branches/SAMBA_4_0/source: librpc/idl torture/rpc utils
Author: jelmer
Date: 2004-11-02 19:52:51 + (Tue, 02 Nov 2004)
New Revision: 3490
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3490
Log:
All tests work against NT4 now
Modified:
branches/SAMBA_4_0/source/librpc/idl/dcom.idl
branches/SAMBA_4_0/source/librpc/idl/oxidresolver.idl
branches/SAMBA_4_0/source/torture/rpc/oxidresolve.c
branches/SAMBA_4_0/source/utils/ndrdump.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/dcom.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/dcom.idl 2004-11-02 17:38:11 UTC (rev
3489)
+++ branches/SAMBA_4_0/source/librpc/idl/dcom.idl 2004-11-02 19:52:51 UTC (rev
3490)
@@ -262,7 +262,8 @@
typedef [public] struct
{
uint32 size;
- [subcontext(4)] OBJREF obj;
+ uint32 sizex;
+ [subcontext(4),align(1)] OBJREF obj;
} MInterfacePointer;
}
@@ -504,3 +505,19 @@
[helpstring(method MakeCoffee)] HRESULT MakeCoffee(BSTR *flavor);
}
}
+
+[
+ object,
+ uuid(000C---C000-0046),
+ helpstring(Stream)
+]
+interface IStream : IUnknown
+{
+ WERROR Read([in] uint32 num_requested,
+ [out,size_is(*num_read)] uint8 *data,
+ [out] uint32 *num_read);
+
+ WERROR Write([in,size_is(num_requested)] uint8 *data,
+[in] uint32 num_requested,
+[out] uint32 *num_written);
+}
Modified: branches/SAMBA_4_0/source/librpc/idl/oxidresolver.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/oxidresolver.idl 2004-11-02 17:38:11
UTC (rev 3489)
+++ branches/SAMBA_4_0/source/librpc/idl/oxidresolver.idl 2004-11-02 19:52:51
UTC (rev 3490)
@@ -29,17 +29,13 @@
/* Method to get the protocol sequences, string bindings */
/* and machine id for an object server given its OXID. */
- typedef [public] struct {
- DUALSTRINGARRAY *ppdsaOxidBindings;
- } ppdsaOxidBindingsArray;
-
[idempotent] WERROR ResolveOxid (
-[in] OXID *pOxid,
+[in] OXID pOxid,
[in] uint16 cRequestedProtseqs,
[in, size_is(cRequestedProtseqs)] uint16 arRequestedProtseqs[],
-[out, ref] ppdsaOxidBindingsArray *ppdsaOxidBindings,
-[out, ref] IPID *pipidRemUnknown,
-[out, ref] uint32 *pAuthnHint
+[out] DUALSTRINGARRAY *ppdsaOxidBindings,
+[out] IPID pipidRemUnknown,
+[out] uint32 pAuthnHint
);
/* Simple ping is used to ping a Set. Client machines use this */
@@ -55,15 +51,16 @@
/* whole set can subsequently be pinged using SimplePing, */
/* thus reducing network traffic. */
[idempotent] WERROR ComplexPing (
- [in, out, ref] SETID *SetId, /* In of 0 on first call for new set. */
-[in] uint16 SequenceNum,
-[in] uint16 cAddToSet,
-[in] uint16 cDelFromSet,
+ [in] SETID *SetId, /* In of 0 on first call for new set. */
+ [out] SETID SetId,
+ [in] uint16 SequenceNum,
+ [in] uint16 cAddToSet,
+ [in] uint16 cDelFromSet,
/* add these OIDs to the set */
-[in, size_is(cAddToSet)] OID AddToSet[],
+ [in, size_is(cAddToSet)] OID AddToSet[],
/*remove these OIDs from the set */
-[in, size_is(cDelFromSet)] OID DelFromSet[],
- [out] uint16 pPingBackoffFactor/* 2^factor = multipler */
+ [in, size_is(cDelFromSet)] OID DelFromSet[],
+ [out] uint16 PingBackoffFactor/* 2^factor = multipler */
);
/* In some cases the client maybe unsure that a particular */
@@ -79,16 +76,15 @@
/* version 5.2 and above. Looks like that means
* Windows 2003/XP and above */
[idempotent] WERROR ResolveOxid2 (
-
[in] OXID *pOxid,
+
[in] OXID pOxid,
[in] uint16 cRequestedProtseqs,
-
[in, size_is(cRequestedProtseqs)]
-
uint16 arRequestedProtseqs[],
-
[out, ref] ppdsaOxidBindingsArray *ppdsaOxidBindings,
-
svn commit: samba r3491 - in trunk/source: libads utils
Author: jra
Date: 2004-11-02 21:28:07 + (Tue, 02 Nov 2004)
New Revision: 3491
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3491
Log:
Fixes from testing kerberos salted principal fix.
Jeremy.
Modified:
trunk/source/libads/kerberos.c
trunk/source/libads/kerberos_keytab.c
trunk/source/utils/net_ads.c
Changeset:
Modified: trunk/source/libads/kerberos.c
===
--- trunk/source/libads/kerberos.c 2004-11-02 19:52:51 UTC (rev 3490)
+++ trunk/source/libads/kerberos.c 2004-11-02 21:28:07 UTC (rev 3491)
@@ -362,8 +362,8 @@
}
if ((err = krb5_get_credentials(ctx, 0, ccache, creds, new_creds))) {
- DEBUG(5,(get_service_ticket: krb5_get_credentials for %s failed:
%s\n,
- service_s, error_message(err)));
+ DEBUG(5,(get_service_ticket: krb5_get_credentials for %s enctype %d
failed: %s\n,
+ service_s, enctype, error_message(err)));
goto out;
}
@@ -602,24 +602,13 @@
Go through all the possible enctypes for this principal.
/
- void kerberos_derive_salting_principal(krb5_context context,
+static void kerberos_derive_salting_principal_direct(krb5_context context,
krb5_ccache ccache,
krb5_enctype *enctypes,
char *service_principal)
{
int i;
- BOOL free_ccache = False;
- if (ccache == NULL) {
- krb5_error_code ret;
- if ((ret = krb5_cc_resolve(context, LIBADS_CCACHE_NAME, ccache)) !=
0) {
- DEBUG(0, (kerberos_derive_salting_principal: krb5_cc_resolve
for %s failed: %s\n,
- LIBADS_CCACHE_NAME, error_message(ret)));
- return;
- }
- free_ccache = True;
- }
-
/* Try for each enctype separately, because the rules are
* different for different enctypes. */
for (i = 0; enctypes[i] != 0; i++) {
@@ -640,10 +629,49 @@
enctypes[i],
enctypes);
}
+}
- if (free_ccache ccache) {
- krb5_cc_close(context, ccache);
+/
+ Wrapper function for the above.
+ /
+
+void kerberos_derive_salting_principal(char *service_principal)
+{
+ krb5_context context = NULL;
+ krb5_enctype *enctypes = NULL;
+ krb5_ccache ccache = NULL;
+ krb5_error_code ret = 0;
+
+ initialize_krb5_error_table();
+ if ((ret = krb5_init_context(context)) != 0) {
+ DEBUG(1,(kerberos_derive_cifs_salting_principals: krb5_init_context
failed. %s\n,
+ error_message(ret)));
+ return;
}
+ if ((ret = get_kerberos_allowed_etypes(context, enctypes)) != 0) {
+ DEBUG(1,(kerberos_derive_cifs_salting_principals:
get_kerberos_allowed_etypes failed. %s\n,
+ error_message(ret)));
+ goto out;
+ }
+
+ if ((ret = krb5_cc_resolve(context, LIBADS_CCACHE_NAME, ccache)) != 0) {
+ DEBUG(3, (get_service_ticket: krb5_cc_resolve for %s failed: %s\n,
+ LIBADS_CCACHE_NAME, error_message(ret)));
+ goto out;
+ }
+
+ kerberos_derive_salting_principal_direct(context, ccache, enctypes,
service_principal);
+
+ out:
+ if (enctypes) {
+ free_kerberos_etypes(context, enctypes);
+ }
+ if (ccache) {
+ krb5_cc_destroy(context, ccache);
+ }
+ if (context) {
+ krb5_free_context(context);
+ }
}
/
@@ -681,38 +709,38 @@
if (asprintf(service, %s$, global_myname()) != -1) {
strlower_m(service);
- kerberos_derive_salting_principal(context, ccache, enctypes, service);
+ kerberos_derive_salting_principal_direct(context, ccache, enctypes,
service);
SAFE_FREE(service);
}
if (asprintf(service, cifs/%s, global_myname()) != -1) {
strlower_m(service);
- kerberos_derive_salting_principal(context, ccache, enctypes, service);
+ kerberos_derive_salting_principal_direct(context, ccache, enctypes,
service);
SAFE_FREE(service);
}
if (asprintf(service, host/%s, global_myname()) != -1) {
strlower_m(service);
- kerberos_derive_salting_principal(context, ccache, enctypes,
svn commit: samba r3492 - in branches/SAMBA_3_0/source: libads utils
Author: jra
Date: 2004-11-02 21:28:14 + (Tue, 02 Nov 2004)
New Revision: 3492
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3492
Log:
Fixes from testing kerberos salted principal fix.
Jeremy.
Modified:
branches/SAMBA_3_0/source/libads/kerberos.c
branches/SAMBA_3_0/source/libads/kerberos_keytab.c
branches/SAMBA_3_0/source/utils/net_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/kerberos.c
===
--- branches/SAMBA_3_0/source/libads/kerberos.c 2004-11-02 21:28:07 UTC (rev 3491)
+++ branches/SAMBA_3_0/source/libads/kerberos.c 2004-11-02 21:28:14 UTC (rev 3492)
@@ -362,8 +362,8 @@
}
if ((err = krb5_get_credentials(ctx, 0, ccache, creds, new_creds))) {
- DEBUG(5,(get_service_ticket: krb5_get_credentials for %s failed:
%s\n,
- service_s, error_message(err)));
+ DEBUG(5,(get_service_ticket: krb5_get_credentials for %s enctype %d
failed: %s\n,
+ service_s, enctype, error_message(err)));
goto out;
}
@@ -602,24 +602,13 @@
Go through all the possible enctypes for this principal.
/
- void kerberos_derive_salting_principal(krb5_context context,
+static void kerberos_derive_salting_principal_direct(krb5_context context,
krb5_ccache ccache,
krb5_enctype *enctypes,
char *service_principal)
{
int i;
- BOOL free_ccache = False;
- if (ccache == NULL) {
- krb5_error_code ret;
- if ((ret = krb5_cc_resolve(context, LIBADS_CCACHE_NAME, ccache)) !=
0) {
- DEBUG(0, (kerberos_derive_salting_principal: krb5_cc_resolve
for %s failed: %s\n,
- LIBADS_CCACHE_NAME, error_message(ret)));
- return;
- }
- free_ccache = True;
- }
-
/* Try for each enctype separately, because the rules are
* different for different enctypes. */
for (i = 0; enctypes[i] != 0; i++) {
@@ -640,10 +629,49 @@
enctypes[i],
enctypes);
}
+}
- if (free_ccache ccache) {
- krb5_cc_close(context, ccache);
+/
+ Wrapper function for the above.
+ /
+
+void kerberos_derive_salting_principal(char *service_principal)
+{
+ krb5_context context = NULL;
+ krb5_enctype *enctypes = NULL;
+ krb5_ccache ccache = NULL;
+ krb5_error_code ret = 0;
+
+ initialize_krb5_error_table();
+ if ((ret = krb5_init_context(context)) != 0) {
+ DEBUG(1,(kerberos_derive_cifs_salting_principals: krb5_init_context
failed. %s\n,
+ error_message(ret)));
+ return;
}
+ if ((ret = get_kerberos_allowed_etypes(context, enctypes)) != 0) {
+ DEBUG(1,(kerberos_derive_cifs_salting_principals:
get_kerberos_allowed_etypes failed. %s\n,
+ error_message(ret)));
+ goto out;
+ }
+
+ if ((ret = krb5_cc_resolve(context, LIBADS_CCACHE_NAME, ccache)) != 0) {
+ DEBUG(3, (get_service_ticket: krb5_cc_resolve for %s failed: %s\n,
+ LIBADS_CCACHE_NAME, error_message(ret)));
+ goto out;
+ }
+
+ kerberos_derive_salting_principal_direct(context, ccache, enctypes,
service_principal);
+
+ out:
+ if (enctypes) {
+ free_kerberos_etypes(context, enctypes);
+ }
+ if (ccache) {
+ krb5_cc_destroy(context, ccache);
+ }
+ if (context) {
+ krb5_free_context(context);
+ }
}
/
@@ -681,38 +709,38 @@
if (asprintf(service, %s$, global_myname()) != -1) {
strlower_m(service);
- kerberos_derive_salting_principal(context, ccache, enctypes, service);
+ kerberos_derive_salting_principal_direct(context, ccache, enctypes,
service);
SAFE_FREE(service);
}
if (asprintf(service, cifs/%s, global_myname()) != -1) {
strlower_m(service);
- kerberos_derive_salting_principal(context, ccache, enctypes, service);
+ kerberos_derive_salting_principal_direct(context, ccache, enctypes,
service);
SAFE_FREE(service);
}
if (asprintf(service, host/%s, global_myname()) != -1) {
strlower_m(service);
-
svn commit: samba r3493 - in branches/SAMBA_4_0/source/smb_server: .
Author: tridge
Date: 2004-11-02 22:01:11 + (Tue, 02 Nov 2004)
New Revision: 3493
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3493
Log:
fixed a bug in readx reply where the client specifies an invalid high
part of the maxcnt. This caused an allocation failure and server exit.
Note: we need to go back over all the places in the core smb_server
that can cause allocation failures based on user input and fix them to
instead produce a SMB error.
Thanks to Susan for finding this bug.
Modified:
branches/SAMBA_4_0/source/smb_server/reply.c
Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/reply.c
===
--- branches/SAMBA_4_0/source/smb_server/reply.c2004-11-02 21:28:14 UTC (rev
3492)
+++ branches/SAMBA_4_0/source/smb_server/reply.c2004-11-02 22:01:11 UTC (rev
3493)
@@ -892,8 +892,14 @@
io-readx.in.offset= IVAL(req-in.vwv, VWV(3));
io-readx.in.maxcnt= SVAL(req-in.vwv, VWV(5));
io-readx.in.mincnt= SVAL(req-in.vwv, VWV(6));
- io-readx.in.maxcnt |= IVAL(req-in.vwv, VWV(7)) 16;
io-readx.in.remaining = SVAL(req-in.vwv, VWV(9));
+
+ if (req-smb_conn-negotiate.client_caps CAP_LARGE_READX) {
+ uint32_t high_part = IVAL(req-in.vwv, VWV(7));
+ if (high_part == 1) {
+ io-readx.in.maxcnt |= high_part 16;
+ }
+ }
/* the 64 bit variant */
if (req-in.wct == 12) {
svn commit: samba r3494 - in branches/SAMBA_4_0/source: client gtk/tools include ldap_server lib lib/cmdline lib/registry/tools libcli nsswitch param smbd torture utils utils/net
Author: tridge Date: 2004-11-03 00:17:12 + (Wed, 03 Nov 2004) New Revision: 3494 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3494 Log: got rid of include/rewrite.h, and split out the dynconfig.h header Removed: branches/SAMBA_4_0/source/include/rewrite.h Modified: branches/SAMBA_4_0/source/client/client.c branches/SAMBA_4_0/source/gtk/tools/gepdump.c branches/SAMBA_4_0/source/gtk/tools/gregedit.c branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c branches/SAMBA_4_0/source/gtk/tools/gwsam.c branches/SAMBA_4_0/source/include/charset.h branches/SAMBA_4_0/source/include/includes.h branches/SAMBA_4_0/source/include/pstring.h branches/SAMBA_4_0/source/include/smb.h branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c branches/SAMBA_4_0/source/lib/cmdline/popt_common.c branches/SAMBA_4_0/source/lib/debug.c branches/SAMBA_4_0/source/lib/registry/tools/regdiff.c branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c branches/SAMBA_4_0/source/lib/registry/tools/regshell.c branches/SAMBA_4_0/source/lib/registry/tools/regtree.c branches/SAMBA_4_0/source/lib/substitute.c branches/SAMBA_4_0/source/lib/util.c branches/SAMBA_4_0/source/libcli/namequery.c branches/SAMBA_4_0/source/nsswitch/winbind_nss_config.h branches/SAMBA_4_0/source/param/loadparm.c branches/SAMBA_4_0/source/smbd/rewrite.c branches/SAMBA_4_0/source/torture/gentest.c branches/SAMBA_4_0/source/torture/locktest.c branches/SAMBA_4_0/source/torture/masktest.c branches/SAMBA_4_0/source/torture/torture.c branches/SAMBA_4_0/source/utils/net/net.c branches/SAMBA_4_0/source/utils/ntlm_auth.c Changeset: Sorry, the patch is too large (650 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3494
svn commit: samba r3495 - branches/SAMBA_3_0/source/include branches/SAMBA_3_0/source/libads trunk/source/include trunk/source/libads
Author: gd
Date: 2004-11-03 00:29:09 + (Wed, 03 Nov 2004)
New Revision: 3495
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3495
Log:
Fix the build (recent kerberos-changes).
Guenther
Modified:
branches/SAMBA_3_0/source/include/includes.h
branches/SAMBA_3_0/source/libads/kerberos.c
branches/SAMBA_3_0/source/libads/kerberos_verify.c
trunk/source/include/includes.h
trunk/source/libads/kerberos.c
trunk/source/libads/kerberos_verify.c
Changeset:
Modified: branches/SAMBA_3_0/source/include/includes.h
===
--- branches/SAMBA_3_0/source/include/includes.h2004-11-03 00:17:12 UTC (rev
3494)
+++ branches/SAMBA_3_0/source/include/includes.h2004-11-03 00:29:09 UTC (rev
3495)
@@ -1349,7 +1349,9 @@
BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context,
DATA_BLOB *session_key, BOOL remote);
krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry
*kt_entry);
krb5_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context,
krb5_principal host_princ, int enctype);
-
+void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype);
+BOOL kerberos_compatible_enctypes(krb5_context context, krb5_enctype enctype1,
krb5_enctype enctype2);
+void kerberos_free_data_contents(krb5_context context, krb5_data *pdata);
#endif /* HAVE_KRB5 */
Modified: branches/SAMBA_3_0/source/libads/kerberos.c
===
--- branches/SAMBA_3_0/source/libads/kerberos.c 2004-11-03 00:17:12 UTC (rev 3494)
+++ branches/SAMBA_3_0/source/libads/kerberos.c 2004-11-03 00:29:09 UTC (rev 3495)
@@ -635,7 +635,7 @@
Wrapper function for the above.
/
-void kerberos_derive_salting_principal(char *service_principal)
+BOOL kerberos_derive_salting_principal(char *service_principal)
{
krb5_context context = NULL;
krb5_enctype *enctypes = NULL;
@@ -646,7 +646,7 @@
if ((ret = krb5_init_context(context)) != 0) {
DEBUG(1,(kerberos_derive_cifs_salting_principals: krb5_init_context
failed. %s\n,
error_message(ret)));
- return;
+ return False;
}
if ((ret = get_kerberos_allowed_etypes(context, enctypes)) != 0) {
DEBUG(1,(kerberos_derive_cifs_salting_principals:
get_kerberos_allowed_etypes failed. %s\n,
@@ -672,6 +672,8 @@
if (context) {
krb5_free_context(context);
}
+
+ return ret ? False : True;
}
/
Modified: branches/SAMBA_3_0/source/libads/kerberos_verify.c
===
--- branches/SAMBA_3_0/source/libads/kerberos_verify.c 2004-11-03 00:17:12 UTC (rev
3494)
+++ branches/SAMBA_3_0/source/libads/kerberos_verify.c 2004-11-03 00:29:09 UTC (rev
3495)
@@ -231,7 +231,6 @@
char *host_princ_s = NULL;
BOOL got_replay_mutex = False;
- fstring myname;
BOOL auth_ok = False;
ZERO_STRUCT(packet);
Modified: trunk/source/include/includes.h
===
--- trunk/source/include/includes.h 2004-11-03 00:17:12 UTC (rev 3494)
+++ trunk/source/include/includes.h 2004-11-03 00:29:09 UTC (rev 3495)
@@ -1356,7 +1356,9 @@
BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context,
DATA_BLOB *session_key, BOOL remote);
krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry
*kt_entry);
krb5_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context,
krb5_principal host_princ, int enctype);
-
+void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype);
+BOOL kerberos_compatible_enctypes(krb5_context context, krb5_enctype enctype1,
krb5_enctype enctype2);
+void kerberos_free_data_contents(krb5_context context, krb5_data *pdata);
#endif /* HAVE_KRB5 */
Modified: trunk/source/libads/kerberos.c
===
--- trunk/source/libads/kerberos.c 2004-11-03 00:17:12 UTC (rev 3494)
+++ trunk/source/libads/kerberos.c 2004-11-03 00:29:09 UTC (rev 3495)
@@ -635,7 +635,7 @@
Wrapper function for the above.
/
-void kerberos_derive_salting_principal(char *service_principal)
+BOOL kerberos_derive_salting_principal(char *service_principal)
{
krb5_context context = NULL;
krb5_enctype *enctypes = NULL;
@@ -646,7 +646,7 @@
if ((ret = krb5_init_context(context)) != 0) {
DEBUG(1,(kerberos_derive_cifs_salting_principals: krb5_init_context
failed. %s\n,
error_message(ret)));
- return;
+
svn commit: samba r3496 - branches/SAMBA_3_0/source/smbd trunk/source/smbd
Author: gd
Date: 2004-11-03 00:32:08 + (Wed, 03 Nov 2004)
New Revision: 3496
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3496
Log:
Fix calling of get_acl_group_bits().
Guenther
Modified:
branches/SAMBA_3_0/source/smbd/dosmode.c
branches/SAMBA_3_0/source/smbd/posix_acls.c
trunk/source/smbd/dosmode.c
trunk/source/smbd/posix_acls.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/dosmode.c
===
--- branches/SAMBA_3_0/source/smbd/dosmode.c2004-11-03 00:29:09 UTC (rev 3495)
+++ branches/SAMBA_3_0/source/smbd/dosmode.c2004-11-03 00:32:08 UTC (rev 3496)
@@ -344,7 +344,9 @@
return(-1);
}
- get_acl_group_bits(conn, fname, st-st_mode);
+ if (!get_acl_group_bits(conn, fname, st-st_mode)) {
+ return(-1);
+ }
if (S_ISDIR(st-st_mode))
dosmode |= aDIR;
Modified: branches/SAMBA_3_0/source/smbd/posix_acls.c
===
--- branches/SAMBA_3_0/source/smbd/posix_acls.c 2004-11-03 00:29:09 UTC (rev 3495)
+++ branches/SAMBA_3_0/source/smbd/posix_acls.c 2004-11-03 00:32:08 UTC (rev 3496)
@@ -3226,7 +3226,7 @@
}
}
SMB_VFS_SYS_ACL_FREE_ACL(conn, posix_acl);
- return -1;
+ return result;
}
/
Modified: trunk/source/smbd/dosmode.c
===
--- trunk/source/smbd/dosmode.c 2004-11-03 00:29:09 UTC (rev 3495)
+++ trunk/source/smbd/dosmode.c 2004-11-03 00:32:08 UTC (rev 3496)
@@ -344,7 +344,9 @@
return(-1);
}
- get_acl_group_bits(conn, fname, st-st_mode);
+ if (!get_acl_group_bits(conn, fname, st-st_mode)) {
+ return(-1);
+ }
if (S_ISDIR(st-st_mode))
dosmode |= aDIR;
Modified: trunk/source/smbd/posix_acls.c
===
--- trunk/source/smbd/posix_acls.c 2004-11-03 00:29:09 UTC (rev 3495)
+++ trunk/source/smbd/posix_acls.c 2004-11-03 00:32:08 UTC (rev 3496)
@@ -3226,7 +3226,7 @@
}
}
SMB_VFS_SYS_ACL_FREE_ACL(conn, posix_acl);
- return -1;
+ return result;
}
/
svn commit: samba r3497 - in branches/SAMBA_4_0/source: include librpc/rpc rpc_server rpc_server/remote torture/rpc utils
Author: tridge Date: 2004-11-03 00:38:05 + (Wed, 03 Nov 2004) New Revision: 3497 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3497 Log: removed some include cruft, and split out librpc/gen_ndr/tables.h Modified: branches/SAMBA_4_0/source/include/cli_context.h branches/SAMBA_4_0/source/include/includes.h branches/SAMBA_4_0/source/include/local.h branches/SAMBA_4_0/source/include/smb_macros.h branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c branches/SAMBA_4_0/source/rpc_server/remote/dcesrv_remote.c branches/SAMBA_4_0/source/torture/rpc/mgmt.c branches/SAMBA_4_0/source/torture/rpc/scanner.c branches/SAMBA_4_0/source/utils/ndrdump.c Changeset: Sorry, the patch is too large (325 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3497
svn commit: samba r3498 - branches/SAMBA_3_0/source/sam trunk/source/sam
Author: gd
Date: 2004-11-03 00:39:34 + (Wed, 03 Nov 2004)
New Revision: 3498
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3498
Log:
Optimisation of idmap_rid init: Avoid calling a DC for the domain-sid
when trusted domains are disabled anyway.
Guenther
Modified:
branches/SAMBA_3_0/source/sam/idmap_rid.c
trunk/source/sam/idmap_rid.c
Changeset:
Modified: branches/SAMBA_3_0/source/sam/idmap_rid.c
===
--- branches/SAMBA_3_0/source/sam/idmap_rid.c 2004-11-03 00:38:05 UTC (rev 3497)
+++ branches/SAMBA_3_0/source/sam/idmap_rid.c 2004-11-03 00:39:34 UTC (rev 3498)
@@ -152,13 +152,32 @@
char *domain = NULL;
uint32 info_class = 5;
char *domain_name = NULL;
- DOM_SID *domain_sid;
+ DOM_SID *domain_sid, sid;
fstring sid_str;
int i;
uint32 trusted_num_domains = 0;
char **trusted_domain_names;
DOM_SID *trusted_domain_sids;
-
+ uint32 enum_ctx = 0;
+
+ /* put the results together */
+ *num_domains = 1;
+ *domain_names = (fstring *) malloc(sizeof(fstring) * *num_domains);
+ *domain_sids = (DOM_SID *) malloc(sizeof(DOM_SID) * *num_domains);
+
+ /* avoid calling a DC when trusted domains are not allowed anyway */
+ if (!lp_allow_trusted_domains()) {
+
+ fstrcpy((*domain_names)[0], lp_workgroup());
+ if (!secrets_fetch_domain_sid(lp_workgroup(), sid)) {
+ DEBUG(0,(rid_idmap_get_domains: failed to retrieve domain
sid\n));
+ return status;
+ }
+ sid_copy((*domain_sids)[0], sid);
+
+ return NT_STATUS_OK;
+ }
+
/* create mem_ctx */
if (!(mem_ctx = talloc_init(rid_idmap_get_trusted_domains))) {
DEBUG(0, (rid_idmap_get_domains: talloc_init() failed\n));
@@ -229,37 +248,32 @@
sid_to_string(sid_str, domain_sid);
DEBUG(10,(rid_idmap_get_domains: my domain: [%s], sid: [%s]\n, domain_name,
sid_str));
- if (lp_allow_trusted_domains()) {
+ /* scan trusted domains */
+ DEBUG(10, (rid_idmap_get_domains: enumerating trusted domains\n));
+ status = cli_lsa_enum_trust_dom(cli, mem_ctx, pol, enum_ctx,
+ trusted_num_domains,
+ trusted_domain_names,
+ trusted_domain_sids);
- uint32 enum_ctx = 0;
+ if (!NT_STATUS_IS_OK(status)
+ !NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)
+ !NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
+ DEBUG(1, (rid_idmap_get_domains: could not enumerate trusted
domains\n));
+ goto out;
+ }
- /* scan trusted domains */
- DEBUG(10, (rid_idmap_get_domains: enumerating trusted domains\n));
- status = cli_lsa_enum_trust_dom(cli, mem_ctx, pol, enum_ctx,
- trusted_num_domains,
- trusted_domain_names,
- trusted_domain_sids);
-
- if (!NT_STATUS_IS_OK(status)
- !NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)
- !NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
- DEBUG(1, (rid_idmap_get_domains: could not enumerate trusted
domains\n));
- goto out;
- }
-
- /* show trusted domains */
- DEBUG(10,(rid_idmap_get_domains: scan for trusted domains gave %d
results:\n, trusted_num_domains));
- for (i=0; itrusted_num_domains; i++) {
- sid_to_string(sid_str, trusted_domain_sids[i]);
- DEBUGADD(10,(rid_idmap_get_domains:\t#%d\tDOMAIN: [%s], SID:
[%s]\n,
- i, trusted_domain_names[i], sid_str));
- }
+ /* show trusted domains */
+ DEBUG(10,(rid_idmap_get_domains: scan for trusted domains gave %d
results:\n, trusted_num_domains));
+ for (i=0; itrusted_num_domains; i++) {
+ sid_to_string(sid_str, trusted_domain_sids[i]);
+ DEBUGADD(10,(rid_idmap_get_domains:\t#%d\tDOMAIN: [%s], SID: [%s]\n,
+ i, trusted_domain_names[i], sid_str));
}
/* put the results together */
*num_domains = trusted_num_domains + 1;
- *domain_names = (fstring *) malloc(sizeof(fstring) * *num_domains);
- *domain_sids = (DOM_SID *) malloc(sizeof(DOM_SID) * *num_domains);
+ *domain_names = (fstring *) realloc(domain_names, sizeof(fstring) *
*num_domains);
+ *domain_sids = (DOM_SID *) realloc(domain_sids, sizeof(DOM_SID) *
*num_domains);
/* first add myself at the end*/
fstrcpy((*domain_names)[0], domain_name);
Modified: trunk/source/sam/idmap_rid.c
svn commit: samba r3499 - in branches/SAMBA_4_0/source/torture/rpc: .
Author: tridge Date: 2004-11-03 01:50:10 + (Wed, 03 Nov 2004) New Revision: 3499 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3499 Log: setting an out param for a non-pointer doesn't do anything (and generated a warning as it was being set to a ptr) Modified: branches/SAMBA_4_0/source/torture/rpc/oxidresolve.c Changeset: Modified: branches/SAMBA_4_0/source/torture/rpc/oxidresolve.c === --- branches/SAMBA_4_0/source/torture/rpc/oxidresolve.c 2004-11-03 00:39:34 UTC (rev 3498) +++ branches/SAMBA_4_0/source/torture/rpc/oxidresolve.c 2004-11-03 01:50:10 UTC (rev 3499) @@ -105,7 +105,6 @@ r.in.SequenceNum = 0; r.in.SetId = setid; - r.out.SetId = setid; r.in.cAddToSet = 1; r.in.AddToSet = oid;
svn commit: samba r3500 - in branches/SAMBA_4_0/source: smb_server smbd
Author: tridge
Date: 2004-11-03 01:50:49 + (Wed, 03 Nov 2004)
New Revision: 3500
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3500
Log:
cleaned up the AS_USER/AS_GUEST stuff in the core smb packet processing
Modified:
branches/SAMBA_4_0/source/smb_server/smb_server.c
branches/SAMBA_4_0/source/smbd/rewrite.c
Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/smb_server.c
===
--- branches/SAMBA_4_0/source/smb_server/smb_server.c 2004-11-03 01:50:10 UTC (rev
3499)
+++ branches/SAMBA_4_0/source/smb_server/smb_server.c 2004-11-03 01:50:49 UTC (rev
3500)
@@ -170,18 +170,10 @@
}
/*
-These flags determine some of the permissions required to do an operation
-
-Note that I don't set NEED_WRITE on some write operations because they
-are used by some brain-dead clients when printing, and I don't want to
-force write permissions on print services.
+ These flags determine some of the permissions required to do an operation
*/
#define AS_USER (10)
-#define NEED_WRITE (11)
-#define TIME_INIT (12)
-#define CAN_IPC (13)
-#define AS_GUEST (15)
-#define USE_MUTEX (17)
+#define USE_MUTEX (11)
/*
define a list of possible SMB messages and their corresponding
@@ -195,18 +187,18 @@
int flags;
}
smb_messages[256] = {
-/* 0x00 */ { SMBmkdir,reply_mkdir,AS_USER | NEED_WRITE},
-/* 0x01 */ { SMBrmdir,reply_rmdir,AS_USER | NEED_WRITE},
-/* 0x02 */ { SMBopen,reply_open,AS_USER },
+/* 0x00 */ { SMBmkdir,reply_mkdir,AS_USER},
+/* 0x01 */ { SMBrmdir,reply_rmdir,AS_USER},
+/* 0x02 */ { SMBopen,reply_open,AS_USER},
/* 0x03 */ { SMBcreate,reply_mknew,AS_USER},
-/* 0x04 */ { SMBclose,reply_close,AS_USER | CAN_IPC },
+/* 0x04 */ { SMBclose,reply_close,AS_USER},
/* 0x05 */ { SMBflush,reply_flush,AS_USER},
-/* 0x06 */ { SMBunlink,reply_unlink,AS_USER | NEED_WRITE },
-/* 0x07 */ { SMBmv,reply_mv,AS_USER | NEED_WRITE },
+/* 0x06 */ { SMBunlink,reply_unlink,AS_USER},
+/* 0x07 */ { SMBmv,reply_mv,AS_USER},
/* 0x08 */ { SMBgetatr,reply_getatr,AS_USER},
-/* 0x09 */ { SMBsetatr,reply_setatr,AS_USER | NEED_WRITE},
+/* 0x09 */ { SMBsetatr,reply_setatr,AS_USER},
/* 0x0a */ { SMBread,reply_read,AS_USER},
-/* 0x0b */ { SMBwrite,reply_write,AS_USER | CAN_IPC },
+/* 0x0b */ { SMBwrite,reply_write,AS_USER},
/* 0x0c */ { SMBlock,reply_lock,AS_USER},
/* 0x0d */ { SMBunlock,reply_unlock,AS_USER},
/* 0x0e */ { SMBctemp,reply_ctemp,AS_USER },
@@ -229,23 +221,23 @@
/* 0x1f */ { SMBwriteBs,reply_writebs,AS_USER},
/* 0x20 */ { SMBwritec,NULL,0},
/* 0x21 */ { NULL, NULL, 0 },
-/* 0x22 */ { SMBsetattrE,reply_setattrE,AS_USER | NEED_WRITE },
-/* 0x23 */ { SMBgetattrE,reply_getattrE,AS_USER },
-/* 0x24 */ { SMBlockingX,reply_lockingX,AS_USER },
-/* 0x25 */ { SMBtrans,reply_trans,AS_USER | CAN_IPC },
-/* 0x26 */ { SMBtranss,NULL,AS_USER | CAN_IPC},
+/* 0x22 */ { SMBsetattrE,reply_setattrE,AS_USER},
+/* 0x23 */ { SMBgetattrE,reply_getattrE,AS_USER},
+/* 0x24 */ { SMBlockingX,reply_lockingX,AS_USER},
+/* 0x25 */ { SMBtrans,reply_trans,AS_USER},
+/* 0x26 */ { SMBtranss,NULL,AS_USER},
/* 0x27 */ { SMBioctl,reply_ioctl,0},
/* 0x28 */ { SMBioctls,NULL,AS_USER},
-/* 0x29 */ { SMBcopy,reply_copy,AS_USER | NEED_WRITE },
-/* 0x2a */ { SMBmove,NULL,AS_USER | NEED_WRITE },
+/* 0x29 */ { SMBcopy,reply_copy,AS_USER},
+/* 0x2a */ { SMBmove,NULL,AS_USER},
/* 0x2b */ { SMBecho,reply_echo,0},
/* 0x2c */ { SMBwriteclose,reply_writeclose,AS_USER},
-/* 0x2d */ { SMBopenX,reply_open_and_X,AS_USER | CAN_IPC },
-/* 0x2e */ { SMBreadX,reply_read_and_X,AS_USER | CAN_IPC },
-/* 0x2f */ { SMBwriteX,reply_write_and_X,AS_USER | CAN_IPC },
+/* 0x2d */ { SMBopenX,reply_open_and_X,AS_USER},
+/* 0x2e */ { SMBreadX,reply_read_and_X,AS_USER},
+/* 0x2f */ { SMBwriteX,reply_write_and_X,AS_USER},
/* 0x30 */ { NULL, NULL, 0 },
/* 0x31 */ { NULL, NULL, 0 },
-/* 0x32 */ { SMBtrans2, reply_trans2, AS_USER | CAN_IPC },
+/* 0x32 */ { SMBtrans2, reply_trans2, AS_USER},
/* 0x33 */ { SMBtranss2, reply_transs2, AS_USER},
/* 0x34 */ { SMBfindclose, reply_findclose,AS_USER},
/* 0x35 */ { SMBfindnclose, reply_findnclose, AS_USER},
@@ -355,9 +347,9 @@
/* 0x9d */ { NULL, NULL, 0 },
/* 0x9e */ { NULL, NULL, 0 },
/* 0x9f */ { NULL, NULL, 0 },
-/* 0xa0 */ { SMBnttrans, reply_nttrans, AS_USER | CAN_IPC },
-/* 0xa1 */ { SMBnttranss, reply_nttranss, AS_USER | CAN_IPC },
-/* 0xa2 */ { SMBntcreateX, reply_ntcreate_and_X, AS_USER | CAN_IPC },
+/* 0xa0 */ { SMBnttrans, reply_nttrans, AS_USER},
+/* 0xa1 */ { SMBnttranss, reply_nttranss, AS_USER},
+/* 0xa2 */ { SMBntcreateX, reply_ntcreate_and_X, AS_USER},
/* 0xa3 */ { NULL, NULL, 0 },
/* 0xa4 */ { SMBntcancel, reply_ntcancel, 0 },
/* 0xa5 */ { SMBntrename, reply_ntrename, 0 },
@@ -403,14 +395,14 @@
/* 0xcd */ { NULL, NULL, 0 },
/* 0xce */ { NULL, NULL, 0 },
/* 0xcf */ { NULL, NULL, 0 },
-/* 0xd0 */ { SMBsends,reply_sends,AS_GUEST},
-/* 0xd1 */ { SMBsendb,NULL,AS_GUEST},
-/* 0xd2 */ { SMBfwdname,NULL,AS_GUEST},
svn commit: samba r3501 - in branches/SAMBA_4_0/source/gtk: . tools
Author: jelmer Date: 2004-11-03 01:55:21 + (Wed, 03 Nov 2004) New Revision: 3501 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3501 Log: More work towards MGMT support in gepdump Modified: branches/SAMBA_4_0/source/gtk/config.mk branches/SAMBA_4_0/source/gtk/tools/gepdump.c Changeset: Sorry, the patch is too large (431 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3501
svn commit: samba r3502 - in branches/SAMBA_3_0/source/libads: .
Author: jra
Date: 2004-11-03 02:18:51 + (Wed, 03 Nov 2004)
New Revision: 3502
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3502
Log:
Tidy up debugging in kerberos_keytab code.
Jeremy.
Modified:
branches/SAMBA_3_0/source/libads/kerberos_keytab.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/kerberos_keytab.c
===
--- branches/SAMBA_3_0/source/libads/kerberos_keytab.c 2004-11-03 01:55:21 UTC (rev
3501)
+++ branches/SAMBA_3_0/source/libads/kerberos_keytab.c 2004-11-03 02:18:51 UTC (rev
3502)
@@ -148,7 +148,7 @@
if (ret != KRB5_KT_END ret != ENOENT ) {
DEBUG(3,(ads_keytab_add_entry: Will try to delete old keytab
entries\n));
while(!krb5_kt_next_entry(context, keytab, kt_entry, cursor)) {
- BOOL compare_ok = False;
+ BOOL compare_name_ok = False;
ret = krb5_unparse_name(context, kt_entry.principal, ktprinc);
if (ret) {
@@ -166,43 +166,59 @@
*/
#ifdef HAVE_KRB5_KT_COMPARE
- compare_ok = ((krb5_kt_compare(context, kt_entry, princ, 0,
0) == True) (kt_entry.vno != kvno - 1));
+ compare_name_ok = (krb5_kt_compare(context, kt_entry, princ,
0, 0) == True);
#else
- compare_ok = ((strcmp(ktprinc, princ_s) == 0) (kt_entry.vno
!= kvno - 1));
+ compare_name_ok = (strcmp(ktprinc, princ_s) == 0);
#endif
+
+ if (!compare_name_ok) {
+ DEBUG(10,(ads_keytab_add_entry: ignoring keytab entry
principal %s, kvno = %d\n,
+ ktprinc, kt_entry.vno));
+ }
+
krb5_free_unparsed_name(context, ktprinc);
ktprinc = NULL;
- if (compare_ok) {
- DEBUG(3,(ads_keytab_add_entry: Found old entry for
principal: %s (kvno %d) - trying to remove it.\n,
- princ_s, kt_entry.vno));
- ret = krb5_kt_end_seq_get(context, keytab, cursor);
- ZERO_STRUCT(cursor);
- if (ret) {
- DEBUG(1,(ads_keytab_add_entry:
krb5_kt_end_seq_get() failed (%s)\n,
- error_message(ret)));
- goto out;
+ if (compare_name_ok) {
+ if (kt_entry.vno == kvno - 1) {
+ DEBUG(5,(ads_keytab_add_entry: Saving
previous (kvno %d) entry for principal: %s.\n,
+ kvno - 1, princ_s));
+ } else {
+
+ DEBUG(5,(ads_keytab_add_entry: Found old
entry for principal: %s (kvno %d) - trying to remove it.\n,
+ princ_s, kt_entry.vno));
+ ret = krb5_kt_end_seq_get(context, keytab,
cursor);
+ ZERO_STRUCT(cursor);
+ if (ret) {
+ DEBUG(1,(ads_keytab_add_entry:
krb5_kt_end_seq_get() failed (%s)\n,
+ error_message(ret)));
+ goto out;
+ }
+ ret = krb5_kt_remove_entry(context, keytab,
kt_entry);
+ if (ret) {
+ DEBUG(1,(ads_keytab_add_entry:
krb5_kt_remove_entry failed (%s)\n,
+ error_message(ret)));
+ goto out;
+ }
+
+ DEBUG(5,(ads_keytab_add_entry: removed old
entry for principal: %s (kvno %d).\n,
+ princ_s, kt_entry.vno));
+
+ ret = krb5_kt_start_seq_get(context, keytab,
cursor);
+ if (ret) {
+ DEBUG(1,(ads_keytab_add_entry:
krb5_kt_start_seq failed (%s)\n,
+ error_message(ret)));
+ goto out;
+ }
+ ret = smb_krb5_kt_free_entry(context,
kt_entry);
+ ZERO_STRUCT(kt_entry);
+ if (ret) {
+
svn commit: samba r3503 - in trunk/source/libads: .
Author: jra
Date: 2004-11-03 02:18:57 + (Wed, 03 Nov 2004)
New Revision: 3503
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3503
Log:
Tidy up debugging in kerberos_keytab code.
Jeremy.
Modified:
trunk/source/libads/kerberos_keytab.c
Changeset:
Modified: trunk/source/libads/kerberos_keytab.c
===
--- trunk/source/libads/kerberos_keytab.c 2004-11-03 02:18:51 UTC (rev 3502)
+++ trunk/source/libads/kerberos_keytab.c 2004-11-03 02:18:57 UTC (rev 3503)
@@ -149,7 +149,7 @@
if (ret != KRB5_KT_END ret != ENOENT ) {
DEBUG(3,(ads_keytab_add_entry: Will try to delete old keytab
entries\n));
while(!krb5_kt_next_entry(context, keytab, kt_entry, cursor)) {
- BOOL compare_ok = False;
+ BOOL compare_name_ok = False;
ret = krb5_unparse_name(context, kt_entry.principal, ktprinc);
if (ret) {
@@ -167,43 +167,59 @@
*/
#ifdef HAVE_KRB5_KT_COMPARE
- compare_ok = ((krb5_kt_compare(context, kt_entry, princ, 0,
0) == True) (kt_entry.vno != kvno - 1));
+ compare_name_ok = (krb5_kt_compare(context, kt_entry, princ,
0, 0) == True);
#else
- compare_ok = ((strcmp(ktprinc, princ_s) == 0) (kt_entry.vno
!= kvno - 1));
+ compare_name_ok = (strcmp(ktprinc, princ_s) == 0);
#endif
+
+ if (!compare_name_ok) {
+ DEBUG(10,(ads_keytab_add_entry: ignoring keytab entry
principal %s, kvno = %d\n,
+ ktprinc, kt_entry.vno));
+ }
+
krb5_free_unparsed_name(context, ktprinc);
ktprinc = NULL;
- if (compare_ok) {
- DEBUG(3,(ads_keytab_add_entry: Found old entry for
principal: %s (kvno %d) - trying to remove it.\n,
- princ_s, kt_entry.vno));
- ret = krb5_kt_end_seq_get(context, keytab, cursor);
- ZERO_STRUCT(cursor);
- if (ret) {
- DEBUG(1,(ads_keytab_add_entry:
krb5_kt_end_seq_get() failed (%s)\n,
- error_message(ret)));
- goto out;
+ if (compare_name_ok) {
+ if (kt_entry.vno == kvno - 1) {
+ DEBUG(5,(ads_keytab_add_entry: Saving
previous (kvno %d) entry for principal: %s.\n,
+ kvno - 1, princ_s));
+ } else {
+
+ DEBUG(5,(ads_keytab_add_entry: Found old
entry for principal: %s (kvno %d) - trying to remove it.\n,
+ princ_s, kt_entry.vno));
+ ret = krb5_kt_end_seq_get(context, keytab,
cursor);
+ ZERO_STRUCT(cursor);
+ if (ret) {
+ DEBUG(1,(ads_keytab_add_entry:
krb5_kt_end_seq_get() failed (%s)\n,
+ error_message(ret)));
+ goto out;
+ }
+ ret = krb5_kt_remove_entry(context, keytab,
kt_entry);
+ if (ret) {
+ DEBUG(1,(ads_keytab_add_entry:
krb5_kt_remove_entry failed (%s)\n,
+ error_message(ret)));
+ goto out;
+ }
+
+ DEBUG(5,(ads_keytab_add_entry: removed old
entry for principal: %s (kvno %d).\n,
+ princ_s, kt_entry.vno));
+
+ ret = krb5_kt_start_seq_get(context, keytab,
cursor);
+ if (ret) {
+ DEBUG(1,(ads_keytab_add_entry:
krb5_kt_start_seq failed (%s)\n,
+ error_message(ret)));
+ goto out;
+ }
+ ret = smb_krb5_kt_free_entry(context,
kt_entry);
+ ZERO_STRUCT(kt_entry);
+ if (ret) {
+ DEBUG(1,(ads_keytab_add_entry:
krb5_kt_remove_entry
svn commit: samba r3504 - branches/SAMBA_3_0/source/python/samba trunk/source/python/samba
Author: tpot Date: 2004-11-03 06:12:07 + (Wed, 03 Nov 2004) New Revision: 3504 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3504 Log: Fix incorrectly applied patch. My fault - sorry! Modified: branches/SAMBA_3_0/source/python/samba/printerdata.py trunk/source/python/samba/printerdata.py Changeset: Modified: branches/SAMBA_3_0/source/python/samba/printerdata.py === --- branches/SAMBA_3_0/source/python/samba/printerdata.py 2004-11-03 02:18:57 UTC (rev 3503) +++ branches/SAMBA_3_0/source/python/samba/printerdata.py 2004-11-03 06:12:07 UTC (rev 3504) @@ -62,4 +62,5 @@ return self.hnd.getprinterdataex(self.key, key)['data'] def __getitem__(self, key): -return self.printerdata_ex_subkey(self.host, key, self.creds, access) +return self.printerdata_ex_subkey( +self.host, key, self.creds, self.access) Modified: trunk/source/python/samba/printerdata.py === --- trunk/source/python/samba/printerdata.py2004-11-03 02:18:57 UTC (rev 3503) +++ trunk/source/python/samba/printerdata.py2004-11-03 06:12:07 UTC (rev 3504) @@ -62,4 +62,5 @@ return self.hnd.getprinterdataex(self.key, key)['data'] def __getitem__(self, key): -return self.printerdata_ex_subkey(self.host, key, self.creds, access) +return self.printerdata_ex_subkey( +self.host, key, self.creds, self.access)
svn commit: samba r3505 - in branches/SAMBA_4_0/source/scripting/swig: .
Author: tpot Date: 2004-11-03 06:12:42 + (Wed, 03 Nov 2004) New Revision: 3505 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3505 Log: #include dynconfig.h Modified: branches/SAMBA_4_0/source/scripting/swig/dcerpc.i Changeset: Modified: branches/SAMBA_4_0/source/scripting/swig/dcerpc.i === --- branches/SAMBA_4_0/source/scripting/swig/dcerpc.i 2004-11-03 06:12:07 UTC (rev 3504) +++ branches/SAMBA_4_0/source/scripting/swig/dcerpc.i 2004-11-03 06:12:42 UTC (rev 3505) @@ -34,6 +34,7 @@ #endif #include includes.h +#include dynconfig.h #undef strcpy
svn commit: samba r3506 - in branches/SAMBA_4_0/source/scripting/swig/torture: .
Author: tpot
Date: 2004-11-03 06:29:22 + (Wed, 03 Nov 2004)
New Revision: 3506
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=3506
Log:
Test EnumPorts function.
Modified:
branches/SAMBA_4_0/source/scripting/swig/torture/spoolss.py
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/swig/torture/spoolss.py
===
--- branches/SAMBA_4_0/source/scripting/swig/torture/spoolss.py 2004-11-03 06:12:42
UTC (rev 3505)
+++ branches/SAMBA_4_0/source/scripting/swig/torture/spoolss.py 2004-11-03 06:29:22
UTC (rev 3506)
@@ -104,15 +104,22 @@
print 'spoolss_EnumPorts()'
-r = {}
-r['handle'] = handle
-r['level'] = 1
-r['buffer'] = None
-r['buf_size'] = 0
+for level in [1, 2]:
-result = ResizeBufferCall(dcerpc.spoolss_EnumPorts, pipe, r)
+r = {}
+r['handle'] = handle
+r['servername'] = None
+r['level'] = level
+result = ResizeBufferCall(dcerpc.spoolss_EnumPorts, pipe, r)
+ports = dcerpc.unmarshall_spoolss_PortInfo_array(
+result['buffer'], r['level'], result['count'])
+
+if level == 1:
+port_names = map(lambda x: x['info1']['port_name'], ports)
+
+
def test_DeleteForm(pipe, handle, formname):
r = {}
@@ -377,6 +384,7 @@
handle = test_OpenPrinterEx(pipe, printername)
test_GetPrinter(pipe, handle)
+test_EnumPorts(pipe, handle)
test_EnumForms(pipe, handle)
test_AddForm(pipe, handle)
test_EnumJobs(pipe, handle)
