[Samba] samba+cups failure - no printers in the share list
Hi! It seems my samba and cups won't communicate with each other. I've configured samba to load the printers from cups: load printers = yes printing = cups printcap name = cups [printers] comment = All Printers path = /var/spool/samba printable = yes public = no read only = yes create mode = 0700 valid users = @digiszfv printer admin = daniell # lpstat -t scheduler is running no system default destination device for hp_lj_p2015n: socket://192.168.1.66 hp_lj_p2015n accepting requests since 2008. okt. 10., p?ek, 08.49.44 CEST printer hp_lj_p2015n is idle. enabled since 2008. okt. 10., p?ek, 08.49.44 CEST Despite all this, samba fails to advertise the printer: # smbclient -U daniell -L FILESERVER Enter daniell's password: Domain=[DIGISZFV] OS=[Unix] Server=[Samba 3.2.3] Sharename Type Comment - --- print$ Disk Printer Drivers ugyfelszolgalat Disk Ugyfélszolgálat adminisztrator Disk Adminisztrátorok optikus Disk Szemészet IPC$IPC IPC Service (Samba (fileserver)) daniell Disk Home Directories Domain=[DIGISZFV] OS=[Unix] Server=[Samba 3.2.3] What am I missing? Any help would be appreciated. Thanks! Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Compile help for Solaris 10 x86, samba 3.0.28a deficient?
Sin = Solaris I thought you knew :-) I've been a Solaris user for 10 years and an admin for 3 and I can tell you I'm still clueless with some things. For example I had a system that I moved and plugged into a different fiber connect. Well Sun's BootProm (there version of POST) helpfully changed the configuration of the FC card from 1000 full to autonegotiate. Funny thing really autonegotiate doesn't work in Solaris unless the other side is set to auto too. Makes sense doesn't it :-) Man I was scratching my head for 3 hours with a Sun engineer on the phone because an identical workstation (just different software installed) was at the new location and working fine, all of a sudden both wouldn't work. Anyways Solaris is rock solid just don't touch it unless you have a day to spare. On Oct 12, 2008, at 1:58 PM, Dennis Clarke wrote: On Sunday 12 October 2008 07:55:01 Jake Carroll wrote: I sort of hoped that somebody would release pre-built binaries for Sol 10 x86, unfortunately, all I can find on samba.org is a long way out of date SPARC binary of 3.0.23. There are Blastwave x86 packages out there. If you have searched the old posts on this list, you should have found that maintainer (Dennis Clarke) even posted links here on the list. Here you go: Samba 3.0.31: http://www.blastwave.org/testing/samba-3.0.31,REV=2008.08.22-SunOS5.8-i386-CSW.pkg.bz2 Samba 3.2.2: http://www.blastwave.org/testing/samba-3.2.2,REV=2008.08.22-SunOS5.8-i386-CSW.pkg.gz I don't know if the links are still functional. They function .. always have .. always will .. until we release them to all the mirrors. The poor man should work with me .. sounds like we have both worked in lonely miserable long nights and days and wondered why we were being punished, what sins had we committed that we deserved this. yes .. it is that bad. Dennis -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Cluster: node to node switching
Hi *, I use samba 3.2.3 actually and have problems to switch between two nodes in a cluster in an active directory environment. I know of CTDB but I want to keep it simple and so I use a shared folder for the .tdb files. But it does not work since samba 3.2 anymore. After switching from one node to another I have to delete the .tdb files and join again to the domain to have access to samba. What I'm doing wrong here? Thanks and regards, Aleksander -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba+cups failure - no printers in the share list
LÉVAI Dániel wrote: Hi! It seems my samba and cups won't communicate with each other. I've configured samba to load the printers from cups: load printers = yes printing = cups printcap name = cups [printers] comment = All Printers path = /var/spool/samba printable = yes public = no read only = yes create mode = 0700 valid users = @digiszfv printer admin = daniell # lpstat -t scheduler is running no system default destination device for hp_lj_p2015n: socket://192.168.1.66 hp_lj_p2015n accepting requests since 2008. okt. 10., p?ek, 08.49.44 CEST printer hp_lj_p2015n is idle. enabled since 2008. okt. 10., p?ek, 08.49.44 CEST Despite all this, samba fails to advertise the printer: # smbclient -U daniell -L FILESERVER Enter daniell's password: Domain=[DIGISZFV] OS=[Unix] Server=[Samba 3.2.3] Sharename Type Comment - --- print$ Disk Printer Drivers ugyfelszolgalat Disk Ugyfélszolgálat adminisztrator Disk Adminisztrátorok optikus Disk Szemészet IPC$IPC IPC Service (Samba (fileserver)) daniell Disk Home Directories Domain=[DIGISZFV] OS=[Unix] Server=[Samba 3.2.3] What am I missing? Any help would be appreciated. What this post is missing is some more info I think. Samba is 3.2.3 Cups is 1.3.8 OS is a Debian testing Kernel is linux kernel 2.6.24 The printers doesn't show on Linux nor on Win. On the Cups www admin page, I can print out a test page, so the printer is usable. The problem is with the link between cups and samba. Can't seem to figure or find out what is it, though. Thanks in advance! Daniel -- LEVAI Daniel PGP key ID = 0x4AC0A4B1 Key fingerprint = D037 03B9 C12D D338 4412 2D83 1373 917A 4AC0 A4B1 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Write/Modify issues
I'm having problems with one share. It's mounting a directory on an isilon over NFS. I've re-created the setup on the same machine where the data is and that works fine, it's just the existing share gives trouble. I can create a file, but not rename and sometimes not delete. Also saving file from say photoshop result in two empty files being created one with the proper filename and another with a temp one, then error with the file is write protected/disk full. Below is a log file snippet with fill_share_mode_lock failed, could that be an indicator? I'm using 3.2.4, and I tried 3.0.32. Our old/current setup works fine 3.0.20. Cheers, Kristian smb.conf [global] unix charset = LOCALE workgroup = ABC realm = AD.ABC.LOCAL password server = * netbios name = samba server string = SAMBA security = ADS encrypt passwords = yes preferred master = no local master = no os level = 33 log level = 10 syslog = 1 log file = /var/log/samba/%m max log size = 5dap ssl = no idmap uid = 950-2 idmap gid = 600-2 template shell = /bin/bash winbind separator = + winbind use default domain = Yes socket options = TCP_NODELAY logon home = \\samba\%U [share] read only = No create mask = 0664 directory mask = 0775 blocking locks = No locking = No oplocks = No level2 oplocks = No posix locking = No strict locking = No case sensitive = yes SNIP [2008/10/13 13:35:28, 5] smbd/filename.c:unix_convert(149) unix_convert called on file art_dept/allRender/New Text Document.txt [2008/10/13 13:35:28, 5] smbd/filename.c:unix_convert(290) conversion finished art_dept/allRender/New Text Document.txt - art_dept/allRender/New Text Document.txt [2008/10/13 13:35:28, 5] smbd/trans2.c:call_trans2findfirst(2007) dir=art_dept/allRender, mask = New Text Document.txt [2008/10/13 13:35:28, 5] smbd/dir.c:dptr_create(402) dptr_create dir=art_dept/allRender [2008/10/13 13:35:28, 3] smbd/dir.c:dptr_create(520) creating new dirptr 256 for path art_dept/allRender, expect_close = 1 [2008/10/13 13:35:28, 4] smbd/trans2.c:call_trans2findfirst(2074) dptr_num is 256, wcard = New Text Document.txt, attr = 22 [2008/10/13 13:35:28, 8] smbd/trans2.c:call_trans2findfirst(2079) dirpath=art_dept/allRender dontdescend= [2008/10/13 13:35:28, 8] smbd/trans2.c:get_lanman2_dir_entry(1312) get_lanman2_dir_entry:readdir on dirptr 0x861cd10 now at offset -1 [2008/10/13 13:35:28, 8] smbd/dosmode.c:dos_mode(354) dos_mode: art_dept/allRender/New Text Document.txt [2008/10/13 13:35:28, 8] smbd/dosmode.c:dos_mode_from_sbuf(170) dos_mode_from_sbuf returning [2008/10/13 13:35:28, 8] smbd/dosmode.c:dos_mode(394) dos_mode returning [2008/10/13 13:35:28, 3] locking/locking.c:fetch_share_mode_unlocked(857) fill_share_mode_lock failed [2008/10/13 13:35:28, 5] smbd/trans2.c:get_lanman2_dir_entry(1443) get_lanman2_dir_entry: found art_dept/allRender/New Text Document.txt fname=New Text Document.txt [2008/10/13 13:35:28, 10] smbd/trans2.c:get_lanman2_dir_entry(1592) get_lanman2_dir_entry: SMB_FIND_FILE_BOTH_DIRECTORY_INFO [2008/10/13 13:35:28, 10] smbd/mangle_hash2.c:hash2_name_to_8_3(609) hash2_name_to_8_3: New Text Document.txt - 124541D5 - N52HZ2~T.TXT (cache=1) [2008/10/13 13:35:28, 5] smbd/trans2.c:call_trans2findfirst(2135) call_trans2findfirst - (2) closing dptr_num 256 [2008/10/13 13:35:28, 4] smbd/dir.c:dptr_close_internal(251) closing dptr key 256 [2008/10/13 13:35:28, 9] smbd/trans2.c:send_trans2_replies(833) t2_rep: params_sent_thistime = 10, data_sent_thistime = 136, useable_space = 131010 [2008/10/13 13:35:28, 9] smbd/trans2.c:send_trans2_replies(835) t2_rep: params_to_send = 10, data_to_send = 136, paramsize = 10, datasize = 136 [2008/10/13 13:35:28, 5] lib/util.c:show_msg(642) SNIP -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] heimdal/AD documentation
as i promise last week, a incomplete documentation about configuring a trust beetween a heimdal kdc and a windows AD domain really sorry for non-french speakers of course, i'm very interresting in any feedback... Pascal configuration - le realm Kerberos est DEMO.LOCAL - le realm du domaine AD est ad.demo.local La configuration du KDC lui même ne présente pas de difficulté particulière. Nous utilisons un KDC Heimdal sur un serveur FreeBSD 6.2. Le service de nom de domaine est utilisé pour localiser les services du KDC, rendant la configuration des postes clients minimale (utile surtout pour les postes non windows). Les enregistrements spécifiques créés pour Kerberos : kerberosIN CNAME ns0 _kerberos._udp IN SRV 01 00 88 kerberos _kerberos._tcp IN SRV 01 00 88 kerberos _kpasswd._udp IN SRV 01 00 464 kerberos _kerberos-adm._tcp IN SRV 01 00 749 kerberos _kerberos IN TXT DEMO.LOCAL Attention : Kerberos est très sensible à deux choses : la synchronisation (nécessité d'utiliser ntp pour synchroniser les horloges des machines impliquéees) et la résolution de nom. l'utilisation d'un CNAME pour le serveur ne pose pas de problème, mais la résolution inverse (PTR) doit absolument être configurée de manière adéquate. Pour le détail de l'installation du KDC, suivre l'excellent article du handbook FreeBSD. Mise en place de la relation de confiance : La confiance entre les deux realms Kerberos repose sur un principal partagé avec une clef commune. - côté Windows : dans Outils d'administrations Domaines et approbations Active Directory Sur le domaine AD (ici ad.demo.local) clic droit et propriété, puis onglet approbations, cliquer sur nouvelle approbation. Suivre l'assistant, grosso modo, on peut tout laisser par défaut. Le mot de passe choisi est particulièrement important : la sécurité de la relation d'approbation repose sur lui... Par contre, il n'aura à être rentré que deux fois à la création des clefs et n'a même pas besoin d'être conservé. - côté Unix : se connecter à l'application d'administration du realm en faisant par exemple : # kadmin -l créer la clef de confiance : kadmin ank krbtgt/[EMAIL PROTECTED] ... avec le même mot de passe utilisé sous Windows. Un prinicipal suffit ici, puisque l'approbation doit être unilatérale. Toute la difficulté consiste dans la gestion catastrophique des types de clefs par Windows. Le plus simple consiste à laisser Heimdal créer ses clefs avec les types par défaut et à supprimer ensuite celles qui sont en trop pour ne laisser que le minimum. Ce que supporte les différentes versions successives de Windows 2000 à 2003 n'est pas très clair. La seule solution raisonnable, à moins d'être sur de son fait est de ne laisser que le type des-cbc-crc. Pour voir le détail d'un principal et les types de clefs qu'il contient : kadmin get krbtgt/AD.DEMO.LOCAL regarder la dernière ligne : Keytypes(salttype[(salt-value)]): des3-cbc-sha1(pw-salt), des-cbc-md5 (pw-salt), des-cbc-md4(pw-salt), des-cbc-crc(pw-salt) supprimer les types qui nous embêtent (enfin, qui embêtent l'AD...) avec par exemple : kadmin del_enctype krbtgt/AD.DEMO.LOCAL des3-cbc-sha1 etc, jusqu'à ne garder plus que Keytypes(salttype[(salt-value)]): des-cbc-crc(pw-salt) La relation de confiance devrait maintenant être fonctionnelle. configuration des postes Windows : Windows devrait savoir (dans certaines versions seulement...) utiliser DNS pour retrouver le KDC (enregistrement SRV) mais de toute façon pas le realm (enregistrement TXT). Il faut donc intervenir sur chaque machine, à commencer par le pdc lui même avec un outil qui se trouve dans les supports tools de Windows 2003 serveur, à trouver sur le CD et installer séparément. Ensuite : ksetup /addkdc DEMO.LOCAL kerberos.bsg.local mappage des utilisateurs Pour que les utilisateurs puissent accéder aux ressources du domaine, l'AD doit pouvoir trouver un compte qui corresponde. Il faut réaliser un mappage entre les principals Kerberos et les comptes du domaine. Le mappage peut être réalisé globalement avec ksetup /mapuser * * ou par utilisateur dans l'interface de gestion des comptes de l'AD. Activer les fonctions avancées et faire un clic droit sur l'utilisateur et mappage des utilisateurs on devrait maintenant pouvoir se logger sur un poste du domaine en utilisant le domaine Kerberos... quelques outils utiles... sur unix : acquérir un ticket initial sur un KDC # kinit [EMAIL PROTECTED] lister les tickets kerberos avec le détails (notamment les fameux enctypes...) # klist -v se connecter sur un partage en utilisant le ticket kerberos : # smbclient -k //serveur/partage on peut aussi accèder au ldap du contrôlleur de domaine : ldapsearch -H ldap://dc.ad.bsg.local -b dc=ad,dc=bsg,dc=local sur Windows : il faut installer le ressource Kit Windows (à télécharger sur microsoft.com) pour utiliser klist.exe et ktray.exe
[Samba] samba member of workgroup
Hello, I want to setup a samba server http://www.linuxquestions.org/questions/#as a member of a workgroup, for example MYWORKGROUP. I want to share a folder, for example /share. This share should be available to example.com domain clients only. Can someone give me a smb.conf for that? Would that do it? [global] workgroup = MYWORKGROUP server string = Samba Server Version %v security = domain hosts allow = .example.com [share] comment = Public Stuff path = /share public = no writable = no printable = no Thank you. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba+cups failure - no printers in the share list
Hi! Self compiled Samba? Does ldd smbd has a link to libcups? If you have a smbd that is linked to libcups and cups is running, it will work! Only reason why it wouldn't could be access rights in your cups configuration. After you verified, that libcups is used, it might be a good idea to increase the log level of samba and cups and examine the logfiles. They might contain the information you need. Bye, Martin LÉVAI Dániel schrieb: LÉVAI Dániel wrote: Hi! It seems my samba and cups won't communicate with each other. I've configured samba to load the printers from cups: load printers = yes printing = cups printcap name = cups [printers] comment = All Printers path = /var/spool/samba printable = yes public = no read only = yes create mode = 0700 valid users = @digiszfv printer admin = daniell # lpstat -t scheduler is running no system default destination device for hp_lj_p2015n: socket://192.168.1.66 hp_lj_p2015n accepting requests since 2008. okt. 10., p?ek, 08.49.44 CEST printer hp_lj_p2015n is idle. enabled since 2008. okt. 10., p?ek, 08.49.44 CEST Despite all this, samba fails to advertise the printer: # smbclient -U daniell -L FILESERVER Enter daniell's password: Domain=[DIGISZFV] OS=[Unix] Server=[Samba 3.2.3] Sharename Type Comment - --- print$ Disk Printer Drivers ugyfelszolgalat Disk Ugyfélszolgálat adminisztrator Disk Adminisztrátorok optikus Disk Szemészet IPC$IPC IPC Service (Samba (fileserver)) daniell Disk Home Directories Domain=[DIGISZFV] OS=[Unix] Server=[Samba 3.2.3] What am I missing? Any help would be appreciated. What this post is missing is some more info I think. Samba is 3.2.3 Cups is 1.3.8 OS is a Debian testing Kernel is linux kernel 2.6.24 The printers doesn't show on Linux nor on Win. On the Cups www admin page, I can print out a test page, so the printer is usable. The problem is with the link between cups and samba. Can't seem to figure or find out what is it, though. Thanks in advance! Daniel -- Martin Zielinski[EMAIL PROTECTED] Softwareentwicklung T +49 (0)521 94226 76 SEH Computertechnik GmbHwww.seh.de -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Print server communications back to the client during printing
Hello All, I was wondering if anyone knows why a print server needs to talk back on the submitting client's ports 139 or 445? We are running Samba and we have pretty heavy firewall restrictions on our clients and we have noticed that interacting with the print server can seem to have lags in responses (job submission, print options, queue config, etc). Using the logging feature of the windows firewall we noticed the print server trying to talk back to the client's ports mentioned above. We also noticed that our Win2k3 server does the same thing and it isn't obvious as to why. Besides punching holes in the firewall is there a feature that can be turned off so that this doesn't happen, particularly in Samba (3.0.28)? Sorry to show my ignorance of this sort of thing but I am not sure how to phrase a Google query to get to the bottom of this. Many thanks. Marc Taylor -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] netlogon script not running...(upgrade from 3.0.25b to 3.2.4)
Hi all, I have been using samba for a very long time and have just upgraded my 3.0.25b servers to 3.2.4. I have a bunch of BDC's located in different areas of the country and a PDC running at HQ. I'm using LDAP as the user directory and I replicate the tree to every site. Samba looks up users using the replicas. I also use netlogon scripts to mount drives and set the time when the clients log on. But, The last machine upgraded (Novell SLES10 x86_64) refuses to serve the netlogon script anymore. I have another exactly the same machine and smb.conf that does work, but this one does not. I can see it the log.smbd that when the client logs on, the netlogon share is mapped and disconnected, but I can't understand why it refuses to run the netlogon script. I have compared file permissions and configuration files, but I can't find any difference. Can someone give me a hint on how to go on debugging this problem and perhaps find the reason ? Best regards, Johan Landerholm -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Print server communications back to the client during printing
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Taylor, Marc wrote: Hello All, I was wondering if anyone knows why a print server needs to talk back on the submitting client's ports 139 or 445? It's Microsoft's async print change notification protocol. Jeremy had talked about adding a separate timetou for the back channel connect, but I don't remember if this was ever done. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFI82/4IR7qMdg1EfYRAg8tAKDI3xZ9+9ydqksP5kIJO6Te8TxnRwCdEiD2 3l/1K+Ebt95hBYZf0V6z7mk= =XIcK -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] AD to authenticate users against Samba + LDAP
Hi all, I was wondering if it is possible to make MS Active Directory to authenticate against Samba + LDAP? I have a working Samba + LDAP setup in the data centre and need to have MS Active Directory to authenticate against the userbase which has been already setup on Samba + LDAP. I have seen user guides on how to make samba to authenticate against AD, but not other way around. Is it possible at all? Are there any useful guides? Many thanks -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba + LDAP PDC Vista SP1 logins stopped working
Hi All, After upgrade to Vista SP1 the logins to Samba + LDAP PDC stopped working. Looking further at the problem I have identified that the problem is with the usernames that we have, which are name@domain.com. For some reason beyond my understanding, it seems that the if the username contains a dot . followed by one or more character, I get the following error in Vista: The local Session Manager service failed the logon. The data area passed to a system call is too small If the username has no dots . or the dot is the last character in the username (for example username. ) the authentication works fine. Initially I have thought that the problem is is entirely the fault of SP1, however, I have tried to replicate the same setup on MS Active directory server 2003 and authentication of the users with exactly the same name works flawlessly. I tried to enable debugging mode in Samba, however was not able to see any error or warning messages, nor do I have anything useful in the Vista event viewer. I am a little lost and have no idea how to fix this issue. Did anyone experience similar problems? Any tips or ideas would be great. My setup is: Linux Gentoo Samba 3.0.32 LDAP 2.3.43 Windows client: Windows Vista SP1 Business Edition with latest updates. Many thanks andrei -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] netlogon script not running...(upgrade from 3.0.25b to 3.2.4)
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Read the changelog. I think there was a change around 3.0.28 that may be causing this problem. There are some tricks to variable expansion or something like that. Forgive me if I'm wrong, I just seem to remember it myself. =R Johan Landerholm wrote: Hi all, I have been using samba for a very long time and have just upgraded my 3.0.25b servers to 3.2.4. I have a bunch of BDC's located in different areas of the country and a PDC running at HQ. I'm using LDAP as the user directory and I replicate the tree to every site. Samba looks up users using the replicas. I also use netlogon scripts to mount drives and set the time when the clients log on. But, The last machine upgraded (Novell SLES10 x86_64) refuses to serve the netlogon script anymore. I have another exactly the same machine and smb.conf that does work, but this one does not. I can see it the log.smbd that when the client logs on, the netlogon share is mapped and disconnected, but I can't understand why it refuses to run the netlogon script. I have compared file permissions and configuration files, but I can't find any difference. Can someone give me a hint on how to go on debugging this problem and perhaps find the reason ? Best regards, Johan Landerholm - -- _ _ _ _ ___ _ _ _ |Y#| | | |\/| | \ |\ | | |Ryan Novosielski - Systems Programmer II |$| |__| | | |__/ | \| _| |[EMAIL PROTECTED] - 973/972.0922 (2-0922) \__/ Univ. of Med. and Dent.|IST/AST - NJMS Medical Science Bldg - C630 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFI839Mmb+gadEcsb4RAgn4AJ9gU9wfPF237u73tz7pL5CVBojMSACeKEXm Wtl3UJSPe6Ccf4dvst3tJzg= =FaUl -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Server Maps by IP but not by Name for Domain Users
Hey all, I've got an issue with my Samba server. I can't seem to get file shares to map using Server Name, but I can get them to map using IP Address. Here is my smb.conf: [global] workgroup = ADMIN server string = Snap Server timestamp logs = yes dos filetimes = yes dos filemode = yes inherit acls = yes name cache timeout = 0 winbind uid = 101-600 winbind gid = 101-600 local master = No guest account = guest map to guest = Never unix charset = CP1252 dos charset = CP850 allow trusted domains = no security = ADS disable netbios = no password server = * encrypt passwords = Yes username level = 5 debug level = 0 load printers = no utmp directory = /var/run utmp = yes name resolve order = host lmhosts wins bcast ldap timeout = 5 restrict anonymous = 2 include = /etc/smb.conf.perm include = /etc/smb.conf.extra include = /etc/smb.conf.dm include = /etc/smb_shares.conf Here is my smb_shares.conf: *Note All shares follow this format and all seem affected I am just truncating * ..snip.. [bordway] path = /shares/bordway read only = no comment = follow symlinks = no printable = no browseable = yes map acl inherit = yes create mask = 0777 security mask = 0777 directory mask = 0777 directory security mask = 0777 create mask_ext = 0777 directory mask_ext = 0777 guest ok = No valid users = \ admin \ ADMIN\bordway write list = \ admin \ ADMIN\bordway ..snip.. Here is my smb.conf.perm: panic action = /usr/bin/backtrace %d /tmp/segv_samba_%d.out 21 # root preexec = /usr/local/samba/bin/log_connect.sh '%u' '%m' '%I' '%S' # root postexec = /usr/local/samba/bin/log_disconnect.sh '%u' '%m' '%I' '%S' username level = 0 realm = ADMIN.NHTI smb.conf.dm and smb.conf.extra are empty. When a client tries to connect using the Server Name this is the error in the log: [2008/10/13 11:51:54, 0] lib/util_sock.c:get_socket_addr(926) getpeername failed. Error was Transport endpoint is not connected [2008/10/13 11:51:54, 0] lib/util_sock.c:get_socket_addr(926) getpeername failed. Error was Transport endpoint is not connected [2008/10/13 11:51:54, 0] lib/util_sock.c:write_socket_data(388) write_socket_data: write failure. Error = Connection reset by peer [2008/10/13 11:51:54, 0] lib/util_sock.c:write_socket(413) write_socket: Error writing 4 bytes to socket 19: ERRNO = Connection reset by peer [2008/10/13 11:51:54, 0] lib/util_sock.c:send_smb(585) Error writing 4 bytes to client. -1. (Connection reset by peer) [2008/10/13 11:53:00, 0] lib/util_sock.c:get_socket_addr(926) getpeername failed. Error was Transport endpoint is not connected [2008/10/13 11:53:01, 0] lib/util_sock.c:get_socket_addr(926) getpeername failed. Error was Transport endpoint is not connected [2008/10/13 11:53:01, 0] lib/util_sock.c:write_socket_data(388) write_socket_data: write failure. Error = Connection reset by peer [2008/10/13 11:53:01, 0] lib/util_sock.c:write_socket(413) write_socket: Error writing 4 bytes to socket 19: ERRNO = Connection reset by peer [2008/10/13 11:53:01, 0] lib/util_sock.c:send_smb(585) Error writing 4 bytes to client. -1. (Connection reset by peer) On the Windows side if I try by name the user is presented with a Login Box. When the credentials are entered the map fails. If I try with IP no login box is presented and the mapping succeeds. Things I have tried: I have tried adding the following to smb.conf (individually and in combination) smb ports = 139 smb ports = 445 netbios name = admin1 The clients can ping the server by name and the server can ping the clients by name. The clients use the Domain Controller as their DNS server and it can map to the server by name. wbinfo -u and wbinfo -g come back with the correct group and user information. Any help would be appreciated! Thanks -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Print server communications back to the client during printing
On Mon, Oct 13, 2008 at 11:57:45AM -0400, Gerald (Jerry) Carter wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Taylor, Marc wrote: Hello All, I was wondering if anyone knows why a print server needs to talk back on the submitting client's ports 139 or 445? It's Microsoft's async print change notification protocol. Jeremy had talked about adding a separate timetou for the back channel connect, but I don't remember if this was ever done. Like the man said, it's Microsoft's doing :-). No, we don't have a separate timeout in spoolss_connect_to_client() (rpc_server/srv_spoolss_nt.c) but we could add one. Jeremy -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Print server communications back to the client during printing
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Jeremy Allison wrote: On Mon, Oct 13, 2008 at 11:57:45AM -0400, Gerald (Jerry) Carter wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Taylor, Marc wrote: Hello All, I was wondering if anyone knows why a print server needs to talk back on the submitting client's ports 139 or 445? It's Microsoft's async print change notification protocol. Jeremy had talked about adding a separate timetou for the back channel connect, but I don't remember if this was ever done. Like the man said, it's Microsoft's doing :-). No, we don't have a separate timeout in spoolss_connect_to_client() (rpc_server/srv_spoolss_nt.c) but we could add one. How does this actually work in the case of Samba? Does the Samba server attempt to contact the NT machine, and is there a benefit to allowing this to happen? - -- _ _ _ _ ___ _ _ _ |Y#| | | |\/| | \ |\ | | |Ryan Novosielski - Systems Programmer II |$| |__| | | |__/ | \| _| |[EMAIL PROTECTED] - 973/972.0922 (2-0922) \__/ Univ. of Med. and Dent.|IST/AST - NJMS Medical Science Bldg - C630 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFI84fSmb+gadEcsb4RAofUAJ4xOyWnLtdrj2yI3ZrzDviEWVv8pwCgqweW GmR+wQR1UJ/DWSW/AG6ut28= =wWMa -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Print server communications back to the client during printing
On Mon, Oct 13, 2008 at 01:39:30PM -0400, Ryan Novosielski wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Jeremy Allison wrote: On Mon, Oct 13, 2008 at 11:57:45AM -0400, Gerald (Jerry) Carter wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Taylor, Marc wrote: Hello All, I was wondering if anyone knows why a print server needs to talk back on the submitting client's ports 139 or 445? It's Microsoft's async print change notification protocol. Jeremy had talked about adding a separate timetou for the back channel connect, but I don't remember if this was ever done. Like the man said, it's Microsoft's doing :-). No, we don't have a separate timeout in spoolss_connect_to_client() (rpc_server/srv_spoolss_nt.c) but we could add one. How does this actually work in the case of Samba? Does the Samba server attempt to contact the NT machine, and is there a benefit to allowing this to happen? We do *exactly* what the Windows server does. Yes, we attemt to contact the Windows client, as that's what Windows does. The benefit is it correctly implements the Windows printing change-notify protocol. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Print server communications back to the client during printing
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Jeremy Allison wrote: On Mon, Oct 13, 2008 at 01:39:30PM -0400, Ryan Novosielski wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Jeremy Allison wrote: On Mon, Oct 13, 2008 at 11:57:45AM -0400, Gerald (Jerry) Carter wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Taylor, Marc wrote: Hello All, I was wondering if anyone knows why a print server needs to talk back on the submitting client's ports 139 or 445? It's Microsoft's async print change notification protocol. Jeremy had talked about adding a separate timetou for the back channel connect, but I don't remember if this was ever done. Like the man said, it's Microsoft's doing :-). No, we don't have a separate timeout in spoolss_connect_to_client() (rpc_server/srv_spoolss_nt.c) but we could add one. How does this actually work in the case of Samba? Does the Samba server attempt to contact the NT machine, and is there a benefit to allowing this to happen? We do *exactly* what the Windows server does. Yes, we attemt to contact the Windows client, as that's what Windows does. The benefit is it correctly implements the Windows printing change-notify protocol. I didn't really mean is there a benefit to supporting this, I meant more that if my clients are currently blocking the traffic coming back from the server, is there a tangible benefit I could expect from getting that fixed (perhaps the your document has printed message, or more speed, etc.), or is it a minor thing? - -- _ _ _ _ ___ _ _ _ |Y#| | | |\/| | \ |\ | | |Ryan Novosielski - Systems Programmer II |$| |__| | | |__/ | \| _| |[EMAIL PROTECTED] - 973/972.0922 (2-0922) \__/ Univ. of Med. and Dent.|IST/AST - NJMS Medical Science Bldg - C630 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFI840cmb+gadEcsb4RAkZNAJ9/zhfK9YErQub6SKB3B2ScZjPDnwCeLOWI vri44UM1BMR8o+q/yAoYIfU= =SD5O -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Print server communications back to the client during printing
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Ryan Novosielski wrote: I didn't really mean is there a benefit to supporting this, I meant more that if my clients are currently blocking the traffic coming back from the server, is there a tangible benefit I could expect from getting that fixed (perhaps the your document has printed message, or more speed, etc.), or is it a minor thing? Configure the firewall to reject the packets instead of dropping them to [prevent the lag. You will probably see some issues with enumerating print jobs in the Windows print manager. But tghe jobs should come out just fine. jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFI85DsIR7qMdg1EfYRAk6rAKDtjBtFbLsNUb1emn0WRMVjmbFoJACgnq3z 7ueMc+hiRxpoy+vE2Xk3bIM= =M1tb -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Server Maps by IP but not by Name for Domain Users
add in your [global] section: msdfs root = yes restart samba, and then try connecting to your shares by server name again. Matthew Lind wrote: Hey all, I've got an issue with my Samba server. I can't seem to get file shares to map using Server Name, but I can get them to map using IP Address. Here is my smb.conf: [global] workgroup = ADMIN server string = Snap Server timestamp logs = yes dos filetimes = yes dos filemode = yes inherit acls = yes name cache timeout = 0 winbind uid = 101-600 winbind gid = 101-600 local master = No guest account = guest map to guest = Never unix charset = CP1252 dos charset = CP850 allow trusted domains = no security = ADS disable netbios = no password server = * encrypt passwords = Yes username level = 5 debug level = 0 load printers = no utmp directory = /var/run utmp = yes name resolve order = host lmhosts wins bcast ldap timeout = 5 restrict anonymous = 2 include = /etc/smb.conf.perm include = /etc/smb.conf.extra include = /etc/smb.conf.dm include = /etc/smb_shares.conf Here is my smb_shares.conf: *Note All shares follow this format and all seem affected I am just truncating * ..snip.. [bordway] path = /shares/bordway read only = no comment = follow symlinks = no printable = no browseable = yes map acl inherit = yes create mask = 0777 security mask = 0777 directory mask = 0777 directory security mask = 0777 create mask_ext = 0777 directory mask_ext = 0777 guest ok = No valid users = \ admin \ ADMIN\bordway write list = \ admin \ ADMIN\bordway ..snip.. Here is my smb.conf.perm: panic action = /usr/bin/backtrace %d /tmp/segv_samba_%d.out 21 # root preexec = /usr/local/samba/bin/log_connect.sh '%u' '%m' '%I' '%S' # root postexec = /usr/local/samba/bin/log_disconnect.sh '%u' '%m' '%I' '%S' username level = 0 realm = ADMIN.NHTI smb.conf.dm and smb.conf.extra are empty. When a client tries to connect using the Server Name this is the error in the log: [2008/10/13 11:51:54, 0] lib/util_sock.c:get_socket_addr(926) getpeername failed. Error was Transport endpoint is not connected [2008/10/13 11:51:54, 0] lib/util_sock.c:get_socket_addr(926) getpeername failed. Error was Transport endpoint is not connected [2008/10/13 11:51:54, 0] lib/util_sock.c:write_socket_data(388) write_socket_data: write failure. Error = Connection reset by peer [2008/10/13 11:51:54, 0] lib/util_sock.c:write_socket(413) write_socket: Error writing 4 bytes to socket 19: ERRNO = Connection reset by peer [2008/10/13 11:51:54, 0] lib/util_sock.c:send_smb(585) Error writing 4 bytes to client. -1. (Connection reset by peer) [2008/10/13 11:53:00, 0] lib/util_sock.c:get_socket_addr(926) getpeername failed. Error was Transport endpoint is not connected [2008/10/13 11:53:01, 0] lib/util_sock.c:get_socket_addr(926) getpeername failed. Error was Transport endpoint is not connected [2008/10/13 11:53:01, 0] lib/util_sock.c:write_socket_data(388) write_socket_data: write failure. Error = Connection reset by peer [2008/10/13 11:53:01, 0] lib/util_sock.c:write_socket(413) write_socket: Error writing 4 bytes to socket 19: ERRNO = Connection reset by peer [2008/10/13 11:53:01, 0] lib/util_sock.c:send_smb(585) Error writing 4 bytes to client. -1. (Connection reset by peer) On the Windows side if I try by name the user is presented with a Login Box. When the credentials are entered the map fails. If I try with IP no login box is presented and the mapping succeeds. Things I have tried: I have tried adding the following to smb.conf (individually and in combination) smb ports = 139 smb ports = 445 netbios name = admin1 The clients can ping the server by name and the server can ping the clients by name. The clients use the Domain Controller as their DNS server and it can map to the server by name. wbinfo -u and wbinfo -g come back with the correct group and user information. Any help would be appreciated! Thanks -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] netlogon script not running...(upgrade from 3.0.25b to 3.2.4)
i have the same problem and filled out a bug report https://bugzilla.samba.org/show_bug.cgi?id=5627 and it never went anywhere. my only work around was to create a shortcut in the user's startup folder to their netlogon script. Johan Landerholm wrote: Hi all, I have been using samba for a very long time and have just upgraded my 3.0.25b servers to 3.2.4. I have a bunch of BDC's located in different areas of the country and a PDC running at HQ. I'm using LDAP as the user directory and I replicate the tree to every site. Samba looks up users using the replicas. I also use netlogon scripts to mount drives and set the time when the clients log on. But, The last machine upgraded (Novell SLES10 x86_64) refuses to serve the netlogon script anymore. I have another exactly the same machine and smb.conf that does work, but this one does not. I can see it the log.smbd that when the client logs on, the netlogon share is mapped and disconnected, but I can't understand why it refuses to run the netlogon script. I have compared file permissions and configuration files, but I can't find any difference. Can someone give me a hint on how to go on debugging this problem and perhaps find the reason ? Best regards, Johan Landerholm -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba member of workgroup
Fernando wrote: Hello, I want to setup a samba server http://www.linuxquestions.org/questions/#as a member of a workgroup, for example MYWORKGROUP. I want to share a folder, for example /share. This share should be available to example.com domain clients only. Can someone give me a smb.conf for that? Would that do it? [global] workgroup = MYWORKGROUP server string = Samba Server Version %v security = domain hosts allow = .example.com [share] comment = Public Stuff path = /share public = no writable = no printable = no Thank you. Here is what I have used without any problems for the past 8 years. [global] use sendfile = No workgroup = rb_law server string = Samba %v printcap name = cups load printers = yes printing = cups show add printer wizard = no disable spoolss = yes log file = /var/log/samba/log.%m max log size = 100 time server = yes admin users = thomas smb ports = 139 hosts allow = 192.168.7. 192.168.6. 192.168.8. 192.168.5. 127. domain logons = yes map to guest = bad user security = user encrypt passwords = yes smb passwd file = /etc/samba/smbpasswd socket options = TCP_NODELAY local master = yes os level = 69 domain master = yes preferred master = yes name resolve order = wins lmhosts bcast wins support = yes dns proxy = no usershare allow guests = No [homes] comment = Home Directories browseable = no writable = yes [samba] comment = SambaShares - Pictures, Law path = /home/samba valid users = @shoreline, anna force group = shoreline admin users = thomas browseable = Yes writeable = Yes inherit permissions = yes -- David C. Rankin, J.D., P.E. Rankin Law Firm, PLLC 510 Ochiltree Street Nacogdoches, Texas 75961 Telephone: (936) 715-9333 Facsimile: (936) 715-9339 www.rankinlawfirm.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] AD to authenticate users against Samba + LDAP
Andrei Mikhailovsky a écrit : Hi all, I was wondering if it is possible to make MS Active Directory to authenticate against Samba + LDAP? I have a working Samba + LDAP setup in the data centre and need to have MS Active Directory to authenticate against the userbase which has been already setup on Samba + LDAP. No way current, as AD relies on Kerberos. You have to wait for samba 4. Or alternatively, look at previous post 'Heimdal/AD documentation' if you're ready to setup a Kerberos database alongside your LDAP server. -- Guillaume Rousse Moyens Informatiques - INRIA Futurs Tel: 01 69 35 69 62 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] heimdal/AD documentation
I have no idea what this guide does as I am not a french speaker. Would it anable AD to authenticate users against LDAP directory? Andrei -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba builtin groups and LDAP
I just set up a fresh Samba PDC using OpenLDAP as the passdb. When I start smbd, I notice some log messages about failing to create some builtin groups: Administrators and Users. Is Samba trying to run a group add script which I have not setup or to create posixGroups in LDAP which it does not have permission to do? I turned up debugging output and saw that it complained about not getting gids from winbind. I have not set up and idmaps as it's only one domain and users exists in both Windows and Linux. -- Loren M. Lang [EMAIL PROTECTED] http://www.alzatex.com/ Public Key: ftp://ftp.tallye.com/pub/lorenl_pubkey.asc Fingerprint: 10A0 7AE2 DAF5 4780 888A 3FA4 DCEE BB39 7654 DE5B smime.p7s Description: S/MIME cryptographic signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[SCM] Samba Shared Repository - branch master updated - bf768aa1ecfdc01abe2bef79cc5608b4cab93b7e
The branch, master has been updated
via bf768aa1ecfdc01abe2bef79cc5608b4cab93b7e (commit)
from 053da4ba0a52500a41b466812c5901b7d6b2adc0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit bf768aa1ecfdc01abe2bef79cc5608b4cab93b7e
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Mon Oct 13 14:30:41 2008 +0200
Import debug macros from Samba 3's libndr.
---
Summary of changes:
source4/librpc/ndr/libndr.h |8
1 files changed, 8 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index 1be1a54..335383d 100644
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -152,6 +152,14 @@ struct ndr_print {
#define NDR_PRINT_OUT_DEBUG(type, p) NDR_PRINT_FUNCTION_DEBUG(type, NDR_OUT, p)
#define NDR_PRINT_IN_DEBUG(type, p) NDR_PRINT_FUNCTION_DEBUG(type, NDR_IN |
NDR_SET_VALUES, p)
+/* useful macro for debugging in strings */
+#define NDR_PRINT_STRUCT_STRING(ctx, type, p) ndr_print_struct_string(ctx,
(ndr_print_fn_t)ndr_print_ ##type, #p, p)
+#define NDR_PRINT_UNION_STRING(ctx, type, level, p)
ndr_print_union_string(ctx, (ndr_print_fn_t)ndr_print_ ##type, #p, level, p)
+#define NDR_PRINT_FUNCTION_STRING(ctx, type, flags, p)
ndr_print_function_string(ctx, (ndr_print_function_t)ndr_print_ ##type, #type,
flags, p)
+#define NDR_PRINT_BOTH_STRING(ctx, type, p) NDR_PRINT_FUNCTION_STRING(ctx,
type, NDR_BOTH, p)
+#define NDR_PRINT_OUT_STRING(ctx, type, p) NDR_PRINT_FUNCTION_STRING(ctx,
type, NDR_OUT, p)
+#define NDR_PRINT_IN_STRING(ctx, type, p) NDR_PRINT_FUNCTION_STRING(ctx, type,
NDR_IN | NDR_SET_VALUES, p)
+
#define NDR_BE(ndr) (((ndr)-flags
(LIBNDR_FLAG_BIGENDIAN|LIBNDR_FLAG_LITTLE_ENDIAN)) == LIBNDR_FLAG_BIGENDIAN)
enum ndr_err_code {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3086-g0f3f340
The branch, v3-2-test has been updated
via 0f3f34033a80e44fa18cae452a164e445392138a (commit)
from 1ab2a5b958a900a078cadf98b83fba7fadbaedf9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 0f3f34033a80e44fa18cae452a164e445392138a
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Tue Oct 7 21:24:25 2008 +0200
Fix bug 5691: SIGBUS on Solaris
---
Summary of changes:
source/smbd/session.c |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/session.c b/source/smbd/session.c
index 000b2f5..d4da340 100644
--- a/source/smbd/session.c
+++ b/source/smbd/session.c
@@ -113,7 +113,10 @@ bool session_claim(user_struct *vuser)
break;
}
- sess_pid = ((struct sessionid *)rec-value.dptr)-pid;
+ memcpy(sess_pid,
+ ((char *)rec-value.dptr)
+ + offsetof(struct sessionid, pid),
+ sizeof(sess_pid));
if (!process_exists(sess_pid)) {
DEBUG(5, (%s has died -- re-using session\n,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 2049cfe743a2ea4ec1db17b21500b98ba8bab4c7
The branch, master has been updated via 2049cfe743a2ea4ec1db17b21500b98ba8bab4c7 (commit) via 2fddd2e2d5fb32ff15a170acc443218481986b91 (commit) via 6d02f0805a001ae4ac19219c7fff5247e470b0fd (commit) via 58f844ab5422490d49b21701ffbe706c06b8c40a (commit) via 8cae7a5baba9c62c2205ea88e0eafeb3248b978a (commit) via 390d37187afce0d9e31d4a4f145c759d1c2d6cda (commit) via 5ae73c67b5daf493aa2f37027b4567f3633543cf (commit) via e779345bca36c2dfd11dea773e4b8aa68e4a3863 (commit) via de0aa7850c57aadef72659651e8de33d644706fa (commit) from bf768aa1ecfdc01abe2bef79cc5608b4cab93b7e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2049cfe743a2ea4ec1db17b21500b98ba8bab4c7 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Mon Oct 13 16:09:48 2008 +0200 Share ndr.c implementation. commit 2fddd2e2d5fb32ff15a170acc443218481986b91 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Mon Oct 13 15:58:45 2008 +0200 Share ndrdump implementation. commit 6d02f0805a001ae4ac19219c7fff5247e470b0fd Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Mon Oct 13 15:33:40 2008 +0200 Import warning fixes from Samba 3 into libndr, sync more libndr code. commit 58f844ab5422490d49b21701ffbe706c06b8c40a Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Mon Oct 13 15:23:35 2008 +0200 Share uuid implementations. commit 8cae7a5baba9c62c2205ea88e0eafeb3248b978a Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Mon Oct 13 15:22:27 2008 +0200 Share ndr_misc implementations. commit 390d37187afce0d9e31d4a4f145c759d1c2d6cda Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Mon Oct 13 15:20:10 2008 +0200 Share ndr_basic implementation. commit 5ae73c67b5daf493aa2f37027b4567f3633543cf Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Mon Oct 13 15:17:41 2008 +0200 Import warning fixes from Samba 3. commit e779345bca36c2dfd11dea773e4b8aa68e4a3863 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Mon Oct 13 15:01:28 2008 +0200 Import changes from upstream libndr. commit de0aa7850c57aadef72659651e8de33d644706fa Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Mon Oct 13 14:38:42 2008 +0200 Move code specific to Samba 3 to a separate file. --- Summary of changes: librpc/ndr/ndr.c | 1118 librpc/ndr/ndr_basic.c | 833 +++ librpc/ndr/ndr_misc.c | 46 ++ librpc/ndr/uuid.c | 227 librpc/tools/ndrdump.1.xml | 83 +++ librpc/tools/ndrdump.c | 461 +++ source3/Makefile.in| 11 +- source3/include/proto.h| 11 +- source3/lib/util.c | 73 +++- source3/librpc/ndr/libndr.h| 201 ++- source3/librpc/ndr/ndr.c | 271 +- source3/librpc/ndr/ndr_basic.c | 859 --- source3/librpc/ndr/ndr_krb5pac.c |9 +- source3/librpc/ndr/ndr_misc.c | 94 --- source3/librpc/ndr/ndr_string.c| 71 +-- source3/librpc/ndr/util.c | 188 ++ source3/librpc/ndr/uuid.c | 227 source3/libsmb/clidgram.c |2 +- source4/librpc/config.mk |8 +- source4/librpc/ndr/ndr.c | 1103 --- source4/librpc/ndr/ndr_basic.c | 833 --- source4/librpc/ndr/ndr_misc.c | 46 -- source4/librpc/ndr/ndr_string.c|3 +- source4/librpc/ndr/uuid.c | 227 source4/librpc/tools/ndrdump.1.xml | 83 --- source4/librpc/tools/ndrdump.c | 459 --- 26 files changed, 3373 insertions(+), 4174 deletions(-) create mode 100644 librpc/ndr/ndr.c create mode 100644 librpc/ndr/ndr_basic.c create mode 100644 librpc/ndr/ndr_misc.c create mode 100644 librpc/ndr/uuid.c create mode 100644 librpc/tools/ndrdump.1.xml create mode 100644 librpc/tools/ndrdump.c delete mode 100644 source3/librpc/ndr/ndr_basic.c delete mode 100644 source3/librpc/ndr/ndr_misc.c create mode 100644 source3/librpc/ndr/util.c delete mode 100644 source3/librpc/ndr/uuid.c delete mode 100644 source4/librpc/ndr/ndr.c delete mode 100644 source4/librpc/ndr/ndr_basic.c delete mode 100644 source4/librpc/ndr/ndr_misc.c delete mode 100644 source4/librpc/ndr/uuid.c delete mode 100644 source4/librpc/tools/ndrdump.1.xml delete mode 100644 source4/librpc/tools/ndrdump.c Changeset truncated at 500 lines: diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c new file mode 100644 index 000..2f1daea --- /dev/null +++ b/librpc/ndr/ndr.c @@ -0,0 +1,1118 @@ +/* + Unix SMB/CIFS implementation. + + libndr interface + + Copyright (C) Andrew Tridgell 2003 + + This program is free software; you can redistribute it
[SCM] Samba Shared Repository - branch master updated - 345e731fc10b779204b699076876e89237da6cdb
The branch, master has been updated
via 345e731fc10b779204b699076876e89237da6cdb (commit)
from 2049cfe743a2ea4ec1db17b21500b98ba8bab4c7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 345e731fc10b779204b699076876e89237da6cdb
Author: Matthias Dieter Wallnöfer [EMAIL PROTECTED]
Date: Tue Sep 9 15:06:13 2008 +0200
Cosmetic corrections for the DSDB module
This commit applies some cosmetic corrections for the DSDB (Directory
Server Database).
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/kludge_acl.c |4 ++--
source4/dsdb/samdb/ldb_modules/proxy.c |6 +++---
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 14 +++---
source4/dsdb/samdb/ldb_modules/schema_fsmo.c|2 +-
source4/lib/ldb-samba/ldif_handlers.c |2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
index 6e6da55..865e1c7 100644
--- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
+++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
@@ -141,7 +141,7 @@ static int kludge_acl_allowedAttributes(struct ldb_context
*ldb, struct ldb_mess
ldb_msg_add_string(msg, attrName, attr_list[i]);
}
talloc_free(mem_ctx);
- return 0;
+ return LDB_SUCCESS;
}
/* read all objectClasses */
@@ -201,7 +201,7 @@ static int kludge_acl_childClasses(struct ldb_context *ldb,
struct ldb_message *
}
}
- return 0;
+ return LDB_SUCCESS;
}
diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c
b/source4/dsdb/samdb/ldb_modules/proxy.c
index 18b0649..932fd3b 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -73,7 +73,7 @@ static int load_proxy_info(struct ldb_module *module)
/* see if we have already loaded it */
if (proxy-upstream != NULL) {
- return 0;
+ return LDB_SUCCESS;
}
dn = ldb_dn_new(proxy, module-ldb, @PROXYINFO);
@@ -152,7 +152,7 @@ static int load_proxy_info(struct ldb_module *module)
talloc_free(res);
- return 0;
+ return LDB_SUCCESS;
failed:
talloc_free(res);
@@ -160,7 +160,7 @@ failed:
talloc_free(proxy-newdn);
talloc_free(proxy-upstream);
proxy-upstream = NULL;
- return -1;
+ return LDB_ERR_OPERATIONS_ERROR;
}
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 13a979b..d10c95e 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -90,16 +90,16 @@ static int add_time_element(struct ldb_message *msg, const
char *attr, time_t t)
char *s;
if (ldb_msg_find_element(msg, attr) != NULL) {
- return 0;
+ return LDB_SUCCESS;
}
s = ldb_timestring(msg, t);
if (s == NULL) {
- return -1;
+ return LDB_ERR_OPERATIONS_ERROR;
}
if (ldb_msg_add_string(msg, attr, s) != 0) {
- return -1;
+ return LDB_ERR_OPERATIONS_ERROR;
}
el = ldb_msg_find_element(msg, attr);
@@ -107,7 +107,7 @@ static int add_time_element(struct ldb_message *msg, const
char *attr, time_t t)
is ignored */
el-flags = LDB_FLAG_MOD_REPLACE;
- return 0;
+ return LDB_SUCCESS;
}
/*
@@ -118,11 +118,11 @@ static int add_uint64_element(struct ldb_message *msg,
const char *attr, uint64_
struct ldb_message_element *el;
if (ldb_msg_find_element(msg, attr) != NULL) {
- return 0;
+ return LDB_SUCCESS;
}
if (ldb_msg_add_fmt(msg, attr, %llu, (unsigned long long)v) != 0) {
- return -1;
+ return LDB_ERR_OPERATIONS_ERROR;
}
el = ldb_msg_find_element(msg, attr);
@@ -130,7 +130,7 @@ static int add_uint64_element(struct ldb_message *msg,
const char *attr, uint64_
is ignored */
el-flags = LDB_FLAG_MOD_REPLACE;
- return 0;
+ return LDB_SUCCESS;
}
static int replmd_replPropertyMetaData1_attid_sort(const struct
replPropertyMetaData1 *m1,
diff --git a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c
b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c
index 1c0dccf..0266654 100644
--- a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c
@@ -319,7 +319,7 @@ static int generate_dITContentRules(struct ldb_context
*ldb, struct ldb_message
}
}
}
- return 0;
+ return LDB_SUCCESS;
}
diff --git
[SCM] Samba Shared Repository - branch master updated - 2ce72b5a69e3cf306277460a6d87754bf71c024b
The branch, master has been updated
via 2ce72b5a69e3cf306277460a6d87754bf71c024b (commit)
via eaba7784160be9dcf40f57c30c6f01a691082ba6 (commit)
via 3d6f759d08b1ff79dd3941a96656847eebfa39db (commit)
from 345e731fc10b779204b699076876e89237da6cdb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2ce72b5a69e3cf306277460a6d87754bf71c024b
Merge: eaba7784160be9dcf40f57c30c6f01a691082ba6
345e731fc10b779204b699076876e89237da6cdb
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Mon Oct 13 16:30:40 2008 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit eaba7784160be9dcf40f57c30c6f01a691082ba6
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Mon Oct 13 16:29:19 2008 +0200
Add test for data_blob_string_const_null.
commit 3d6f759d08b1ff79dd3941a96656847eebfa39db
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Mon Oct 13 14:09:10 2008 +0200
Import new enum values.
---
Summary of changes:
lib/util/tests/data_blob.c| 11 +++
source3/librpc/gen_ndr/misc.h |4
source3/librpc/gen_ndr/ndr_misc.c |2 ++
source3/librpc/idl/misc.idl |9 ++---
4 files changed, 23 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/tests/data_blob.c b/lib/util/tests/data_blob.c
index e0be7a4..875e5fd 100644
--- a/lib/util/tests/data_blob.c
+++ b/lib/util/tests/data_blob.c
@@ -32,6 +32,16 @@ static bool test_string(struct torture_context *tctx)
return true;
}
+static bool test_string_null(struct torture_context *tctx)
+{
+ DATA_BLOB blob = data_blob_string_const_null(bla);
+
+ torture_assert_int_equal(tctx, blob.length, 4, blob length);
+ torture_assert_str_equal(tctx, (char *)blob.data, bla, blob data);
+
+ return true;
+}
+
static bool test_zero(struct torture_context *tctx)
{
int i;
@@ -77,6 +87,7 @@ struct torture_suite *torture_local_util_data_blob(TALLOC_CTX
*mem_ctx)
struct torture_suite *suite = torture_suite_create(mem_ctx, DATABLOB);
torture_suite_add_simple_test(suite, string, test_string);
+ torture_suite_add_simple_test(suite, string_null, test_string_null);
torture_suite_add_simple_test(suite, zero, test_zero);;
torture_suite_add_simple_test(suite, clear, test_clear);
torture_suite_add_simple_test(suite, cmp, test_cmp);
diff --git a/source3/librpc/gen_ndr/misc.h b/source3/librpc/gen_ndr/misc.h
index 4fa7415..b3740fa 100644
--- a/source3/librpc/gen_ndr/misc.h
+++ b/source3/librpc/gen_ndr/misc.h
@@ -26,13 +26,17 @@ struct policy_handle {
enum netr_SchannelType
#ifndef USE_UINT_ENUMS
{
+ SEC_CHAN_NULL=0,
SEC_CHAN_WKSTA=2,
+ SEC_CHAN_DNS_DOMAIN=3,
SEC_CHAN_DOMAIN=4,
SEC_CHAN_BDC=6
}
#else
{ __donnot_use_enum_netr_SchannelType=0x7FFF}
+#define SEC_CHAN_NULL ( 0 )
#define SEC_CHAN_WKSTA ( 2 )
+#define SEC_CHAN_DNS_DOMAIN ( 3 )
#define SEC_CHAN_DOMAIN ( 4 )
#define SEC_CHAN_BDC ( 6 )
#endif
diff --git a/source3/librpc/gen_ndr/ndr_misc.c
b/source3/librpc/gen_ndr/ndr_misc.c
index 56105d4..22c416a 100644
--- a/source3/librpc/gen_ndr/ndr_misc.c
+++ b/source3/librpc/gen_ndr/ndr_misc.c
@@ -123,7 +123,9 @@ _PUBLIC_ void ndr_print_netr_SchannelType(struct ndr_print
*ndr, const char *nam
const char *val = NULL;
switch (r) {
+ case SEC_CHAN_NULL: val = SEC_CHAN_NULL; break;
case SEC_CHAN_WKSTA: val = SEC_CHAN_WKSTA; break;
+ case SEC_CHAN_DNS_DOMAIN: val = SEC_CHAN_DNS_DOMAIN; break;
case SEC_CHAN_DOMAIN: val = SEC_CHAN_DOMAIN; break;
case SEC_CHAN_BDC: val = SEC_CHAN_BDC; break;
}
diff --git a/source3/librpc/idl/misc.idl b/source3/librpc/idl/misc.idl
index 132a81f..ff548fe 100644
--- a/source3/librpc/idl/misc.idl
+++ b/source3/librpc/idl/misc.idl
@@ -30,9 +30,11 @@ interface misc
/* Only SEC_CHAN_WKSTA can forward requests to other domains. */
typedef [public] enum {
- SEC_CHAN_WKSTA = 2,
- SEC_CHAN_DOMAIN = 4,
- SEC_CHAN_BDC = 6
+ SEC_CHAN_NULL= 0,
+ SEC_CHAN_WKSTA = 2,
+ SEC_CHAN_DNS_DOMAIN = 3,
+ SEC_CHAN_DOMAIN = 4,
+ SEC_CHAN_BDC = 6
} netr_SchannelType;
/* SAM database types */
@@ -48,4 +50,5 @@ interface misc
SAMR_REJECT_IN_HISTORY = 2,
SAMR_REJECT_COMPLEXITY = 5
} samr_RejectReason;
+
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 65d5b1e7b494f94cf1ffef04ab74a68967789d89
The branch, master has been updated via 65d5b1e7b494f94cf1ffef04ab74a68967789d89 (commit) from 2ce72b5a69e3cf306277460a6d87754bf71c024b (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 65d5b1e7b494f94cf1ffef04ab74a68967789d89 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Mon Oct 13 16:40:27 2008 +0200 Test maxsize parameter to file_load() as used in Samba 3. --- Summary of changes: lib/util/tests/file.c |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/tests/file.c b/lib/util/tests/file.c index 9a303bf..4aff0e9 100644 --- a/lib/util/tests/file.c +++ b/lib/util/tests/file.c @@ -49,6 +49,12 @@ static bool test_file_load_save(struct torture_context *tctx) torture_assert_mem_equal(tctx, data, TEST_DATA, len, Contents); + data = file_load(TEST_FILENAME, len, 5, mem_ctx); + + torture_assert_int_equal(tctx, len, 5, Length); + + torture_assert_mem_equal(tctx, data, TEST_DATA, len, Contents); + unlink(TEST_FILENAME); return true; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 88f1d885eabc9a723351f38e9f2dc83933cfdea1
The branch, master has been updated
via 88f1d885eabc9a723351f38e9f2dc83933cfdea1 (commit)
via 092bb542da8ff9eef9a8a981e698a1bff60058af (commit)
from 65d5b1e7b494f94cf1ffef04ab74a68967789d89 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 88f1d885eabc9a723351f38e9f2dc83933cfdea1
Author: Matthias Dieter Wallnöfer [EMAIL PROTECTED]
Date: Thu Sep 25 12:21:28 2008 +0200
DSDB cosmetic patches: Some enhancements
Also, use the constants more in the ldif_handlers module.
commit 092bb542da8ff9eef9a8a981e698a1bff60058af
Author: Simo Sorce [EMAIL PROTECTED]
Date: Mon Oct 13 10:45:48 2008 -0400
Revert chunk applied by mistake as part of the cosmetic fixes fromi Mathias
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/proxy.c |2 +-
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 10 +-
source4/lib/ldb-samba/ldif_handlers.c |2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c
b/source4/dsdb/samdb/ldb_modules/proxy.c
index 932fd3b..2ff4229 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -317,7 +317,7 @@ static int proxy_search_bytree(struct ldb_module *module,
struct ldb_request *re
goto passthru;
}
- if (load_proxy_info(module) != 0) {
+ if (load_proxy_info(module) != LDB_SUCCESS) {
return LDB_ERR_OPERATIONS_ERROR;
}
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index d10c95e..f30748c 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -98,7 +98,7 @@ static int add_time_element(struct ldb_message *msg, const
char *attr, time_t t)
return LDB_ERR_OPERATIONS_ERROR;
}
- if (ldb_msg_add_string(msg, attr, s) != 0) {
+ if (ldb_msg_add_string(msg, attr, s) != LDB_SUCCESS) {
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -121,7 +121,7 @@ static int add_uint64_element(struct ldb_message *msg,
const char *attr, uint64_
return LDB_SUCCESS;
}
- if (ldb_msg_add_fmt(msg, attr, %llu, (unsigned long long)v) != 0) {
+ if (ldb_msg_add_fmt(msg, attr, %llu, (unsigned long long)v) !=
LDB_SUCCESS) {
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -270,7 +270,7 @@ static int replmd_add(struct ldb_module *module, struct
ldb_request *req)
ac-schema = schema;
- if (ldb_msg_find_element(req-op.add.message, objectGUID)) {
+ if (ldb_msg_find_element(req-op.add.message, objectGUID) != NULL) {
ldb_debug_set(module-ldb, LDB_DEBUG_ERROR,
replmd_add: it's not allowed to add an object
with objectGUID\n);
return LDB_ERR_UNWILLING_TO_PERFORM;
@@ -495,7 +495,7 @@ static int replmd_modify(struct ldb_module *module, struct
ldb_request *req)
* - calculate the new replPropertyMetaData attribute
*/
- if (add_time_element(msg, whenChanged, t) != 0) {
+ if (add_time_element(msg, whenChanged, t) != LDB_SUCCESS) {
talloc_free(ac);
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -503,7 +503,7 @@ static int replmd_modify(struct ldb_module *module, struct
ldb_request *req)
/* Get a sequence number from the backend */
ret = ldb_sequence_number(module-ldb, LDB_SEQ_NEXT, seq_num);
if (ret == LDB_SUCCESS) {
- if (add_uint64_element(msg, uSNChanged, seq_num) != 0) {
+ if (add_uint64_element(msg, uSNChanged, seq_num) !=
LDB_SUCCESS) {
talloc_free(ac);
return LDB_ERR_OPERATIONS_ERROR;
}
diff --git a/source4/lib/ldb-samba/ldif_handlers.c
b/source4/lib/ldb-samba/ldif_handlers.c
index 46ea095..a16582d 100644
--- a/source4/lib/ldb-samba/ldif_handlers.c
+++ b/source4/lib/ldb-samba/ldif_handlers.c
@@ -134,7 +134,7 @@ static int ldb_canonicalise_objectSid(struct ldb_context
*ldb, void *mem_ctx,
/* Perhaps not a string after all */
return ldb_handler_copy(ldb, mem_ctx, in, out);
}
- return LDB_SUCCESS;
+ return 0;
}
return ldb_handler_copy(ldb, mem_ctx, in, out);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 167feb2c914f40abd7618eff5dd0c9cd80a063b6
The branch, master has been updated
via 167feb2c914f40abd7618eff5dd0c9cd80a063b6 (commit)
from f6575a270fdfb41e28e1eaeb6d3653db32bb6337 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 167feb2c914f40abd7618eff5dd0c9cd80a063b6
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Tue Oct 7 21:24:25 2008 +0200
Fix bug 5691: SIGBUS on Solaris
---
Summary of changes:
source3/smbd/session.c |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/session.c b/source3/smbd/session.c
index 3b431a1..8163eb3 100644
--- a/source3/smbd/session.c
+++ b/source3/smbd/session.c
@@ -113,7 +113,10 @@ bool session_claim(user_struct *vuser)
break;
}
- sess_pid = ((struct sessionid *)rec-value.dptr)-pid;
+ memcpy(sess_pid,
+ ((char *)rec-value.dptr)
+ + offsetof(struct sessionid, pid),
+ sizeof(sess_pid));
if (!process_exists(sess_pid)) {
DEBUG(5, (%s has died -- re-using session\n,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4257-g35a86c9
The branch, v3-3-test has been updated
via 35a86c9d70a34440a8197c07e9a6427f5347beb5 (commit)
from 59e44daf057d687262adcd1f61f0b973a1c1be58 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 35a86c9d70a34440a8197c07e9a6427f5347beb5
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Tue Oct 7 21:24:25 2008 +0200
Fix bug 5691: SIGBUS on Solaris
---
Summary of changes:
source/smbd/session.c |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/session.c b/source/smbd/session.c
index 3b431a1..8163eb3 100644
--- a/source/smbd/session.c
+++ b/source/smbd/session.c
@@ -113,7 +113,10 @@ bool session_claim(user_struct *vuser)
break;
}
- sess_pid = ((struct sessionid *)rec-value.dptr)-pid;
+ memcpy(sess_pid,
+ ((char *)rec-value.dptr)
+ + offsetof(struct sessionid, pid),
+ sizeof(sess_pid));
if (!process_exists(sess_pid)) {
DEBUG(5, (%s has died -- re-using session\n,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 053da4ba0a52500a41b466812c5901b7d6b2adc0
The branch, master has been updated
via 053da4ba0a52500a41b466812c5901b7d6b2adc0 (commit)
from 167feb2c914f40abd7618eff5dd0c9cd80a063b6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 053da4ba0a52500a41b466812c5901b7d6b2adc0
Author: Günther Deschner [EMAIL PROTECTED]
Date: Mon Oct 13 12:32:44 2008 +0200
s3: fix another build warning.
Guenther
---
Summary of changes:
source3/smbd/seal.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index 18d8b64..3822ee1 100644
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -426,7 +426,7 @@ static NTSTATUS srv_enc_spnego_gss_negotiate(unsigned char
**ppdata, size_t *p_d
data_blob_free(auth_reply);
SAFE_FREE(*ppdata);
- *ppdata = memdup(response.data, response.length);
+ *ppdata = (unsigned char *)memdup(response.data, response.length);
if ((*ppdata) == NULL response.length 0) {
status = NT_STATUS_NO_MEMORY;
}
@@ -468,7 +468,7 @@ static NTSTATUS srv_enc_ntlm_negotiate(unsigned char
**ppdata, size_t *p_data_si
}
SAFE_FREE(*ppdata);
- *ppdata = memdup(response.data, response.length);
+ *ppdata = (unsigned char *)memdup(response.data, response.length);
if ((*ppdata) == NULL response.length 0) {
status = NT_STATUS_NO_MEMORY;
}
@@ -595,7 +595,7 @@ static NTSTATUS srv_enc_spnego_ntlm_auth(connection_struct
*conn,
}
SAFE_FREE(*ppdata);
- *ppdata = memdup(response.data, response.length);
+ *ppdata = (unsigned char *)memdup(response.data, response.length);
if ((*ppdata) == NULL response.length 0)
return NT_STATUS_NO_MEMORY;
*p_data_size = response.length;
@@ -649,7 +649,7 @@ static NTSTATUS srv_enc_raw_ntlm_auth(connection_struct
*conn,
/* Return the raw blob. */
SAFE_FREE(*ppdata);
- *ppdata = memdup(response.data, response.length);
+ *ppdata = (unsigned char *)memdup(response.data, response.length);
if ((*ppdata) == NULL response.length 0)
return NT_STATUS_NO_MEMORY;
*p_data_size = response.length;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 2b1bef7e87e62ff4cb744b1f4564a8fc425f34e2
The branch, master has been updated
via 2b1bef7e87e62ff4cb744b1f4564a8fc425f34e2 (commit)
via 76dfca1569f93a2b1b49244c4ae2e6a9834034f2 (commit)
via a781b78417b6d7b875230dd2edcb932445aa4197 (commit)
via ac126ea8186364bddfec340189a377978d52c7ae (commit)
via d65afbe55f3912384f93f8401b83f18965a9b569 (commit)
via c530009401f111bc62008a2a75cdad5b9d5ee7d1 (commit)
via c3fedcddd5e79c60f5fcc0219752c27277a4d9f7 (commit)
via 3bbe5e88e55a92a177260310daffd6deae551ba3 (commit)
from 88f1d885eabc9a723351f38e9f2dc83933cfdea1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2b1bef7e87e62ff4cb744b1f4564a8fc425f34e2
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Mon Oct 13 20:38:50 2008 +0200
Remove the current_spoolss_pipes_open thingy.
I looked at a checkout from 2002 and even there it did not what it was
supposed
to do. Sadly this also removes one of the nicest comments in the whole Samba
code :-)
commit 76dfca1569f93a2b1b49244c4ae2e6a9834034f2
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Mon Oct 13 19:40:43 2008 +0200
Make the internal pipe functions static
commit a781b78417b6d7b875230dd2edcb932445aa4197
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 12 23:09:18 2008 +0200
Remove smb_np_struct
commit ac126ea8186364bddfec340189a377978d52c7ae
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sun Oct 12 23:01:38 2008 +0200
Use struct files_struct for pipes instead of smb_np_struct
commit d65afbe55f3912384f93f8401b83f18965a9b569
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Thu Oct 9 16:55:56 2008 +0200
Remove the chain_fsp global
commit c530009401f111bc62008a2a75cdad5b9d5ee7d1
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Thu Oct 9 16:27:49 2008 +0200
Pass struct smb_request to file_free
on the way to get rid of chain_fsp
commit c3fedcddd5e79c60f5fcc0219752c27277a4d9f7
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Thu Oct 9 15:38:53 2008 +0200
Pass struct smb_request to file_new
Goal is to remove the chain_fsp global variable
commit 3bbe5e88e55a92a177260310daffd6deae551ba3
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Thu Oct 9 15:25:17 2008 +0200
Pass struct smb_request to file_fsp
The goal is to get rid of the chain_fsp global variable
---
Summary of changes:
source3/include/fake_file.h|3 +-
source3/include/ntdomain.h | 57 -
source3/include/proto.h| 61 +++
source3/include/smb.h |1 +
source3/printing/nt_printing.c | 10 +-
source3/printing/printfsp.c|9 +-
source3/rpc_server/srv_pipe_hnd.c | 398
source3/rpc_server/srv_srvsvc_nt.c |8 +-
source3/smbd/blocking.c|1 -
source3/smbd/close.c | 25 ++-
source3/smbd/connection.c | 106 --
source3/smbd/dosmode.c | 10 +-
source3/smbd/fake_file.c | 10 +-
source3/smbd/files.c | 51 ++---
source3/smbd/ipc.c | 90 -
source3/smbd/nttrans.c | 37 ++--
source3/smbd/open.c| 74
source3/smbd/pipes.c | 104 +-
source3/smbd/posix_acls.c |6 +-
source3/smbd/process.c |4 +-
source3/smbd/reply.c | 81
source3/smbd/service.c |7 +-
source3/smbd/trans2.c | 36 ++--
source3/winbindd/winbindd_proto.h |2 -
24 files changed, 379 insertions(+), 812 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/fake_file.h b/source3/include/fake_file.h
index 93da106..c4b271f 100644
--- a/source3/include/fake_file.h
+++ b/source3/include/fake_file.h
@@ -22,7 +22,8 @@
enum FAKE_FILE_TYPE {
FAKE_FILE_TYPE_NONE = 0,
- FAKE_FILE_TYPE_QUOTA
+ FAKE_FILE_TYPE_QUOTA,
+ FAKE_FILE_TYPE_NAMED_PIPE
};
/*
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index de0a313..e6c97c6 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -287,63 +287,6 @@ typedef struct pipes_struct {
} pipes_struct;
-typedef struct smb_np_struct {
- struct smb_np_struct *next, *prev;
- int pnum;
- connection_struct *conn;
- uint16 vuid; /* points to the unauthenticated user that opened this
pipe. */
- bool open; /* open connection */
- uint16 device_state;
- uint16 priority;
- char *name;
-
- /* When replying to an SMBtrans, this is the maximum amount of
- data that can be sent in the initial reply. */
- int max_trans_reply;
-
- /*
-* NamedPipe state information.
-*/
- struct pipes_struct
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4258-g84355fe
The branch, v3-3-test has been updated
via 84355feee9a718e8ffe854df1129461d65d114dc (commit)
from 35a86c9d70a34440a8197c07e9a6427f5347beb5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 84355feee9a718e8ffe854df1129461d65d114dc
Author: Holger Hetterich [EMAIL PROTECTED]
Date: Mon Oct 13 14:09:07 2008 -0700
Enable optional anonymization of user names,
if the configuration parameter anonymization_prefix is defined in
smb.conf, and use the prefix given there.
---
Summary of changes:
source/modules/vfs_smb_traffic_analyzer.c | 25 -
1 files changed, 24 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/modules/vfs_smb_traffic_analyzer.c
b/source/modules/vfs_smb_traffic_analyzer.c
index 9b4c1b3..be77fc4 100644
--- a/source/modules/vfs_smb_traffic_analyzer.c
+++ b/source/modules/vfs_smb_traffic_analyzer.c
@@ -42,6 +42,7 @@ static enum sock_type
smb_traffic_analyzer_connMode(vfs_handle_struct *handle)
}
}
+
/* Connect to an internet socket */
static int smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle,
@@ -160,6 +161,8 @@ static void
smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
struct tm *tm = NULL;
int seconds;
char *str = NULL;
+ char *username = NULL;
+ const char *anon_prefix = NULL;
size_t len;
SMB_VFS_HANDLE_GET_DATA(handle, rf_sock, struct refcounted_sock,
return);
@@ -178,11 +181,31 @@ static void
smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
}
seconds=(float) (tv.tv_usec / 1000);
+ /* check if anonymization is required */
+
+
anon_prefix=lp_parm_const_string(SNUM(handle-conn),smb_traffic_analyzer,\
+ anonymize_prefix, NULL );
+ if (anon_prefix!=NULL) {
+ username = talloc_asprintf(talloc_tos(),
+ %s%i,
+ anon_prefix,
+ str_checksum(
+ handle-conn-server_info-sanitized_username )
);
+ } else {
+ username = talloc_asprintf(talloc_tos(),
+ %s,
+ handle-conn-server_info-sanitized_username);
+ }
+
+ if (!username) {
+ return;
+ }
+
str = talloc_asprintf(talloc_tos(),
V1,%u,\%s\,\%s\,\%c\,\%s\,\%s\,
\%04d-%02d-%02d %02d:%02d:%02d.%03d\\n,
(unsigned int)result,
- handle-conn-server_info-sanitized_username,
+ username,
pdb_get_domain(handle-conn-server_info-sam_account),
Write ? 'W' : 'R',
handle-conn-connectpath,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 3e1d6c60201a2514dc54b4992b034a954b330c65
The branch, master has been updated
via 3e1d6c60201a2514dc54b4992b034a954b330c65 (commit)
from 2b1bef7e87e62ff4cb744b1f4564a8fc425f34e2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3e1d6c60201a2514dc54b4992b034a954b330c65
Author: Holger Hetterich [EMAIL PROTECTED]
Date: Mon Oct 13 14:08:49 2008 -0700
Enable optional anonymization of user names,
if the configuration parameter anonymization_prefix is defined in
smb.conf, and use the prefix given there.
---
Summary of changes:
source3/modules/vfs_smb_traffic_analyzer.c | 25 -
1 files changed, 24 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c
b/source3/modules/vfs_smb_traffic_analyzer.c
index 9b4c1b3..be77fc4 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -42,6 +42,7 @@ static enum sock_type
smb_traffic_analyzer_connMode(vfs_handle_struct *handle)
}
}
+
/* Connect to an internet socket */
static int smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle,
@@ -160,6 +161,8 @@ static void
smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
struct tm *tm = NULL;
int seconds;
char *str = NULL;
+ char *username = NULL;
+ const char *anon_prefix = NULL;
size_t len;
SMB_VFS_HANDLE_GET_DATA(handle, rf_sock, struct refcounted_sock,
return);
@@ -178,11 +181,31 @@ static void
smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
}
seconds=(float) (tv.tv_usec / 1000);
+ /* check if anonymization is required */
+
+
anon_prefix=lp_parm_const_string(SNUM(handle-conn),smb_traffic_analyzer,\
+ anonymize_prefix, NULL );
+ if (anon_prefix!=NULL) {
+ username = talloc_asprintf(talloc_tos(),
+ %s%i,
+ anon_prefix,
+ str_checksum(
+ handle-conn-server_info-sanitized_username )
);
+ } else {
+ username = talloc_asprintf(talloc_tos(),
+ %s,
+ handle-conn-server_info-sanitized_username);
+ }
+
+ if (!username) {
+ return;
+ }
+
str = talloc_asprintf(talloc_tos(),
V1,%u,\%s\,\%s\,\%c\,\%s\,\%s\,
\%04d-%02d-%02d %02d:%02d:%02d.%03d\\n,
(unsigned int)result,
- handle-conn-server_info-sanitized_username,
+ username,
pdb_get_domain(handle-conn-server_info-sam_account),
Write ? 'W' : 'R',
handle-conn-connectpath,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4259-g2d06384
The branch, v3-3-test has been updated
via 2d063842365341ecbbbf0413e9870b1680d2e138 (commit)
from 84355feee9a718e8ffe854df1129461d65d114dc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 2d063842365341ecbbbf0413e9870b1680d2e138
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Mon Oct 13 14:13:20 2008 -0700
Whitespace tidyup and an optimization to remove a talloc.
Jeremy.
---
Summary of changes:
source/modules/vfs_smb_traffic_analyzer.c | 12 +---
1 files changed, 5 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/modules/vfs_smb_traffic_analyzer.c
b/source/modules/vfs_smb_traffic_analyzer.c
index be77fc4..9456afb 100644
--- a/source/modules/vfs_smb_traffic_analyzer.c
+++ b/source/modules/vfs_smb_traffic_analyzer.c
@@ -182,24 +182,22 @@ static void
smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
seconds=(float) (tv.tv_usec / 1000);
/* check if anonymization is required */
-
+
anon_prefix=lp_parm_const_string(SNUM(handle-conn),smb_traffic_analyzer,\
anonymize_prefix, NULL );
if (anon_prefix!=NULL) {
username = talloc_asprintf(talloc_tos(),
%s%i,
anon_prefix,
- str_checksum(
+ str_checksum(
handle-conn-server_info-sanitized_username )
);
} else {
- username = talloc_asprintf(talloc_tos(),
- %s,
- handle-conn-server_info-sanitized_username);
- }
+ username = handle-conn-server_info-sanitized_username;
+ }
if (!username) {
return;
- }
+ }
str = talloc_asprintf(talloc_tos(),
V1,%u,\%s\,\%s\,\%c\,\%s\,\%s\,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3087-g86a621a
The branch, v3-2-test has been updated
via 86a621a1a3e08bad8a0b276d8444f1f69a500385 (commit)
from 0f3f34033a80e44fa18cae452a164e445392138a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 86a621a1a3e08bad8a0b276d8444f1f69a500385
Author: Holger Hetterich [EMAIL PROTECTED]
Date: Mon Oct 13 14:14:25 2008 -0700
Enable optional anonymization of user names,
if the configuration parameter anonymization_prefix is defined in
smb.conf, and use the prefix given there.
---
Summary of changes:
source/modules/vfs_smb_traffic_analyzer.c | 21 -
1 files changed, 20 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/modules/vfs_smb_traffic_analyzer.c
b/source/modules/vfs_smb_traffic_analyzer.c
index 1402b7c..a4e3a3b 100644
--- a/source/modules/vfs_smb_traffic_analyzer.c
+++ b/source/modules/vfs_smb_traffic_analyzer.c
@@ -43,6 +43,7 @@ static enum sock_type
smb_traffic_analyzer_connMode(vfs_handle_struct *handle)
}
}
+
/* Connect to an internet socket */
static int smb_traffic_analyzer_connect_inet_socket(vfs_handle_struct *handle,
@@ -161,6 +162,8 @@ static void
smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
struct tm *tm = NULL;
int seconds;
char *str = NULL;
+ const char *username = NULL;
+ const char *anon_prefix = NULL;
size_t len;
SMB_VFS_HANDLE_GET_DATA(handle, rf_sock, struct refcounted_sock,
return);
@@ -179,11 +182,27 @@ static void
smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
}
seconds=(float) (tv.tv_usec / 1000);
+ /* check if anonymization is required */
+
+
anon_prefix=lp_parm_const_string(SNUM(handle-conn),smb_traffic_analyzer,\
+ anonymize_prefix, NULL );
+ if (anon_prefix!=NULL) {
+ username = talloc_asprintf(talloc_tos(),
+ %s%i,
+ anon_prefix,
+ str_checksum(get_current_username()));
+ } else {
+ username = get_current_username();
+ }
+
+ if (!username) {
+ return;
+ }
str = talloc_asprintf(talloc_tos(),
V1,%u,\%s\,\%s\,\%c\,\%s\,\%s\,
\%04d-%02d-%02d %02d:%02d:%02d.%03d\\n,
(unsigned int)result,
- get_current_username(),
+ username,
current_user_info.domain,
Write ? 'W' : 'R',
handle-conn-connectpath,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 2a2f9400bf17d63f845f08a24988055118adc308
The branch, master has been updated
via 2a2f9400bf17d63f845f08a24988055118adc308 (commit)
from 3e1d6c60201a2514dc54b4992b034a954b330c65 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2a2f9400bf17d63f845f08a24988055118adc308
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Mon Oct 13 14:12:43 2008 -0700
Whitespace tidyup and an optimization to remove a talloc.
Jeremy.
---
Summary of changes:
source3/modules/vfs_smb_traffic_analyzer.c | 12 +---
1 files changed, 5 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c
b/source3/modules/vfs_smb_traffic_analyzer.c
index be77fc4..9456afb 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -182,24 +182,22 @@ static void
smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
seconds=(float) (tv.tv_usec / 1000);
/* check if anonymization is required */
-
+
anon_prefix=lp_parm_const_string(SNUM(handle-conn),smb_traffic_analyzer,\
anonymize_prefix, NULL );
if (anon_prefix!=NULL) {
username = talloc_asprintf(talloc_tos(),
%s%i,
anon_prefix,
- str_checksum(
+ str_checksum(
handle-conn-server_info-sanitized_username )
);
} else {
- username = talloc_asprintf(talloc_tos(),
- %s,
- handle-conn-server_info-sanitized_username);
- }
+ username = handle-conn-server_info-sanitized_username;
+ }
if (!username) {
return;
- }
+ }
str = talloc_asprintf(talloc_tos(),
V1,%u,\%s\,\%s\,\%c\,\%s\,\%s\,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4260-g8e33baf
The branch, v3-3-test has been updated via 8e33baf4729a290fba26857e7b0a6ef9f9933b72 (commit) from 2d063842365341ecbbbf0413e9870b1680d2e138 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 8e33baf4729a290fba26857e7b0a6ef9f9933b72 Author: Holger Hetterich [EMAIL PROTECTED] Date: Mon Oct 13 14:18:08 2008 -0700 Update the manpage for vfs_smb_traffic_analyzer to include the anonymize_prefix option --- Summary of changes: docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml |9 - 1 files changed, 8 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml index 28c8413..b51f6e8 100644 --- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml +++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml @@ -103,7 +103,14 @@ termsmb_traffic_analyzer:port = STRING/term listitem paraThe module will send the data using the TCP port given - in STRING + in STRING. + /para + + varlistentry + termsmb_traffic_analyzer:anonymize_prefix = STRING/term + listitem + paraThe module will replace the user names with a prefix + given by STRING and a simple hash number. /para /listitem -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3088-gc67cf64
The branch, v3-2-test has been updated via c67cf648331bf4b8268813cb005b7283dd65eb73 (commit) from 86a621a1a3e08bad8a0b276d8444f1f69a500385 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit c67cf648331bf4b8268813cb005b7283dd65eb73 Author: Holger Hetterich [EMAIL PROTECTED] Date: Mon Oct 13 14:18:54 2008 -0700 Update the manpage for vfs_smb_traffic_analyzer to include the anonymize_prefix option --- Summary of changes: docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml |9 - 1 files changed, 8 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml index c0b1ef8..8f6375e 100644 --- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml +++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml @@ -103,7 +103,14 @@ termsmb_traffic_analyzer:port = STRING/term listitem paraThe module will send the data using the TCP port given - in STRING + in STRING. + /para + + varlistentry + termsmb_traffic_analyzer:anonymize_prefix = STRING/term + listitem + paraThe module will replace the user names with a prefix + given by STRING and a simple hash number. /para /listitem -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 783818d956fd6e22d1affae808f240b6189e3140
The branch, master has been updated via 783818d956fd6e22d1affae808f240b6189e3140 (commit) from 2a2f9400bf17d63f845f08a24988055118adc308 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 783818d956fd6e22d1affae808f240b6189e3140 Author: Holger Hetterich [EMAIL PROTECTED] Date: Mon Oct 13 14:19:25 2008 -0700 Update the manpage for vfs_smb_traffic_analyzer to include the anonymize_prefix option --- Summary of changes: docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml |9 - 1 files changed, 8 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml index 28c8413..b51f6e8 100644 --- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml +++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml @@ -103,7 +103,14 @@ termsmb_traffic_analyzer:port = STRING/term listitem paraThe module will send the data using the TCP port given - in STRING + in STRING. + /para + + varlistentry + termsmb_traffic_analyzer:anonymize_prefix = STRING/term + listitem + paraThe module will replace the user names with a prefix + given by STRING and a simple hash number. /para /listitem -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 0a33d8bd312cc4497d08bbe0f4dd2abcce67bd0b
The branch, master has been updated
via 0a33d8bd312cc4497d08bbe0f4dd2abcce67bd0b (commit)
from 783818d956fd6e22d1affae808f240b6189e3140 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0a33d8bd312cc4497d08bbe0f4dd2abcce67bd0b
Author: Tim Prouty [EMAIL PROTECTED]
Date: Mon Oct 13 11:50:27 2008 -0700
Check for f_frsize when using statvfs
Add a configure test for the availability of f_frsize in struct
statvfs (for broken platforms that define statvfs but still have
f_bsize/f_iosize). Ported from source3's fsusage:
commit 472519eb6941bc0972212cc416ab89801fe3ee0c
---
Summary of changes:
lib/util/fsusage.c |5 +
lib/util/fsusage.m4 | 31 +++
2 files changed, 36 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/fsusage.c b/lib/util/fsusage.c
index 43c8787..30f9f9c 100644
--- a/lib/util/fsusage.c
+++ b/lib/util/fsusage.c
@@ -124,8 +124,13 @@ _PUBLIC_ int sys_fsusage(const char *path, uint64_t
*dfree, uint64_t *dsize)
#endif /* STAT_STATFS4 */
#if defined(STAT_STATVFS) || defined(STAT_STATVFS64) /* SVR4 */
+#ifdef HAVE_FRSIZE
# define CONVERT_BLOCKS(B) \
adjust_blocks ((uint64_t)(B), fsd.f_frsize ? (uint64_t)fsd.f_frsize :
(uint64_t)fsd.f_bsize, (uint64_t)512)
+#else
+# define CONVERT_BLOCKS(B) \
+ adjust_blocks ((uint64_t)(B), (uint64_t)fsd.f_bsize, (uint64_t)512)
+#endif
#ifdef STAT_STATVFS64
struct statvfs64 fsd;
diff --git a/lib/util/fsusage.m4 b/lib/util/fsusage.m4
index 6d5d13f..5023c36 100644
--- a/lib/util/fsusage.m4
+++ b/lib/util/fsusage.m4
@@ -54,6 +54,37 @@ if test $space = no; then
fi
fi
+# fsusage.c assumes that statvfs has an f_frsize entry. Some weird
+# systems use f_bsize.
+AC_CACHE_CHECK([that statvfs.f_frsize works],samba_cv_frsize, [
+AC_TRY_COMPILE([#include sys/types.h
+#include sys/statvfs.h],[struct statvfs buf; buf.f_frsize = 0],
+ samba_cv_frsize=yes,samba_cv_frsize=no)])
+if test x$samba_cv_frsize = xyes; then
+AC_DEFINE(HAVE_FRSIZE, 1, [Whether statvfs.f_frsize exists])
+fi
+
+
+# if test $fu_cv_sys_stat_statvfs64 = yes || test $fu_cv_sys_stat_statvfs =
yes ; then
+# AC_MSG_CHECKING([for struct statvfs with statvfs.f_frsize (SVR4)])
+# AC_CACHE_VAL(fu_cv_struct_statvfs_f_frsize,
+# [AC_TRY_RUN([
+# #include sys/statvfs.h
+# main ()
+# {
+# struct statvfs fsd;
+# fsd.f_frsize = 0;
+# exit (statvfs (., fsd));
+# }],
+# fu_cv_struct_statvfs_f_frsize=yes,
+# fu_cv_struct_statvfs_f_frsize=no,
+# fu_cv_struct_statvfs_f_frsize=no)])
+# AC_MSG_RESULT($fu_cv_sys_stat_statvfs_f_frsize)
+# if test $fu_cv_struct_statvfs_f_frsize = yes; then
+# AC_DEFINE(HAVE_STRUCT_STATVFS_F_FRSIZE,1,[Whether struct statvfs has
f_frsize property])
+# fi
+# fi
+
if test $space = no; then
# DEC Alpha running OSF/1
AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - abe443a65edf86892ce01c80804a4b644ec99433
The branch, master has been updated
via abe443a65edf86892ce01c80804a4b644ec99433 (commit)
from 0a33d8bd312cc4497d08bbe0f4dd2abcce67bd0b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit abe443a65edf86892ce01c80804a4b644ec99433
Author: Tim Prouty [EMAIL PROTECTED]
Date: Mon Oct 13 15:10:23 2008 -0700
Remove extraneous comment from 0a33d8bd312cc4497d08bbe0f4dd2abcce67bd0b
---
Summary of changes:
lib/util/fsusage.m4 | 21 -
1 files changed, 0 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/fsusage.m4 b/lib/util/fsusage.m4
index 5023c36..8439650 100644
--- a/lib/util/fsusage.m4
+++ b/lib/util/fsusage.m4
@@ -64,27 +64,6 @@ if test x$samba_cv_frsize = xyes; then
AC_DEFINE(HAVE_FRSIZE, 1, [Whether statvfs.f_frsize exists])
fi
-
-# if test $fu_cv_sys_stat_statvfs64 = yes || test $fu_cv_sys_stat_statvfs =
yes ; then
-# AC_MSG_CHECKING([for struct statvfs with statvfs.f_frsize (SVR4)])
-# AC_CACHE_VAL(fu_cv_struct_statvfs_f_frsize,
-# [AC_TRY_RUN([
-# #include sys/statvfs.h
-# main ()
-# {
-# struct statvfs fsd;
-# fsd.f_frsize = 0;
-# exit (statvfs (., fsd));
-# }],
-# fu_cv_struct_statvfs_f_frsize=yes,
-# fu_cv_struct_statvfs_f_frsize=no,
-# fu_cv_struct_statvfs_f_frsize=no)])
-# AC_MSG_RESULT($fu_cv_sys_stat_statvfs_f_frsize)
-# if test $fu_cv_struct_statvfs_f_frsize = yes; then
-# AC_DEFINE(HAVE_STRUCT_STATVFS_F_FRSIZE,1,[Whether struct statvfs has
f_frsize property])
-# fi
-# fi
-
if test $space = no; then
# DEC Alpha running OSF/1
AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.59-3-g6b76c52
The branch, master has been updated
via 6b76c520f97127099bd9fbaa0fa7af1c61947fb7 (commit)
from dc9cd4779db4a89697731e4cf415be51067a07c1 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 6b76c520f97127099bd9fbaa0fa7af1c61947fb7
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Tue Oct 14 10:40:29 2008 +1100
update TAKEIP/RELEASEIP/GETPUBLICIP/GETNODEMAP controls so we retain an
older ipv4-only version of these controls.
We need this so that we are backwardcompatible with old versions of ctdb
and so that we can interoperate with a ipv4-only recmaster during a
rolling upgrade.
---
Summary of changes:
client/ctdb_client.c | 69 ++-
common/ctdb_util.c | 14 +-
doc/ctdbd.1| 562
include/ctdb_private.h | 47 -
server/ctdb_control.c | 15 ++
server/ctdb_recover.c | 35 +++
server/ctdb_takeover.c | 143 +++--
7 files changed, 710 insertions(+), 175 deletions(-)
Changeset truncated at 500 lines:
diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 6d80efc..a4d2a2b 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -2050,14 +2050,26 @@ int ctdb_ctrl_takeover_ip(struct ctdb_context *ctdb,
struct timeval timeout,
uint32_t destnode, struct ctdb_public_ip *ip)
{
TDB_DATA data;
+ struct ctdb_public_ipv4 ipv4;
int ret;
int32_t res;
- data.dsize = sizeof(*ip);
- data.dptr = (uint8_t *)ip;
+ if (ip-addr.sa.sa_family == AF_INET) {
+ ipv4.pnn = ip-pnn;
+ ipv4.sin = ip-addr.ip;
- ret = ctdb_control(ctdb, destnode, 0, CTDB_CONTROL_TAKEOVER_IP, 0,
data, NULL,
+ data.dsize = sizeof(ipv4);
+ data.dptr = (uint8_t *)ipv4;
+
+ ret = ctdb_control(ctdb, destnode, 0,
CTDB_CONTROL_TAKEOVER_IPv4, 0, data, NULL,
+ NULL, res, timeout, NULL);
+ } else {
+ data.dsize = sizeof(*ip);
+ data.dptr = (uint8_t *)ip;
+
+ ret = ctdb_control(ctdb, destnode, 0, CTDB_CONTROL_TAKEOVER_IP,
0, data, NULL,
NULL, res, timeout, NULL);
+ }
if (ret != 0 || res != 0) {
DEBUG(DEBUG_ERR,(__location__ ctdb_control for takeover_ip
failed\n));
@@ -2075,14 +2087,26 @@ int ctdb_ctrl_release_ip(struct ctdb_context *ctdb,
struct timeval timeout,
uint32_t destnode, struct ctdb_public_ip *ip)
{
TDB_DATA data;
+ struct ctdb_public_ipv4 ipv4;
int ret;
int32_t res;
- data.dsize = sizeof(*ip);
- data.dptr = (uint8_t *)ip;
+ if (ip-addr.sa.sa_family == AF_INET) {
+ ipv4.pnn = ip-pnn;
+ ipv4.sin = ip-addr.ip;
- ret = ctdb_control(ctdb, destnode, 0, CTDB_CONTROL_RELEASE_IP, 0, data,
NULL,
- NULL, res, timeout, NULL);
+ data.dsize = sizeof(ipv4);
+ data.dptr = (uint8_t *)ipv4;
+
+ ret = ctdb_control(ctdb, destnode, 0,
CTDB_CONTROL_RELEASE_IPv4, 0, data, NULL,
+ NULL, res, timeout, NULL);
+ } else {
+ data.dsize = sizeof(*ip);
+ data.dptr = (uint8_t *)ip;
+
+ ret = ctdb_control(ctdb, destnode, 0, CTDB_CONTROL_RELEASE_IP,
0, data, NULL,
+ NULL, res, timeout, NULL);
+ }
if (ret != 0 || res != 0) {
DEBUG(DEBUG_ERR,(__location__ ctdb_control for release_ip
failed\n));
@@ -2241,6 +2265,37 @@ int ctdb_ctrl_get_public_ips(struct ctdb_context *ctdb,
return 0;
}
+int ctdb_ctrl_get_public_ipsv4(struct ctdb_context *ctdb,
+ struct timeval timeout, uint32_t destnode,
+ TALLOC_CTX *mem_ctx, struct ctdb_all_public_ips **ips)
+{
+ int ret, i, len;
+ TDB_DATA outdata;
+ int32_t res;
+ struct ctdb_all_public_ipsv4 *ipsv4;
+
+ ret = ctdb_control(ctdb, destnode, 0,
+ CTDB_CONTROL_GET_PUBLIC_IPSv4, 0, tdb_null,
+ mem_ctx, outdata, res, timeout, NULL);
+ if (ret != 0 || res != 0) {
+ DEBUG(DEBUG_ERR,(__location__ ctdb_control for getpublicips
failed\n));
+ return -1;
+ }
+
+ ipsv4 = (struct ctdb_all_public_ipsv4 *)outdata.dptr;
+ len = offsetof(struct ctdb_all_public_ips, ips) +
+ ipsv4-num*sizeof(struct ctdb_public_ip);
+ *ips = talloc_zero_size(mem_ctx, len);
+ for (i=0; iipsv4-num; i++) {
+ (*ips)-ips[i].pnn = ipsv4-ips[i].pnn;
+ (*ips)-ips[i].addr.ip = ipsv4-ips[i].sin;
+ }
+
+
Build status as of Tue Oct 14 00:00:01 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-10-13 00:01:14.0 + +++ /home/build/master/cache/broken_results.txt 2008-10-14 00:00:09.0 + @@ -1,4 +1,4 @@ -Build status as of Mon Oct 13 00:00:02 2008 +Build status as of Tue Oct 14 00:00:01 2008 Build counts: Tree Total Broken Panic @@ -7,14 +7,14 @@ ctdb 0 0 0 distcc 1 0 0 ldb 34 33 0 -libreplace 33 12 0 +libreplace 32 12 0 lorikeet-heimdal 30 20 0 -pidl 19 3 0 +pidl 20 3 0 ppp 14 14 0 -rsync33 9 0 +rsync34 9 0 samba-docs 0 0 0 samba-gtk8 8 0 -samba_3_X_devel 30 22 0 +samba_3_X_devel 30 21 0 samba_3_X_test 30 16 0 samba_4_0_test 33 29 1 smb-build32 7 0
[SCM] Samba Shared Repository - branch master updated - 4746f79d50d804b0e9d5d5cc0d4796dee54d052c
The branch, master has been updated
via 4746f79d50d804b0e9d5d5cc0d4796dee54d052c (commit)
from abe443a65edf86892ce01c80804a4b644ec99433 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4746f79d50d804b0e9d5d5cc0d4796dee54d052c
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 01:59:36 2008 +0200
Use {u,}int64_t instead of SMB_BIG_{U,}INT.
---
Summary of changes:
source3/client/client.c | 16 +++---
source3/client/clitar.c | 28 +-
source3/include/client.h |2 +-
source3/include/includes.h | 23 ++--
source3/include/nameserv.h |4 +-
source3/include/ntquotas.h | 26
source3/include/proto.h | 110 ++--
source3/include/smb.h| 12 ++--
source3/include/smbprofile.h |8 +-
source3/include/sysquotas.h | 20 +++---
source3/include/vfs.h| 16 +++---
source3/lib/fsusage.c| 20 +++---
source3/lib/select.c |2 +-
source3/lib/smbldap.c|2 +-
source3/lib/sysquotas_4A.c | 16 +++---
source3/lib/sysquotas_linux.c| 48
source3/lib/sysquotas_xfs.c | 16 +++---
source3/lib/util_str.c | 10 +--
source3/libsmb/clifile.c | 12 ++--
source3/libsmb/cliquota.c| 40 ++---
source3/libsmb/clireadwrite.c|6 +-
source3/locking/locking.c| 20 +++---
source3/locking/posix.c | 32 +-
source3/modules/vfs_cap.c|8 +-
source3/modules/vfs_default.c|6 +-
source3/modules/vfs_full_audit.c | 14 ++--
source3/nmbd/nmbd_winsserver.c |6 +-
source3/printing/printing.c |4 +-
source3/registry/reg_perfcount.c | 10 ++--
source3/smbd/blocking.c | 24
source3/smbd/dfree.c | 34 ++--
source3/smbd/noquotas.c |6 +-
source3/smbd/ntquotas.c | 26
source3/smbd/nttrans.c | 50
source3/smbd/open.c |6 +-
source3/smbd/process.c |2 +-
source3/smbd/quotas.c| 106 ++--
source3/smbd/reply.c | 92 +++---
source3/smbd/statvfs.c |2 +-
source3/smbd/trans2.c| 114 +++---
source3/smbd/vfs.c | 12 ++--
source3/torture/cmd_vfs.c|2 +-
source3/torture/locktest.c |6 +-
source3/utils/smbcquotas.c |6 +--
source3/utils/status_profile.c | 12 ++--
45 files changed, 507 insertions(+), 530 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/client.c b/source3/client/client.c
index eb9f31b..0fbf56f 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -84,9 +84,9 @@ static struct sockaddr_storage dest_ss;
static bool abort_mget = true;
/* timing globals */
-SMB_BIG_UINT get_total_size = 0;
+uint64_t get_total_size = 0;
unsigned int get_total_time_ms = 0;
-static SMB_BIG_UINT put_total_size = 0;
+static uint64_t put_total_size = 0;
static unsigned int put_total_time_ms = 0;
/* totals globals */
@@ -2555,7 +2555,7 @@ static int cmd_lock(void)
{
TALLOC_CTX *ctx = talloc_tos();
char *buf = NULL;
- SMB_BIG_UINT start, len;
+ uint64_t start, len;
enum brl_type lock_type;
int fnum;
@@ -2584,14 +2584,14 @@ static int cmd_lock(void)
return 1;
}
- start = (SMB_BIG_UINT)strtol(buf, (char **)NULL, 16);
+ start = (uint64_t)strtol(buf, (char **)NULL, 16);
if (!next_token_talloc(ctx, cmd_ptr,buf,NULL)) {
d_printf(lock fnum [r|w] hex-start hex-len\n);
return 1;
}
- len = (SMB_BIG_UINT)strtol(buf, (char **)NULL, 16);
+ len = (uint64_t)strtol(buf, (char **)NULL, 16);
if (!cli_posix_lock(cli, fnum, start, len, true, lock_type)) {
d_printf(lock failed %d: %s\n, fnum, cli_errstr(cli));
@@ -2604,7 +2604,7 @@ static int cmd_unlock(void)
{
TALLOC_CTX *ctx = talloc_tos();
char *buf = NULL;
- SMB_BIG_UINT start, len;
+ uint64_t start, len;
int fnum;
if (!next_token_talloc(ctx, cmd_ptr,buf,NULL)) {
@@ -2618,14 +2618,14 @@ static int cmd_unlock(void)
return 1;
}
- start = (SMB_BIG_UINT)strtol(buf, (char **)NULL, 16);
+ start = (uint64_t)strtol(buf, (char **)NULL, 16);
if (!next_token_talloc(ctx, cmd_ptr,buf,NULL)) {
d_printf(unlock fnum hex-start hex-len\n);
return 1;
}
- len = (SMB_BIG_UINT)strtol(buf, (char **)NULL, 16);
+ len = (uint64_t)strtol(buf, (char
[SCM] Samba Shared Repository - branch master updated - 7e5bbe806958ea8176e4c8494e3b3f79570635da
The branch, master has been updated
via 7e5bbe806958ea8176e4c8494e3b3f79570635da (commit)
via fd443f819e77ee811cbcd0eaea4073f5e7a8f145 (commit)
from 551e95502765bae58d5ccf57635e4977b7b47b9b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7e5bbe806958ea8176e4c8494e3b3f79570635da
Merge: fd443f819e77ee811cbcd0eaea4073f5e7a8f145
551e95502765bae58d5ccf57635e4977b7b47b9b
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 02:19:00 2008 +0200
Merge branch 'master' of git://git.samba.org/samba
commit fd443f819e77ee811cbcd0eaea4073f5e7a8f145
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 02:16:27 2008 +0200
Use common fusage implementation.
---
Summary of changes:
lib/util/fsusage.c| 13 +++-
source3/Makefile.in |2 +-
source3/lib/fsusage.c | 157 -
3 files changed, 10 insertions(+), 162 deletions(-)
delete mode 100644 source3/lib/fsusage.c
Changeset truncated at 500 lines:
diff --git a/lib/util/fsusage.c b/lib/util/fsusage.c
index 30f9f9c..e5f2678 100644
--- a/lib/util/fsusage.c
+++ b/lib/util/fsusage.c
@@ -19,7 +19,7 @@
#include includes.h
#include system/filesys.h
-
+
/**
* @file
* @brief Utility functions for getting the amount of free disk space
@@ -30,12 +30,17 @@
*/
static uint64_t adjust_blocks(uint64_t blocks, uint64_t fromsize, uint64_t
tosize)
{
- if (fromsize == tosize) /* e.g., from 512 to 512 */
+ if (fromsize == tosize) { /* e.g., from 512 to 512 */
return blocks;
- else if (fromsize tosize) /* e.g., from 2048 to 512 */
+ } else if (fromsize tosize) { /* e.g., from 2048 to 512 */
return blocks * (fromsize / tosize);
- else/* e.g., from 256 to 512 */
+ } else { /* e.g., from 256 to 512 */
+ /* Protect against broken filesystems... */
+ if (fromsize == 0) {
+ fromsize = tosize;
+ }
return (blocks + 1) / (tosize / fromsize);
+ }
}
/**
diff --git a/source3/Makefile.in b/source3/Makefile.in
index cc9efb3..bd29792 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -329,7 +329,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) \
lib/util_str.o lib/clobber.o lib/util_sid.o lib/util_uuid.o \
lib/util_unistr.o ../lib/util/util_file.o lib/util_file.o
../lib/util/data_blob.o \
lib/util.o lib/util_sock.o lib/sock_exec.o lib/util_sec.o \
- lib/substitute.o lib/fsusage.o lib/dbwrap_util.o \
+ lib/substitute.o ../lib/util/fsusage.o lib/dbwrap_util.o \
lib/ms_fnmatch.o lib/select.o lib/errmap_unix.o \
lib/tallocmsg.o lib/dmallocmsg.o libsmb/smb_signing.o \
../lib/crypto/md5.o ../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \
diff --git a/source3/lib/fsusage.c b/source3/lib/fsusage.c
deleted file mode 100644
index 43eb847..000
--- a/source3/lib/fsusage.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- functions to calculate the free disk space
- Copyright (C) Andrew Tridgell 1998-2000
-
- 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 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see http://www.gnu.org/licenses/.
-*/
-
-#include includes.h
-
-
-/* Return the number of TOSIZE-byte blocks used by
- BLOCKS FROMSIZE-byte blocks, rounding away from zero.
-*/
-static uint64_t adjust_blocks(uint64_t blocks, uint64_t fromsize, uint64_t
tosize)
-{
- if (fromsize == tosize) { /* e.g., from 512 to 512 */
- return blocks;
- } else if (fromsize tosize) { /* e.g., from 2048 to 512 */
- return blocks * (fromsize / tosize);
- } else { /* e.g., from 256 to 512 */
- /* Protect against broken filesystems... */
- if (fromsize == 0) {
- fromsize = tosize;
- }
- return (blocks + 1) / (tosize / fromsize);
- }
-}
-
-/* this does all of the system specific guff to get the free disk space.
- It is derived from code in the GNU fileutils package, but has been
- considerably mangled for use here
-
- results are returned in *dfree and *dsize, in 512 byte units
-*/
-int sys_fsusage(const char
[SCM] Samba Shared Repository - branch master updated - 501fa6a05db1b2c29b1e4720a03ed219aee2a346
The branch, master has been updated via 501fa6a05db1b2c29b1e4720a03ed219aee2a346 (commit) via ddf16ed6e5d68870cdf3b8c6358af5134a694fc4 (commit) from 7e5bbe806958ea8176e4c8494e3b3f79570635da (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 501fa6a05db1b2c29b1e4720a03ed219aee2a346 Merge: ddf16ed6e5d68870cdf3b8c6358af5134a694fc4 7e5bbe806958ea8176e4c8494e3b3f79570635da Author: Jeremy Allison [EMAIL PROTECTED] Date: Mon Oct 13 17:27:53 2008 -0700 Merge branch 'master' of ssh://[EMAIL PROTECTED]/data/git/samba commit ddf16ed6e5d68870cdf3b8c6358af5134a694fc4 Author: Jeremy Allison [EMAIL PROTECTED] Date: Mon Oct 13 17:22:33 2008 -0700 Cope with VFS change. Jeremy. --- Summary of changes: source3/include/vfs.h |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 0951de6..4cedb4a 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -109,8 +109,9 @@ /* Changed to version 23 - remove set_nt_acl call. This can only be done via an open handle. JRA. */ /* Changed to version 24 - make security descriptor const in fset_nt_acl. JRA. */ +/* Changed to version 25 - Jelmer's change from SMB_BIG_UINT to uint64_t. */ -#define SMB_VFS_INTERFACE_VERSION 24 +#define SMB_VFS_INTERFACE_VERSION 25 /* to bug old modules which are trying to compile with the old functions */ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 551e95502765bae58d5ccf57635e4977b7b47b9b
The branch, master has been updated
via 551e95502765bae58d5ccf57635e4977b7b47b9b (commit)
via 9dcbddd5c61e8bf2814e97e53e7c518df87661c0 (commit)
from 4746f79d50d804b0e9d5d5cc0d4796dee54d052c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 551e95502765bae58d5ccf57635e4977b7b47b9b
Merge: 9dcbddd5c61e8bf2814e97e53e7c518df87661c0
4746f79d50d804b0e9d5d5cc0d4796dee54d052c
Author: Andrew Bartlett [EMAIL PROTECTED]
Date: Tue Oct 14 11:16:59 2008 +1100
Merge branch 'master' of ssh://git.samba.org/data/git/samba into
abartlet-devel
commit 9dcbddd5c61e8bf2814e97e53e7c518df87661c0
Author: Matthias Dieter Wallnöfer [EMAIL PROTECTED]
Date: Tue Oct 14 11:02:42 2008 +1100
The ldb async merge broke all MMC management utilties
Commit 51baa8deec00244cc0a6e3d29c53932427800610 included a
copy-and-paste bug which caused all MMC mangement utilities to break.
Because of the typo Samba4 would no longer include the magic 'you may
write to these attributes/create these classes' attributes, these
tools would display all fields greyed out or 'read only', and not
allow the creation of child objects.
Signed-off-by: Andrew Bartlett [EMAIL PROTECTED]
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/kludge_acl.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
index 865e1c7..6acbf45 100644
--- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
+++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
@@ -250,14 +250,14 @@ static int kludge_acl_callback(struct ldb_request *req,
struct ldb_reply *ares)
case SECURITY_SYSTEM:
if (ac-allowedAttributesEffective) {
ret =
kludge_acl_allowedAttributes(ac-module-ldb, ares-message,
-
allowedClassesAttributesEffective);
+
allowedAttributesEffective);
if (ret != LDB_SUCCESS) {
return ldb_module_done(ac-req,
NULL, NULL, ret);
}
}
if (ac-allowedChildClassesEffective) {
ret =
kludge_acl_childClasses(ac-module-ldb, ares-message,
-
allowedClassesChildClassesEffective);
+
allowedChildClassesEffective);
if (ret != LDB_SUCCESS) {
return ldb_module_done(ac-req,
NULL, NULL, ret);
}
@@ -267,14 +267,14 @@ static int kludge_acl_callback(struct ldb_request *req,
struct ldb_reply *ares)
case SECURITY_ADMINISTRATOR:
if (ac-allowedAttributesEffective) {
ret =
kludge_acl_allowedAttributes(ac-module-ldb, ares-message,
-
allowedClassesAttributesEffective);
+
allowedAttributesEffective);
if (ret != LDB_SUCCESS) {
return ldb_module_done(ac-req,
NULL, NULL, ret);
}
}
if (ac-allowedChildClassesEffective) {
ret =
kludge_acl_childClasses(ac-module-ldb, ares-message,
-
allowedClassesChildClassesEffective);
+
allowedChildClassesEffective);
if (ret != LDB_SUCCESS) {
return ldb_module_done(ac-req,
NULL, NULL, ret);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 4c81727a003e4c49c314e0c5a1b4584b8825e7fe
The branch, master has been updated
via 4c81727a003e4c49c314e0c5a1b4584b8825e7fe (commit)
via a62c510d8b3f5e15bd48f71747c5f516eca570c7 (commit)
via 1f3e4f39c5219b8ca3564e0c2eb685d9e7fdb13e (commit)
from 501fa6a05db1b2c29b1e4720a03ed219aee2a346 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4c81727a003e4c49c314e0c5a1b4584b8825e7fe
Merge: a62c510d8b3f5e15bd48f71747c5f516eca570c7
501fa6a05db1b2c29b1e4720a03ed219aee2a346
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 02:34:38 2008 +0200
Merge branch 'master' of git://git.samba.org/samba
commit a62c510d8b3f5e15bd48f71747c5f516eca570c7
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 02:33:41 2008 +0200
Use GUID_from_string.
commit 1f3e4f39c5219b8ca3564e0c2eb685d9e7fdb13e
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 02:26:18 2008 +0200
Use GUID_string rather than smb_uuid_string().
---
Summary of changes:
source3/include/proto.h |2 -
source3/lib/display_sec.c |8 ++--
source3/lib/util_uuid.c | 67 ---
source3/libads/disp_sec.c |8 ++--
source3/libads/ldap.c |4 +-
source3/printing/nt_printing.c |6 ++--
source3/rpc_server/srv_spoolss_nt.c |2 +-
source3/rpcclient/cmd_lsarpc.c |4 +-
source3/utils/net_ads.c |2 +-
9 files changed, 17 insertions(+), 86 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 8ccf987..480b3eb 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1763,8 +1763,6 @@ int islower_ascii(int c);
void smb_uuid_pack(const struct GUID uu, UUID_FLAT *ptr);
void smb_uuid_unpack(const UUID_FLAT in, struct GUID *uu);
void smb_uuid_generate_random(struct GUID *uu);
-const char *smb_uuid_string(TALLOC_CTX *mem_ctx, const struct GUID uu);
-bool smb_string_to_uuid(const char *in, struct GUID* uu);
char *guid_binstring(const struct GUID *guid);
/* The following definitions come from lib/version.c */
diff --git a/source3/lib/display_sec.c b/source3/lib/display_sec.c
index 5427a81..a0d93d6 100644
--- a/source3/lib/display_sec.c
+++ b/source3/lib/display_sec.c
@@ -157,13 +157,13 @@ static void disp_sec_ace_object(struct
security_ace_object *object)
{
if (object-flags SEC_ACE_OBJECT_PRESENT) {
printf(Object type: SEC_ACE_OBJECT_PRESENT\n);
- printf(Object GUID: %s\n, smb_uuid_string(talloc_tos(),
- object-type.type));
+ printf(Object GUID: %s\n, GUID_string(talloc_tos(),
+ object-type.type));
}
if (object-flags SEC_ACE_OBJECT_INHERITED_PRESENT) {
printf(Object type: SEC_ACE_OBJECT_INHERITED_PRESENT\n);
- printf(Object GUID: %s\n, smb_uuid_string(talloc_tos(),
- object-inherited_type.inherited_type));
+ printf(Object GUID: %s\n, GUID_string(talloc_tos(),
+ object-inherited_type.inherited_type));
}
}
diff --git a/source3/lib/util_uuid.c b/source3/lib/util_uuid.c
index 3a8f7b3..7e67d79 100644
--- a/source3/lib/util_uuid.c
+++ b/source3/lib/util_uuid.c
@@ -20,12 +20,6 @@
#include includes.h
-/*
- * Offset between 15-Oct-1582 and 1-Jan-70
- */
-#define TIME_OFFSET_HIGH 0x01B21DD2
-#define TIME_OFFSET_LOW 0x13814000
-
void smb_uuid_pack(const struct GUID uu, UUID_FLAT *ptr)
{
SIVAL(ptr-info, 0, uu.time_low);
@@ -55,67 +49,6 @@ void smb_uuid_generate_random(struct GUID *uu)
uu-time_hi_and_version = (uu-time_hi_and_version 0x0FFF) | 0x4000;
}
-const char *smb_uuid_string(TALLOC_CTX *mem_ctx, const struct GUID uu)
-{
- char *result;
-
- result = talloc_asprintf(
- mem_ctx,
- %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x,
- uu.time_low, uu.time_mid, uu.time_hi_and_version,
- uu.clock_seq[0], uu.clock_seq[1],
- uu.node[0], uu.node[1], uu.node[2],
- uu.node[3], uu.node[4], uu.node[5]);
-
- SMB_ASSERT(result != NULL);
- return result;
-}
-
-bool smb_string_to_uuid(const char *in, struct GUID* uu)
-{
- bool ret = False;
- const char *ptr = in;
- char *end = (char *)in;
- int i;
- unsigned v1, v2;
-
- if (!in || !uu) goto out;
-
- uu-time_low = strtoul(ptr, end, 16);
- if ((end - ptr) != 8 || *end != '-') goto out;
- ptr = (end + 1);
-
- uu-time_mid = strtoul(ptr, end, 16);
- if ((end - ptr) != 4 || *end != '-') goto out;
- ptr = (end + 1);
-
- uu-time_hi_and_version = strtoul(ptr, end, 16);
- if ((end - ptr) != 4 || *end != '-') goto out;
-
[SCM] Samba Shared Repository - branch master updated - 389cfee579a3222e6f536971af2fc0cb30596475
The branch, master has been updated
via 389cfee579a3222e6f536971af2fc0cb30596475 (commit)
from 4c81727a003e4c49c314e0c5a1b4584b8825e7fe (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 389cfee579a3222e6f536971af2fc0cb30596475
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 02:41:20 2008 +0200
Use GUID_random.
---
Summary of changes:
source3/include/proto.h |1 -
source3/lib/util_uuid.c | 11 ---
source3/passdb/secrets.c |2 +-
3 files changed, 1 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 480b3eb..8f2c813 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1762,7 +1762,6 @@ int islower_ascii(int c);
void smb_uuid_pack(const struct GUID uu, UUID_FLAT *ptr);
void smb_uuid_unpack(const UUID_FLAT in, struct GUID *uu);
-void smb_uuid_generate_random(struct GUID *uu);
char *guid_binstring(const struct GUID *guid);
/* The following definitions come from lib/version.c */
diff --git a/source3/lib/util_uuid.c b/source3/lib/util_uuid.c
index 7e67d79..c681b66 100644
--- a/source3/lib/util_uuid.c
+++ b/source3/lib/util_uuid.c
@@ -38,17 +38,6 @@ void smb_uuid_unpack(const UUID_FLAT in, struct GUID *uu)
memcpy(uu-node, in.info+10, 6);
}
-void smb_uuid_generate_random(struct GUID *uu)
-{
- UUID_FLAT tmp;
-
- generate_random_buffer(tmp.info, sizeof(tmp.info));
- smb_uuid_unpack(tmp, uu);
-
- uu-clock_seq[0] = (uu-clock_seq[0] 0x3F) | 0x80;
- uu-time_hi_and_version = (uu-time_hi_and_version 0x0FFF) | 0x4000;
-}
-
/*
Return the binary string representation of a GUID.
Caller must free.
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 306d4d0..a6adb90 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -238,7 +238,7 @@ bool secrets_fetch_domain_guid(const char *domain, struct
GUID *guid)
if (!dyn_guid) {
if (lp_server_role() == ROLE_DOMAIN_PDC) {
- smb_uuid_generate_random(new_guid);
+ new_guid = GUID_random();
if (!secrets_store_domain_guid(domain, new_guid))
return False;
dyn_guid = (struct GUID *)secrets_fetch(key, size);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - e11277e28db19841e941c62478d99d3780cd238b
The branch, master has been updated via e11277e28db19841e941c62478d99d3780cd238b (commit) from 389cfee579a3222e6f536971af2fc0cb30596475 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e11277e28db19841e941c62478d99d3780cd238b Author: Tim Prouty [EMAIL PROTECTED] Date: Mon Oct 13 15:33:49 2008 -0700 Fixed a variable undeclared compilation error Explicitly declaring environ eliminates a compilation error on some systems. --- Summary of changes: source4/smb_server/smb_samba3.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/smb_server/smb_samba3.c b/source4/smb_server/smb_samba3.c index 259d290..ea589a0 100644 --- a/source4/smb_server/smb_samba3.c +++ b/source4/smb_server/smb_samba3.c @@ -47,6 +47,7 @@ static void samba3_smb_accept(struct stream_connection *conn) const char *prog; char *argv[2]; char *reason; + extern char **environ; close(0); close(1); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 396e53f9ffbaf1a70d2ffe327b3da56e24e62e17
The branch, master has been updated
via 396e53f9ffbaf1a70d2ffe327b3da56e24e62e17 (commit)
via 606c398fb834c3e057423dfce641b8a6b2d3f925 (commit)
via d4f647c859139a56b403e864ebb4ed08f40e35be (commit)
via efdc50344025d1081fbe35b2fab2d8948b0f36cb (commit)
via 2d92361a1c279b3982fc7038f5e872dadc2590f6 (commit)
from e11277e28db19841e941c62478d99d3780cd238b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 396e53f9ffbaf1a70d2ffe327b3da56e24e62e17
Merge: 606c398fb834c3e057423dfce641b8a6b2d3f925
e11277e28db19841e941c62478d99d3780cd238b
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 03:39:56 2008 +0200
Merge branch 'master' of git://git.samba.org/samba
commit 606c398fb834c3e057423dfce641b8a6b2d3f925
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 03:38:34 2008 +0200
Rely on standard {u,}int{8,16,32,64}_t types provided by system or
libreplace for {u,}int{8,16,32,64} defines.
commit d4f647c859139a56b403e864ebb4ed08f40e35be
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 03:17:52 2008 +0200
Remove define for VOLATILE, volatile is already provided by libreplace.
commit efdc50344025d1081fbe35b2fab2d8948b0f36cb
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 03:14:46 2008 +0200
MAXHOSTNAMELEN is already provided by libreplace if not by the system.
commit 2d92361a1c279b3982fc7038f5e872dadc2590f6
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 03:14:07 2008 +0200
Remove unused data type schar. If we really need this, it should probably
be typedeffed to int8_t.
---
Summary of changes:
source3/include/includes.h | 77 +--
source3/lib/select.c|2 +-
source3/nsswitch/winbind_nss_irix.c |1 -
source3/nsswitch/wins.c |1 -
4 files changed, 11 insertions(+), 70 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 85a316b..0df4ef9 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -286,36 +286,20 @@ typedef int ber_int_t;
#endif
/*
- * Define VOLATILE if needed.
- */
-
-#if defined(HAVE_VOLATILE)
-#define VOLATILE volatile
-#else
-#define VOLATILE
-#endif
-
-/*
* Define additional missing types
*/
#if defined(HAVE_SIG_ATOMIC_T_TYPE) defined(AIX)
typedef sig_atomic_t SIG_ATOMIC_T;
#elif defined(HAVE_SIG_ATOMIC_T_TYPE) !defined(AIX)
-typedef sig_atomic_t VOLATILE SIG_ATOMIC_T;
+typedef sig_atomic_t volatile SIG_ATOMIC_T;
#else
-typedef int VOLATILE SIG_ATOMIC_T;
+typedef int volatile SIG_ATOMIC_T;
#endif
#ifndef uchar
#define uchar unsigned char
#endif
-#ifdef HAVE_UNSIGNED_CHAR
-#define schar signed char
-#else
-#define schar char
-#endif
-
/*
Samba needs type definitions for int16, int32, uint16 and uint32.
@@ -326,15 +310,11 @@ typedef int VOLATILE SIG_ATOMIC_T;
*/
#ifndef uint8
-#define uint8 unsigned char
+#define uint8 uint8_t
#endif
#if !defined(int16) !defined(HAVE_INT16_FROM_RPC_RPC_H)
-# if (SIZEOF_SHORT == 4)
-#define int16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16;
-# else /* SIZEOF_SHORT != 4 */
-#define int16 short
-# endif /* SIZEOF_SHORT != 4 */
+# define int16 int16_t
/* needed to work around compile issue on HP-UX 11.x */
# define _INT16 1
#endif
@@ -344,25 +324,13 @@ typedef int VOLATILE SIG_ATOMIC_T;
* case as int16 may be a typedef from rpc/rpc.h
*/
+
#if !defined(uint16) !defined(HAVE_UINT16_FROM_RPC_RPC_H)
-#if (SIZEOF_SHORT == 4)
-#define uint16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16;
-#else /* SIZEOF_SHORT != 4 */
-#define uint16 unsigned short
-#endif /* SIZEOF_SHORT != 4 */
+# define uint16 uint16_t
#endif
#if !defined(int32) !defined(HAVE_INT32_FROM_RPC_RPC_H)
-# if (SIZEOF_INT == 4)
-#define int32 int
-# elif (SIZEOF_LONG == 4)
-#define int32 long
-# elif (SIZEOF_SHORT == 4)
-#define int32 short
-# else
- /* uggh - no 32 bit type?? probably a CRAY. just hope this works ... */
-#define int32 int
-# endif
+# define int32 int32_t
/* needed to work around compile issue on HP-UX 11.x */
# define _INT32 1
#endif
@@ -373,16 +341,7 @@ typedef int VOLATILE SIG_ATOMIC_T;
*/
#if !defined(uint32) !defined(HAVE_UINT32_FROM_RPC_RPC_H)
-#if (SIZEOF_INT == 4)
-#define uint32 unsigned int
-#elif (SIZEOF_LONG == 4)
-#define uint32 unsigned long
-#elif (SIZEOF_SHORT == 4)
-#define uint32 unsigned short
-#else
-/* uggh - no 32 bit type?? probably a CRAY. just hope this works ... */
-#define uint32 unsigned
-#endif
+# define uint32 uint32_t
#endif
/*
@@ -390,19 +349,11 @@ typedef int VOLATILE SIG_ATOMIC_T;
*/
#if !defined(uint64)
-#if (SIZEOF_LONG == 8)
-#define uint64 unsigned long
-#elif
[SCM] Samba Shared Repository - branch master updated - b96329f4f9ed1f70d21c637f696f27a52af6955d
The branch, master has been updated via b96329f4f9ed1f70d21c637f696f27a52af6955d (commit) from 396e53f9ffbaf1a70d2ffe327b3da56e24e62e17 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b96329f4f9ed1f70d21c637f696f27a52af6955d Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Tue Oct 14 03:42:54 2008 +0200 Define __STDC_FORMAT_MACROS, required for PRIu64 define (among others) from inttypes.h. --- Summary of changes: lib/replace/replace.h |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/replace/replace.h b/lib/replace/replace.h index c69ea6c..99fdf53 100644 --- a/lib/replace/replace.h +++ b/lib/replace/replace.h @@ -52,6 +52,7 @@ which causes a warning storm on irix */ #undef HAVE_INTTYPES_H #elif HAVE_INTTYPES_H +#define __STDC_FORMAT_MACROS #include inttypes.h #endif -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 3bd73c926ec83e07051b361c5681c29ced1f4fd3
The branch, master has been updated via 3bd73c926ec83e07051b361c5681c29ced1f4fd3 (commit) from b96329f4f9ed1f70d21c637f696f27a52af6955d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3bd73c926ec83e07051b361c5681c29ced1f4fd3 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Tue Oct 14 04:12:53 2008 +0200 Define inttypes macros if not provided by system. --- Summary of changes: lib/replace/replace.h | 48 1 files changed, 48 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/replace/replace.h b/lib/replace/replace.h index 99fdf53..4ac77e7 100644 --- a/lib/replace/replace.h +++ b/lib/replace/replace.h @@ -56,6 +56,54 @@ #include inttypes.h #endif +#ifndef __PRI64_PREFIX +# if __WORDSIZE == 64 +# define __PRI64_PREFIX l +# else +# define __PRI64_PREFIX ll +# endif +#endif + +/* Decimal notation. */ +#ifndef PRId8 +# define PRId8 d +#endif +#ifndef PRId16 +# define PRId16d +#endif +#ifndef PRId32 +# define PRId32d +#endif +#ifndef PRId64 +# define PRId64__PRI64_PREFIX d +#endif + +#ifndef PRIi8 +# define PRIi8 i +#endif +#ifndef PRIi8 +# define PRIi16i +#endif +#ifndef PRIi8 +# define PRIi32i +#endif +#ifndef PRIi8 +# define PRIi64__PRI64_PREFIX i +#endif + +#ifndef PRIu8 +# define PRIu8 u +#endif +#ifndef PRIu16 +# define PRIu16u +#endif +#ifndef PRIu32 +# define PRIu32u +#endif +#ifndef PRIu64 +# define PRIu64__PRI64_PREFIX u +#endif + #ifdef HAVE_STRING_H #include string.h #endif -- Samba Shared Repository
