[Samba] Re: probleman adding user
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 | Good Morning, | I'm adding user mdonada in the smbldap-useradd -a -m mdonada, but | probleman: | [EMAIL PROTECTED] home]# smbldap-useradd -a -m mdonada | Can't call method get_value on an undefined value at | /usr/sbin/smbldap-useradd line 170, DATA line 283. | [EMAIL PROTECTED] home]# The error message tells us the following: 1. The error is in /usr/sbin/smbldap-useradd 2. Specifically on lines 170 and line 283. Post these lines and we can be of more assistance. I'm thinking though that you've left some data out of your smbldap_conf.pm file. Some of the settings therein cannot be left blank. Jim C. - -- - - | I can be reached on the following Instant Messenger services: | |---| | MSN: j_c_llings @ hotmail.com AIM: WyteLi0n ICQ: 123291844 | |---| | Y!: j_c_llingsJabber: jcllings @ njs.netlab.cz| - - -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (MingW32) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCMqlY57L0B7uXm9oRAmqUAJ9YQoeVrJGRD13TYcMuGWxjZLT39ACghHqh 2B9uVp04Ovsw1JFd65Gj3qI= =/sPr -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] open failed (Too many open files in system)
OS X is supposed to be FreeBSD-based (sure, I even ran ifconfig, mount and bunch of utilities :-) try sysctl -a | grep files I supplied my /etc/sysctl.conf (I'm currently sitting on FreeBSD, not on Mac OS X, so I just hope it will help) I am running Samba 3.0.5 on OS X 10.3.8 Server. It's the stock Samba supplied by Apple with no modifications. I am running a variety of shares on the system to around 50 PC clients. I came into the office this morning with a dead Xserve... could not login, could not ping or ssh into the system. Users in the office could not even browse the network. When they tried to browse the workgroup (which includes other native local shared folders on users PC) they received the resource not found error from Windows. We are set-up with non-pdc shares in a normal single subnet and singe workgroup 'OROURKE'. My logs rolled before I could dig back earlier in the morning but this was the first sign in my smbd logs: [2005/03/11 08:21:05, 0] /SourceCache/samba/samba-59/samba/source/tdb/tdbutil.c:tdb_log(725) tdb(/private/var/samba/registry.tdb): tdb_reopen: open failed (Too many open files in system) and syslog: Mar 11 03:15:02 xserve1 syslogd: restart Mar 11 07:05:52 xserve1 kernel: file: table is full Mar 11 07:06:10 xserve1 last message repeated 3 times repeats Mar 11 15:15:07 xserve1 /usr/sbin/snmpd: warning: cannot open /etc/hosts.allow: Too many open files in system Mar 11 08:15:15 xserve1 kernel: file: table is full Mar 11 08:15:43 xserve1 last message repeated 3 times repeats Mar 11 08:27:28 localhost syslogd: restart // I manually restarted the at this point Also to add to it my MRTG plots show some strange data: http://www.orourke.ca/mrtg/xserve/smb.html This is from a simple script that parses the smbstatus output and counts the number of smb connections to the Xserve. The flatline @ 4 AM is the odd part. The value roughly matches the number of PC's in the office and the office is empty at this point. This with the network issue when I came in this morning makes me pretty sure it's a samba related issue. My [global] smb.conf entries are below Dan [global] getwd cache = yes log level = 2 display charset = UTF-8-MAC print command = /usr/sbin/PrintServiceAccess printps %p %s lprm command = /usr/sbin/PrintServiceAccess remove %p %j security = user guest account = unknown encrypt passwords = yes printing = BSD allow trusted domains = no preferred master = yes lppause command = /usr/sbin/PrintServiceAccess hold %p %j netbios name = fileserver wins support = no add machine script = /usr/bin/opendirectorypdbconfig -c create_computer_account -r %u -n /LDAPv3/127.0.0.1 max smbd processes = 0 printcap = server string = Apple Xserve / RAID lpresume command = /usr/sbin/PrintServiceAccess release %p %j logon drive = H: client ntlmv2 auth = no domain logons = yes lpq command = /usr/sbin/PrintServiceAccess jobs %p admin users = @admin passdb backend = opendirectorysam guest unix charset = UTF-8-MAC dos charset = CP437 socket options = TCP_NODELAY IPTOS_LOWDELAY SO_KEEPALIVE SO_SNDBUF=8576 SO_RCVBUF=8576 auth methods = guest opendirectory local master = yes use spnego = no domain master = yes logon path = \\%N\profiles\%u printer admin = @admin, @staff map to guest = Never workgroup = OROURKE -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba kern.maxfiles=65536 kern.maxfilesperproc=32768 kern.sugid_coredump=1 debug.elf_legacy_coredump=1 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Creating Custom System Policy Templates
Has anyone looked into creating custom templates for Microsoft's System Policy editor ? I like the idea of managing workstations through the yes, I did look at it :-) I even have been using custom templates for some years, since nt4 workstations. maybe I will eventually create and maitain online resource on this subject. currently I'm out of time to do that, and I'm not sure it will be profitable (in any sence). maybe we can cooperate our efforts on this ? (no kidding) I attached custom template for enabling Outlook attachements displaying (without Exchange server), it is well known that MS Outlook, for example blocks by default exe, reg, pif files. According to that template (sorry, haven't yet translated it to English) You can unblock such attachements. NTConfig.POL file, but the included templates are quite a bit outdated. Does anyone know if it would be worth-while to take the time and create an updated Template to add policies to manage newer features of Windows 2000/XP through the NTConfig.POL file, or if it is even possible ? it is _definetly_ possible. any settings in HKLM and HKCU branches (hives) can be propagated through NTConfig.POL (of course, You need to create custom template for such purpose) Currently, if I have to adjust the machine's registries, I just push it out with a Kixtart Script, which means that if I want to adjust any User registry settings, the user has to be logged in when I run the script. I think the System Policy Editor would be a better way to go, as long as you keep in mind the tatoo effect on the registry. Kixtart is just brilliant. much easier (and as You noticed, no tatoo effect) than POLEDIT, but it can be used against only registry where user has writing permission, HKCU of course, but HKLM is questionable (unless your users have admin rights). I even have some stupid software that stores settings on HKEY_CLASSES_ROOT, it is also manageble with Kixtart. Does anyone have any info on whether or not this is feasible, or if samba will soon support Group Policy Objects (so I won't need to do this)? Or if there's Nitrobit solution. Haven't tested it yet. looks nice. yes, GPO + samba will be nice, but I guess it will be ready when all of us will do it possible :-) Samba code is not produced by itself yet, just by people who write it. someone already has accomplished this or has any other comments. Mike Petersen [EMAIL PROTECTED] References: Creating Custom Templates for SPE - http://www.oreilly.com/catalog/winsyspe/chapter/ch08.html Microsofts Group Policy Reference Spreadsheet - http://download.microsoft.com/download/a/a/3/aa32239c-3a23-46ef-ba8b-da786e167e5 e/PolicySettings.xls Samba Rocks !! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba CLASS USER CATEGORY MS Outlook POLICY KEYNAME Software\Microsoft\Office\11.0\Outlook\Security PART EDITTEXT VALUENAME Level1Remove END PART END POLICY POLICY KEYNAME Software\Microsoft\Office\11.0\Outlook\Options\Mail PART MS Word 2003 CHECKBOX DEFCHECKED VALUENAME EditorPreference VALUEON NUMERIC 2 VALUEOFF NUMERIC 0 END PART END POLICY POLICY KEYNAME Software\Microsoft\Office\11.0\Outlook\Preferences PART CHECKBOX DEFCHECKED VALUENAME DoAging VALUEON NUMERIC 1 VALUEOFF NUMERIC 0 END PART PART CHECKBOX DEFCHECKED VALUENAME ArchiveOld VALUEON NUMERIC 1 VALUEOFF NUMERIC 0 END PART ;PARTCHECKBOX DEFCHECKED ;VALUENAME EveryDays ;VALUEON NUMERIC 1 ;VALUEOFF NUMERIC 0 ;; ; END PART END POLICY END CATEGORY -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Access to NFS through samba
Hello all, I have the following problem: I wish to access the NFS shares through Windows. I want guideline on the following issues : 1.One of the solution to above problem involves sharing the same share(directory) using Samba server and NFS server.But won't this give rise to conflicts with respect to accesspermission bits of that particular directory being shared. (Because Samba does the Mapping of the permission bits with respect to windows whereas NFS does it with respect to unix/linux) How shall this conflict be overcome ? 2.Another solution involves introduction of a separate machine in the network,on which the required NFS share is mounted and then is shared through Samba. I wish to know the possible disadvantages of this solution. Does the above conflict of permission bits occur in this case. 3.Does any other solution exist? Is it possible to somehow map the SMB protocol with NFS protocol,(because the SMB protocol is more stringent than NFS protocol). regards, nac -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Access to NFS through samba
nac kawathekar wrote: 2.Another solution involves introduction of a separate machine in the network,on which the required NFS share is mounted and then is shared through Samba. I wish to know the possible disadvantages of this solution. Does the above conflict of permission bits occur in this case. Unless you're using nfsv4 (which I didn't test), you'll have problems with locking (e.g.: both the samba client and the nfs server can open the same file for writing, with obviously disastrous results). Bye -- Luca -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Access to NFS through samba
nac kawathekar [EMAIL PROTECTED] wrote: I have the following problem: I wish to access the NFS shares through Windows. I want guideline on the following issues : 1.One of the solution to above problem involves sharing the same share(directory) using Samba server and NFS server.But won't this give rise to conflicts with respect to access permission bits of that particular directory being shared. (Because Samba does the Mapping of the permission bits with respect to windows whereas NFS does it with respect to unix/linux) How shall this conflict be overcome ? There's no conflict, really - and this the way to go in most cases. There's no such thing as special permission bits set by NFS - the usual unix semantics apply all along. (because the SMB protocol is more stringent than NFS protocol). Hmm, could you elaborate ? -- Michal Kurowski [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] (no subject)
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 People, hi! I have trouble migration from NT4 to samba 3.0.10 then I run net rpc vampire -S PDC_NAME I get error: Fetching DOMAIN database SAM_DELTA_DOMAIN_INFO not handled Creating account: admin Can't call method get_value on an undefined value at /var/lib/samba/sbin/smbldap-useradd.pl line 152, DATA line 283. Could not create posix account info for 'admin' Creating account: guest Can't call method get_value on an undefined value at /var/lib/samba/sbin/smbldap-useradd.pl line 152, DATA line 283. Could not create posix account info for 'guest' Creating account: dubova Can't call method get_value on an undefined value at /var/lib/samba/sbin/smbldap-useradd.pl line 152, DATA line 283. Could not create posix account info for 'dubova' Creating account: stepanianc Can't call method get_value on an undefined value at /var/lib/samba/sbin/smbldap-useradd.pl line 152, DATA line 283. Could not create posix account info for 'stepanianc' Creating account: volkova Can't call method get_value on an undefined value at /var/lib/samba/sbin/smbldap-useradd.pl line 152, DATA line 283. Could not create posix account info for 'volkova' Creating account: reznikova Can't call method get_value on an undefined value at /var/lib/samba/sbin/smbldap-useradd.pl line 152, DATA line 283. Could not create posix account info for 'reznikova' Creating account: g-loginova Groups are imported, computers imported, but user account - not imported (error see above) Is anybody can help me? WBR, Zebar -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.3 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFCMu0yz02mfzx4qDYRAtcuAJ0fvtspevrrJD91Ik9x5a9ZZdH+pQCdHwxK W7Z2kT+NM1IxZvajjizu3gY= =UXmZ -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] Re: Error connecting to Samba share from pocketPC
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Samba wrote: | Anyone any clues on this behaviour? ok. I just looked at the traces. However, the WinXP trace doesn't look like what I need. Can you send me a trace of the ipaq connecting to the WinXP box (no previous connection I need to see the negprot request and response). cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCMvzyIR7qMdg1EfYRAttiAKDwSKj6RUfUEGPSaORlTWmqNjM9PQCfe4aa l8ac6sCrGnUAs2fADRB5ky8= =EzNI -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 crash on kopie big files!!!
dear samba-users, is there a problem known, when you copy files from windows to samba-server they much or big (e.g. 300MB) that the server crashs? i have test it with all other options. only a copy from windows to samba (from all windows machines) they are been more than ca. 100mb brings the server down. a startup with reset is require. i use suse 9.0 and samba 2.28a My log files at crash. - log.smdb rx212 (192.168.200.152) closed connection to service qualidade [2005/03/11 18:42:31, 0] lib/util_sock.c:read_data(436) read_data: read failure for 4. Error = No route to host [2005/03/11 18:42:38, 0] lib/util_sock.c:read_data(436) read_data: read failure for 4. Error = No route to host [2005/03/11 18:42:38, 1] smbd/service.c:close_cnum(684) rx1411 (192.168.200.154) closed connection to service qualidade [2005/03/11 18:42:38, 1] smbd/service.c:close_cnum(684) rx1411 (192.168.200.154) closed connection to service pessoal [2005/03/11 18:44:13, 0] rpc_server/srv_pipe.c:api_pipe_netsec_process(1318) failed to decode PDU [2005/03/11 18:44:13, 0] rpc_server/srv_pipe_hnd.c:process_request_pdu(504) process_request_pdu: failed to do schannel processing. [2005/03/11 18:44:16, 1] smbd/service.c:make_connection(636) rx415 (192.168.200.197) connect to service correspondencias as user Glayce (uid=520, gid=209) (pid 2266) [2005/03/11 18:44:16, 1] smbd/service.c:make_connection(636) rx415 (192.168.200.197) connect to service certificado as user Glayce (uid=520, gid=209) (pid 2266) [2005/03/11 18:44:16, 1] smbd/service.c:make_connection(636) rx415 (192.168.200.197) connect to service qualidade as user Glayce (uid=520, gid=209) (pid 2266) [2005/03/11 18:44:40, 1] smbd/service.c:make_connection(636) rx415 (192.168.200.197) connect to service isolamento as user Glayce (uid=520, gid=209) (pid 2266) [2005/03/11 18:45:05, 1] smbd/service.c:close_cnum(684) rx415 (192.168.200.197) closed connection to service correspondencias [2005/03/11 18:45:05, 1] smbd/service.c:close_cnum(684) rx415 (192.168.200.197) closed connection to service certificado [2005/03/11 18:45:05, 1] smbd/service.c:close_cnum(684) rx415 (192.168.200.197) closed connection to service qualidade [2005/03/11 18:45:38, 1] smbd/service.c:close_cnum(684) rx415 (192.168.200.197) closed connection to service isolamento [2005/03/11 18:46:00, 1] smbd/service.c:close_cnum(684) rx881 (192.168.200.126) closed connection to service qualidade [2005/03/11 18:46:03, 1] smbd/service.c:close_cnum(684) rx881 (192.168.200.126) closed connection to service suprimentos [2005/03/11 18:46:03, 1] smbd/service.c:close_cnum(684) rx881 (192.168.200.126) closed connection to service compras [2005/03/11 18:46:41, 1] smbd/service.c:make_connection(636) rx1702 (192.168.200.199) connect to service Ky_nao_timbrado as user Edgar (uid=507, gid=210) (pid 2275) [2005/03/11 19:06:42, 0] smbd/server.c:main(791) smbd version 2.2.8a-SuSE started. - log.nmbd [2005/03/11 18:41:20, 1] nmbd/nmbd_processlogon.c:process_logon_packet(69) process_logon_packet: Logon from 192.168.200.129: code = 0x12 [2005/03/11 18:42:23, 1] nmbd/nmbd_processlogon.c:process_logon_packet(69) process_logon_packet: Logon from 192.168.200.199: code = 0x12 [2005/03/11 18:42:23, 1] nmbd/nmbd_processlogon.c:process_logon_packet(69) process_logon_packet: Logon from 192.168.200.199: code = 0x12 [2005/03/11 18:44:15, 1] nmbd/nmbd_processlogon.c:process_logon_packet(69) process_logon_packet: Logon from 192.168.200.140: code = 0x12 [2005/03/11 18:44:15, 1] nmbd/nmbd_processlogon.c:process_logon_packet(69) process_logon_packet: Logon from 192.168.200.140: code = 0x12 [2005/03/11 18:44:16, 1] nmbd/nmbd_processlogon.c:process_logon_packet(69) process_logon_packet: Logon from 192.168.200.198: code = 0x12 [2005/03/11 18:44:16, 1] nmbd/nmbd_processlogon.c:process_logon_packet(69) process_logon_packet: Logon from 192.168.200.198: code = 0x12 [2005/03/11 18:45:54, 1] nmbd/nmbd_processlogon.c:process_logon_packet(69) process_logon_packet: Logon from 192.168.200.124: code = 0x12 [2005/03/11 18:45:54, 1] nmbd/nmbd_processlogon.c:process_logon_packet(69) process_logon_packet: Logon from 192.168.200.124: code = 0x12 [2005/03/11 18:45:55, 1] nmbd/nmbd_processlogon.c:process_logon_packet(69) process_logon_packet: Logon from 192.168.200.186: code = 0x12 [2005/03/11 18:45:55, 1] nmbd/nmbd_processlogon.c:process_logon_packet(69) process_logon_packet: Logon from 192.168.200.186: code = 0x12 [2005/03/11 18:46:13, 1] nmbd/nmbd_processlogon.c:process_logon_packet(69) process_logon_packet: Logon from 192.168.200.1: code = 0x12 [2005/03/11 18:46:13, 1] nmbd/nmbd_processlogon.c:process_logon_packet(69) process_logon_packet: Logon from 192.168.200.1: code = 0x12 [2005/03/11 18:46:21, 1] nmbd/nmbd_processlogon.c:process_logon_packet(69) process_logon_packet: Logon from 192.168.200.1: code = 0x12 [2005/03/11 18:46:21, 1] nmbd/nmbd_processlogon.c:process_logon_packet(69) process_logon_packet: Logon from 192.168.200.1: code = 0x12 [2005/03/11 18:46:42, 1]
Re: [Samba] Re: Error connecting to Samba share from pocketPC
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Samba wrote: | Anyone any clues on this behaviour? Just out of curiosity, can you set 'nt status support = no' in [global] and try to connect with the iPAQ ? cheers, jerry ' -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCMv8xIR7qMdg1EfYRAie1AJ9AAZS7LuGoMKyi60AH4HDcAZDx0QCgjcN7 Q+OHOk6jInzAvBuToopCikM= =WOoT -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: JT, Jerry, Chris, Andrew??? Anything new was:Re: [Samba] Extremely slow during browsing some directories
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 david rankin wrote: | John, Jerry, Chris and, yes you too Bartlett (mate): | |Have you thought any more about this problem?? It has been posted under: | Samba errors with smb QUERY_PATH_INFO,Error: STATUS_OBJECT_NAME_NOT_FOUND | | 3.0.7 - NT Create AndX Response, Error:, QUERY_PATH_INFO,Error: David, First off could you give 3.0.12rc1 a test. There's been a lot of changes since 3.0.7. Along another path is that it sounds like are having oplock break timeouts. Trying setting 'oplocks = no' in one share just as a temporary test. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCMwIgIR7qMdg1EfYRAnaoAKC8+MbUbNJkUDqLkiboucucDcmMRACg11q/ SJ/37+99eSoqRzAubxaw/3I= =6lNz -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 smbd[23036]: Unable to get jobs for ipp://localhost/printers/[printer-n
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Bjørn-Sverre Nøttum wrote: | Hallo! | | Sorry for posting this two times - I forgot the subject!! | | I am running samba 3.01012 on a fc2 server. I have problems | with samba/cups for some of my printers, and samba is | filling up /var/log/messages with the following lines: | | -printing/print_cups.c:cups_queue_get(900) | -server smbd[23036]: Unable to get jobs for | ipp://localhost/printers/[printer-name] - client-error-not-found There were a lot of printing fixes in 3.0.11. I think this issue would have been fixed in that release. Or you might want to give 3.0.12rc1 a test and see. I think these cheers, jerry = Alleviating the pain of Windows(tm) --- http://www.samba.org GnuPG Key- http://www.plainjoe.org/gpg_public.asc I never saved anything for the swim back. Ethan Hawk in Gattaca -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCMwMtIR7qMdg1EfYRAv4PAKDzFoAkx5ZLEcLIliZl8dKDquIEIwCgyukN SuPoBwh9qJ6EwAE3q6wfduY= =WjUq -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] AutoCad 2004, Samba 3.0.11 file locking issues
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Bill Arlofski wrote: | | Sorry for such a long post as my first to the list, but in an effort to | forego a long back and forth question/answer session via email, I think | if I post all the information that I currently have someone may be able | to more quickly spot my issue. | | The server in question is a Gentoo server running Samba 3.0.11. | | The basic problem is that when person A opens an AutoCad file, person B | is unable to open the file and is told (by an Autocad dialog box): | | Cannot find the scpcified drawing file. Please verify that the network | drive is available and the file exists | | Now, this Samba server replaced an NT 4 server and the client says that | in the past, when ever person b tried to open an already opened Autocad | file, they would be allowed to open it in Read-only mode, which is | exactly what they expect and want to happen. I think we actually need a raw network trace (tcpdump -w /tmp/dump.pcap -s 0 -i eth0 host client ip) and a level 10 smbd debug log You might want to test 3.0.12rc1 since jeremy just fixed an issue with pending modtimes that fixed issues with excel. cheers, jerry = Alleviating the pain of Windows(tm) --- http://www.samba.org GnuPG Key- http://www.plainjoe.org/gpg_public.asc I never saved anything for the swim back. Ethan Hawk in Gattaca -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCMwP1IR7qMdg1EfYRAuljAJ4yBn8aj6jg2a289fvY0m46nxTOEgCfUm6u Pw/p55mI4uT7rgaZRJ+MzEk= =kTMI -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] Re: Re: Error connecting to Samba share from pocketPC
Jerry, Thanks for all the help so far. I will try to get a decent trace tomorrow. Greetings, Ron Gerald (Jerry) Carter [EMAIL PROTECTED] schreef in bericht news:[EMAIL PROTECTED] -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Samba wrote: | Anyone any clues on this behaviour? ok. I just looked at the traces. However, the WinXP trace doesn't look like what I need. Can you send me a trace of the ipaq connecting to the WinXP box (no previous connection I need to see the negprot request and response). cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCMvzyIR7qMdg1EfYRAttiAKDwSKj6RUfUEGPSaORlTWmqNjM9PQCfe4aa l8ac6sCrGnUAs2fADRB5ky8= =EzNI -END PGP SIGNATURE- -- 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] Re: Re: Error connecting to Samba share from pocketPC
I added the parameter, but unfortunately there is no change in behaviour. Grtz, Ron Gerald (Jerry) Carter [EMAIL PROTECTED] schreef in bericht news:[EMAIL PROTECTED] -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Samba wrote: | Anyone any clues on this behaviour? Just out of curiosity, can you set 'nt status support = no' in [global] and try to connect with the iPAQ ? cheers, jerry ' -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCMv8xIR7qMdg1EfYRAie1AJ9AAZS7LuGoMKyi60AH4HDcAZDx0QCgjcN7 Q+OHOk6jInzAvBuToopCikM= =WOoT -END PGP SIGNATURE- -- 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] Can SAMBA be useful for me ?
I am planning to set up a small compute farm consisting of x86 notebooks on a switched ethernet lan. These only have one nic and limited disk, so that I need to import a data partition from an external file server. For this purpose I'd like to use a w98 PC that has access to internet over dsl. I envisage connecting all machines to the ethernet switch using 10/100 links. The ip addresses would be (i) the DHCP-assigned address for the w98 machine, and (ii) local addresses for the linux machines, such as 10.0.0.* Can I use SAMBA to turn the w98 box into a file-server and use the linux notebooks as SAMBA-clients? Any links to good how-to sites, cookbooks and the like would be greatly appreciated. Thanks, Joseph -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Can SAMBA be useful for me ?
If all your clients are linux it does not make sense to use samba. Turn your windows machine into a linux box and then use NFS to share anything you want from the pc to the laptops. If you are actually setting up a linux cluster then you may want to check out rocks which is based on RHEL: http://rocks.npaci.edu/Rocks/ and is free as in beer. Diego -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Pareti, Joseph Sent: Saturday, March 12, 2005 12:08 PM To: samba@lists.samba.org Subject: [Samba] Can SAMBA be useful for me ? I am planning to set up a small compute farm consisting of x86 notebooks on a switched ethernet lan. These only have one nic and limited disk, so that I need to import a data partition from an external file server. For this purpose I'd like to use a w98 PC that has access to internet over dsl. I envisage connecting all machines to the ethernet switch using 10/100 links. The ip addresses would be (i) the DHCP-assigned address for the w98 machine, and (ii) local addresses for the linux machines, such as 10.0.0.* Can I use SAMBA to turn the w98 box into a file-server and use the linux notebooks as SAMBA-clients? Any links to good how-to sites, cookbooks and the like would be greatly appreciated. Thanks, Joseph -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] UTF-8 problem when not using UTF-8, but Umlauts
On Sat, Mar 12, 2005 at 12:12:27PM +0100, Gerhard Strangar wrote: High, I'm running some Windows 9x Clients which don't use Unicode for SMB. It didn't cause any problems when using Samba 2, because the UNIX machines use ISO8859-1 and the Windows 9x use CP850 and no conversion was neccessary, German Umlauts like ä, ö, ü, Ä, Ö, Ü and ß were the same on UNIX and Windows. Now I'm trying to switch to Samba 3.0.11 and it doesn't work anymore. I tried dos charset = CP850 together with unix charset = ISO8859-1 as well as dos charset = ISO8859-1 together with unix charset = ISO8859-1. First I thought everything was okay, because the characters are diplaed correctly, but if a Windows 9x client tried to delete a file containing Umlauts or the ß, it fails and diplays the error message: File cannot be deleted. File system error (1026) When it tries to create such a file, it gets some completely different name. smbstatus says: init_iconv: Conversion from UTF-16LE to ISO8859-1 not supported init_iconv: Attempting to replace with conversion from UTF-16LE to ASCII The iconv library on this system is broken. What UNIX are you using ? Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba and Group Quotas
Question: Does Samba (3.0.11 and above) support the use of group quotas? I have set up quotas on my Linux box based on Linux groups. A given Linux group gets X GBs of space on a given volume V. Now, I want Windows XP users who map a share that a) belongs to their Linux group and b) that resides on volume V to see the reported total free space as being the number of GB allocated to the Linux group minus the total amount of space used by that group -- so that they can see when they (and other members of their group) about to hit their quota and run out of space. Important to note is that the files of a given Linux group will all reside within a single directory on the storage Volume. In other words, each high level directory on the storage volume belongs to a unique Linux group, and all the files inside that directory belong to the same Linux group. No files outside that high level directory, or inside any other high level directory, will belong to the same group. Right now, when a user maps a share that belongs to a Linux group with the quota, the user is seeing that the entire volume V is available. It is NOT an option to set quotas by individual users -- as individual users are members of more than one group. Any hints and suggestions would be appreciated. Andy Liebman -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba 3.0.12rc1 Available for Download
Gerald (Jerry) Carter schrieb: This is a release candidate of the Samba 3.0.12 code base and is provided for testing only. While close to the final stable release, this snapshot is *not* intended for production servers. If all goes well, this this version (or something very similar) will become the final 3.0.12 stable release. Compiled with cups. If defining printing = lprng print command = chmod 666 %s; name=`echo '%J' | sed s/^.*- //`; if [ $name = ]; then name=%s; fi; /usr/bin/lpr -P%p -J$name %s; rm %s lpq command = /usr/bin/lpq -P%p -L lprm command = /usr/bin/lprm -P%p %j lppause command = /usr/sbin/lpc hold %p %j lpresume command = /usr/sbin/lpc release %p %j queuepause command = /usr/sbin/lpc stop %p queueresume command = /usr/sbin/lpc start %p in [global] and not using 'printing = cups' in one of my printers the following messages are shown in log.smbd: [2005/03/12 19:26:24, 0] smbd/server.c:main(798) smbd version 3.0.12rc1 started. Copyright Andrew Tridgell and the Samba Team 1992-2004 [2005/03/12 19:26:24, 0] printing/print_cups.c:cups_cache_reload(85) Unable to connect to CUPS server localhost - Connection refused [2005/03/12 19:26:24, 0] printing/print_cups.c:cups_cache_reload(85) Unable to connect to CUPS server localhost - Connection refused I think it is better to discard this message, if cups is not used. There are many installations with cups linked samba and using other printing systems, because it is possible then to use which printing system ever (cups or an other one). der tom -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] UTF-8 problem when not using UTF-8, but Umlauts
On Sat, Mar 12, 2005 at 07:29:24PM +0100, Gerhard Strangar wrote: Jeremy Allison wrote: smbstatus says: init_iconv: Conversion from UTF-16LE to ISO8859-1 not supported init_iconv: Attempting to replace with conversion from UTF-16LE to ASCII The iconv library on this system is broken. What UNIX are you using ? Solaris 9 for 32-bit x86 It has a broken iconv library. Either replace it with GNU iconv, or use Linux on x86 (which has a working iconv library). Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] ERRnoaccess (Access denied.)
Hello, I have a fresh Samba 3.010 install (on host vdr). I have configure it as I do with my Samba 2.27 on another box (host called athlux). But the 3.010 will ask for a pathword if I try to access the host out of a WinME-box. I get a winpopup which will ask for password for \\VDR\IPC$. If I try to access the SAmba 2.27 host out of the same WinME-box it will work fine. I can see the shares and I can access them. What is the different between this two versions? What I have to configure? -- Don't panic -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] $B!Z$?$C$?(B3, 000$B1_$G!{!{K|(B$B1_2T$2$k!*. I am seeing this problem on my Mandrake 7.2, Mandrake 10.1 and Suse 9.0 boxes. It is not kernel or distro dependent: Linux Nemesis.rbpllc.com 2.2.19-4.1mdk #1 Mon Apr 9 10:34:05 MDT 2001 i686 unknown Linux bonza.rbpllc.com 2.6.8.1-12mdk #1 Fri Oct 1 12:53:41 CEST 2004 i686 AMD Athlon(tm) XP 2800+ unknown Linux skyline 2.4.21-199-default #1 Fri Mar 12 08:27:41 UTC 2004 i586 i586 i386 GNU/Linux # Global parameters [global] workgroup = RB_LAW server string = RB_LAW Samba Server %v encrypt passwords = Yes update encrypted = Yes smb passwd file = /etc/smbpasswd passwd program = /usr/bin/passwd %u passwd chat = *New*password* %n\n *new*password* %n\n *success* passwd chat debug = Yes unix password sync = Yes log file = /var/log/samba/log.%m max log size = 50 name resolve order = wins lmhosts hosts bcast socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 use sendfile = No logon script = %U.bat domain logons = Yes time server = yes os level = 34 preferred master = Yes domain master = Yes dns proxy = No wins support = Yes hosts allow = 192.168.7. localhost 66.76.63.120 load printers = yes printcap name = cups printing = cups [netlogon] comment = Rankin-Bertin logon services path = /home/samba/logon browseable = No [Rankin-Bertin] comment = Rankin-Bertin PLLC path = /home/samba/rbpllc valid users = @rbpllc force group = rbpllc admin users = david writeable = Yes map archive = Yes inherit permissions = Yes [guillory] comment = David Guillory path = /home/samba/guillory valid users = @guillory force group = guillory admin users = david map archive = Yes writeable = Yes inherit permissions = Yes [Bertin] comment = Darren Bertin path = /home/samba/bertin valid users = @bertin force group = bertin admin users = david map archive = Yes writeable = Yes inherit permissions = Yes [Rankin] comment = Rankin Law Firm PLLC path = /home/samba/rankin valid users = @rankin force group = rankin admin users = david writeable = Yes map archive = Yes inherit permissions = Yes [homes] comment = Homes Directory writeable = Yes browseable = No [Applications] comment = Windows Applications path = /home/samba/winapps valid users = @rbpllc,@guillory force group = rbpllc admin users = david writeable = Yes map archive = Yes inherit permissions = Yes [printers] comment = Rankin*Bertin Printers path = /var/spool/samba browseable = no public = yes guest ok = Yes writable = no printer admin = root, sys printable = Yes Any glaring errors that could explain the delay problem?? I'll try .12 and report back -- David C. Rankin, J.D., P.E. RANKIN LAW FIRM, PLLC 510 Ochiltree Street Nacogdoches, Texas 75961 (936) 715-9333 (936) 715-9339 fax www.rankinlawfirm.com -- - Original Message - From: Gerald (Jerry) Carter [EMAIL PROTECTED] To: david rankin [EMAIL PROTECTED] Cc: samba samba@lists.samba.org Sent: Saturday, March 12, 2005 8:52 AM Subject: Re: JT, Jerry, Chris, Andrew??? Anything new was:Re: [Samba] Extremely slow during browsing some directories -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 david rankin wrote: | John, Jerry, Chris and, yes you too Bartlett (mate): | |Have you thought any more about this problem?? It has been posted under: | Samba errors with smb QUERY_PATH_INFO,Error: STATUS_OBJECT_NAME_NOT_FOUND | | 3.0.7 - NT Create AndX Response, Error:, QUERY_PATH_INFO,Error: cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCMwIgIR7qMdg1EfYRAnaoAKC8+MbUbNJkUDqLkiboucucDcmMRACg11q/ SJ/37+99eSoqRzAubxaw/3I= =6lNz -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba r5764 - in branches/SAMBA_4_0/source: build/pidl librpc/ndr
Author: metze
Date: 2005-03-12 08:29:54 + (Sat, 12 Mar 2005)
New Revision: 5764
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5764
Log:
add support for embedded ref pointers
metze
Modified:
branches/SAMBA_4_0/source/build/pidl/ndr.pm
branches/SAMBA_4_0/source/build/pidl/validator.pm
branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/ndr.pm
===
--- branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-03-12 04:01:17 UTC (rev
5763)
+++ branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-03-12 08:29:54 UTC (rev
5764)
@@ -183,7 +183,7 @@
{
my $e = shift;
- return 0 if (util::has_property($e, ref));
+ return 0 if (util::has_property($e, ref) $e-{PARENT}-{TYPE} eq
FUNCTION);
return 1 if ($e-{POINTERS} || util::array_size($e));
return 0;
}
@@ -707,7 +707,9 @@
my $e = shift;
my $var_prefix = shift;
- if (util::has_property($e, relative)) {
+ if (util::has_property($e, ref)) {
+ pidl NDR_CHECK(ndr_push_ref_ptr(ndr, $var_prefix$e-{NAME}));;
+ } elsif (util::has_property($e, relative)) {
pidl NDR_CHECK(ndr_push_relative_ptr1(ndr,
$var_prefix$e-{NAME}));;
} else {
pidl NDR_CHECK(ndr_push_unique_ptr(ndr,
$var_prefix$e-{NAME}));;
@@ -855,7 +857,11 @@
my($e) = shift;
my($var_prefix) = shift;
- pidl NDR_CHECK(ndr_pull_unique_ptr(ndr, _ptr_$e-{NAME}));;
+ if (util::has_property($e, ref)) {
+ pidl NDR_CHECK(ndr_pull_ref_ptr(ndr, _ptr_$e-{NAME}));;
+ } else {
+ pidl NDR_CHECK(ndr_pull_unique_ptr(ndr, _ptr_$e-{NAME}));;
+ }
pidl if (_ptr_$e-{NAME}) {;
indent;
pidl NDR_ALLOC(ndr, $var_prefix$e-{NAME});;
@@ -1777,7 +1783,7 @@
if (util::array_size($e)) {
if (need_wire_pointer($e)) {
- pidl NDR_CHECK(ndr_push_unique_ptr(ndr,
r-$inout.$e-{NAME}));;
+ ParsePtrPush($e, r-$inout.);
pidl if (r-$inout.$e-{NAME}) {;
indent;
ParseArrayPush($e, ndr, r-$inout.,
NDR_SCALARS|NDR_BUFFERS);
Modified: branches/SAMBA_4_0/source/build/pidl/validator.pm
===
--- branches/SAMBA_4_0/source/build/pidl/validator.pm 2005-03-12 04:01:17 UTC
(rev 5763)
+++ branches/SAMBA_4_0/source/build/pidl/validator.pm 2005-03-12 08:29:54 UTC
(rev 5764)
@@ -88,10 +88,6 @@
my($struct) = shift;
foreach my $e (@{$struct-{ELEMENTS}}) {
- if (util::has_property($e, ref)) {
- fatal(el_name($e) . : embedded ref pointers are not
supported yet\n);
- }
-
$e-{PARENT} = $struct;
ValidElement($e);
}
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c2005-03-12 04:01:17 UTC
(rev 5763)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c2005-03-12 08:29:54 UTC
(rev 5764)
@@ -119,6 +119,18 @@
}
/*
+ parse a ref pointer referent identifier
+*/
+NTSTATUS ndr_pull_ref_ptr(struct ndr_pull *ndr, uint32_t *v)
+{
+ NTSTATUS status;
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, v));
+ /* ref pointers always point to data */
+ *v = 1;
+ return status;
+}
+
+/*
parse a udlong
*/
NTSTATUS ndr_pull_udlong(struct ndr_pull *ndr, int ndr_flags, uint64_t *v)
@@ -506,7 +518,7 @@
}
/*
- push a 1 if a pointer is non-NULL, otherwise 0
+ push a unique non-zero value if a pointer is non-NULL, otherwise 0
*/
NTSTATUS ndr_push_unique_ptr(struct ndr_push *ndr, const void *p)
{
@@ -518,6 +530,17 @@
return ndr_push_uint32(ndr, NDR_SCALARS, ptr);
}
+/*
+ push always a 0, if a pointer is NULL it's a fatal error
+*/
+NTSTATUS ndr_push_ref_ptr(struct ndr_push *ndr, const void *p)
+{
+ uint32_t ptr = 0;
+ if (p == NULL) {
+ return NT_STATUS_INVALID_PARAMETER_MIX;
+ }
+ return ndr_push_uint32(ndr, NDR_SCALARS, 0);
+}
/*
pull a general string from the wire
svn commit: samba r5765 - in branches/SAMBA_4_0/source/librpc/ndr: .
Author: metze
Date: 2005-03-12 08:51:37 + (Sat, 12 Mar 2005)
New Revision: 5765
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5765
Log:
remove unused var
metze
Modified:
branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c2005-03-12 08:29:54 UTC
(rev 5764)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c2005-03-12 08:51:37 UTC
(rev 5765)
@@ -535,7 +535,6 @@
*/
NTSTATUS ndr_push_ref_ptr(struct ndr_push *ndr, const void *p)
{
- uint32_t ptr = 0;
if (p == NULL) {
return NT_STATUS_INVALID_PARAMETER_MIX;
}
svn commit: samba r5766 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: metze
Date: 2005-03-12 09:25:39 + (Sat, 12 Mar 2005)
New Revision: 5766
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5766
Log:
get some more DsGetNCChanges stuff parsing correct
metze
Modified:
branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2005-03-12 08:51:37 UTC
(rev 5765)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2005-03-12 09:25:39 UTC
(rev 5766)
@@ -174,21 +174,101 @@
} drsuapi_DsGetNCChangesUsnTriple;
typedef struct {
+ GUID source_dsa_invocation_id;
+ hyper highest_usn;
+ } drsuapi_DsReplicaCoursor;
+
+ typedef struct {
+ uint32 u1;
+ uint32 u2;
+ [range(0,0x10)] uint32 count;
+ uint32 u3;
+ [size_is(count)] drsuapi_DsReplicaCoursor array[];
+ } drsuapi_DsReplicaCoursor05Ctr;
+
+ typedef struct {
GUID guid1;
GUID guid2;
- uint32 unknown1[20];
- drsuapi_DsReplicaSyncRequest1Info sync_req_info1;
- drsuapi_DsGetNCChangesUsnTriple usn;
+ [ref] drsuapi_DsReplicaSyncRequest1Info *sync_req_info1;
+ drsuapi_DsGetNCChangesUsnTriple usn1;
+ drsuapi_DsReplicaCoursor05Ctr *coursor;
+ uint32 unknown1;
+ uint32 unknown2;
+ uint32 unknown3;
+ uint32 unknown4;
+ hyper h1;
+ } drsuapi_DsGetNCChangesRequest5;
+
+ typedef [flag(NDR_PAHEX)] struct {
+ [range(0,1)] uint32 length;
+ [size_is(length)] uint8 *byte_array[];
+ } drsuapi_DsGetNCChangesRequest_Ctr14;
+
+ typedef struct {
+ uint32 unknown1;
+ drsuapi_DsGetNCChangesRequest_Ctr14 data;
+ } drsuapi_DsGetNCChangesRequest_Ctr13;
+
+ typedef struct {
+ [range(0,0x10)] uint32 count;
+ [size_is(count)] drsuapi_DsGetNCChangesRequest_Ctr13 *array[];
+ } drsuapi_DsGetNCChangesRequest_Ctr12;
+
+ typedef struct {
+ GUID guid1;
+ GUID guid2;
+ [ref] drsuapi_DsReplicaSyncRequest1Info *sync_req_info1;
+ drsuapi_DsGetNCChangesUsnTriple usn1;
+ drsuapi_DsReplicaCoursor05Ctr *coursor;
+ uint32 unknown1;
+ uint32 unknown2;
+ uint32 unknown3;
+ uint32 unknown4;
+ hyper h1;
+ uint32 unique_ptr1;
+ uint32 unique_ptr2;
+ drsuapi_DsGetNCChangesRequest_Ctr12 ctr12;
} drsuapi_DsGetNCChangesRequest8;
typedef [switch_type(int32)] union {
+ [case(5)] drsuapi_DsGetNCChangesRequest5 req5;
[case(8)] drsuapi_DsGetNCChangesRequest8 req8;
} drsuapi_DsGetNCChangesRequest;
typedef struct {
+ drsuapi_DsReplicaCoursor coursor;
+ NTTIME_1sec time1;
+ } drsuapi_DsReplicaCoursorEx;
+
+ typedef struct {
+ uint32 u1;
+ uint32 u2;
+ [range(0,0x10)] uint32 count;
+ uint32 u3;
+ [size_is(count)] drsuapi_DsReplicaCoursorEx array[];
+ } drsuapi_DsReplicaCoursorEx05Ctr;
+
+ typedef struct {
+ GUID guid1;
+ GUID guid2;
+ drsuapi_DsReplicaSyncRequest1Info *sync_req_info1;
+ drsuapi_DsGetNCChangesUsnTriple usn1;
+ drsuapi_DsGetNCChangesUsnTriple usn2;
+ drsuapi_DsReplicaCoursorEx05Ctr *coursor_ex;
+ drsuapi_DsGetNCChangesRequest_Ctr12 ctr12;
+ uint32 u1[3];
+ uint32 ptr1;
+ uint32 u2[3];
+ uint32 len1;
+ uint32 array_ptr1;
+ uint32 u3;
+ } drsuapi_DsGetNCChangesCtr6;
+
+ typedef struct {
} drsuapi_DsGetNCChangesCtr7;
typedef [switch_type(int32)] union {
+ [case(6)] drsuapi_DsGetNCChangesCtr6 ctr6;
[case(7)] drsuapi_DsGetNCChangesCtr7 ctr7;
} drsuapi_DsGetNCChangesCtr;
@@ -547,11 +627,6 @@
} drsuapi_DsReplicaNeighbourCtr;
typedef struct {
- GUID source_dsa_invocation_id;
- hyper highest_usn;
- } drsuapi_DsReplicaCoursor;
-
- typedef struct {
uint32 count;
uint32 reserved;
[size_is(count)] drsuapi_DsReplicaCoursor array[];
@@ -721,14 +796,6 @@
} drsuapi_DsReplicaConnection04Ctr;
typedef struct {
- uint32 u1;
- uint32 u2;
- [range(0,0x10)] uint32 count;
- uint32 u3;
- [size_is(count)]
svn commit: samba r5767 - in branches/SAMBA_3_0/source: passdb tdb
Author: vlendec
Date: 2005-03-12 09:49:23 + (Sat, 12 Mar 2005)
New Revision: 5767
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5767
Log:
Get rid of some compiler warnings
Modified:
branches/SAMBA_3_0/source/passdb/secrets.c
branches/SAMBA_3_0/source/tdb/tdbutil.c
Changeset:
Modified: branches/SAMBA_3_0/source/passdb/secrets.c
===
--- branches/SAMBA_3_0/source/passdb/secrets.c 2005-03-12 09:25:39 UTC (rev
5766)
+++ branches/SAMBA_3_0/source/passdb/secrets.c 2005-03-12 09:49:23 UTC (rev
5767)
@@ -84,13 +84,11 @@
*/
void *secrets_fetch(const char *key, size_t *size)
{
- TDB_DATA kbuf, dbuf;
+ TDB_DATA dbuf;
secrets_init();
if (!tdb)
return NULL;
- kbuf.dptr = (char *)key;
- kbuf.dsize = strlen(key);
- dbuf = tdb_fetch(tdb, kbuf);
+ dbuf = tdb_fetch(tdb, string_tdb_data(key));
if (size)
*size = dbuf.dsize;
return dbuf.dptr;
@@ -100,15 +98,11 @@
*/
BOOL secrets_store(const char *key, const void *data, size_t size)
{
- TDB_DATA kbuf, dbuf;
secrets_init();
if (!tdb)
return False;
- kbuf.dptr = (char *)key;
- kbuf.dsize = strlen(key);
- dbuf.dptr = (char *)data;
- dbuf.dsize = size;
- return tdb_store(tdb, kbuf, dbuf, TDB_REPLACE) == 0;
+ return tdb_store(tdb, string_tdb_data(key), make_tdb_data(data, size),
+TDB_REPLACE) == 0;
}
@@ -116,13 +110,10 @@
*/
BOOL secrets_delete(const char *key)
{
- TDB_DATA kbuf;
secrets_init();
if (!tdb)
return False;
- kbuf.dptr = (char *)key;
- kbuf.dsize = strlen(key);
- return tdb_delete(tdb, kbuf) == 0;
+ return tdb_delete(tdb, string_tdb_data(key)) == 0;
}
BOOL secrets_store_domain_sid(const char *domain, const DOM_SID *sid)
Modified: branches/SAMBA_3_0/source/tdb/tdbutil.c
===
--- branches/SAMBA_3_0/source/tdb/tdbutil.c 2005-03-12 09:25:39 UTC (rev
5766)
+++ branches/SAMBA_3_0/source/tdb/tdbutil.c 2005-03-12 09:49:23 UTC (rev
5767)
@@ -40,7 +40,7 @@
Make a TDB_DATA and keep the const warning in one place
/
-static TDB_DATA make_tdb_data(const char *dptr, size_t dsize)
+TDB_DATA make_tdb_data(const char *dptr, size_t dsize)
{
TDB_DATA ret;
ret.dptr = dptr;
@@ -48,6 +48,11 @@
return ret;
}
+TDB_DATA string_tdb_data(const char *string)
+{
+ return make_tdb_data(string, strlen(string));
+}
+
/
Lock a chain with timeout (in seconds).
/
svn commit: samba r5768 - in trunk/source: passdb tdb
Author: vlendec
Date: 2005-03-12 09:49:48 + (Sat, 12 Mar 2005)
New Revision: 5768
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5768
Log:
Get rid of some compiler warnings
Modified:
trunk/source/passdb/secrets.c
trunk/source/tdb/tdbutil.c
Changeset:
Modified: trunk/source/passdb/secrets.c
===
--- trunk/source/passdb/secrets.c 2005-03-12 09:49:23 UTC (rev 5767)
+++ trunk/source/passdb/secrets.c 2005-03-12 09:49:48 UTC (rev 5768)
@@ -84,13 +84,11 @@
*/
void *secrets_fetch(const char *key, size_t *size)
{
- TDB_DATA kbuf, dbuf;
+ TDB_DATA dbuf;
secrets_init();
if (!tdb)
return NULL;
- kbuf.dptr = (char *)key;
- kbuf.dsize = strlen(key);
- dbuf = tdb_fetch(tdb, kbuf);
+ dbuf = tdb_fetch(tdb, string_tdb_data(key));
if (size)
*size = dbuf.dsize;
return dbuf.dptr;
@@ -100,15 +98,11 @@
*/
BOOL secrets_store(const char *key, const void *data, size_t size)
{
- TDB_DATA kbuf, dbuf;
secrets_init();
if (!tdb)
return False;
- kbuf.dptr = (char *)key;
- kbuf.dsize = strlen(key);
- dbuf.dptr = (char *)data;
- dbuf.dsize = size;
- return tdb_store(tdb, kbuf, dbuf, TDB_REPLACE) == 0;
+ return tdb_store(tdb, string_tdb_data(key), make_tdb_data(data, size),
+TDB_REPLACE) == 0;
}
@@ -116,13 +110,10 @@
*/
BOOL secrets_delete(const char *key)
{
- TDB_DATA kbuf;
secrets_init();
if (!tdb)
return False;
- kbuf.dptr = (char *)key;
- kbuf.dsize = strlen(key);
- return tdb_delete(tdb, kbuf) == 0;
+ return tdb_delete(tdb, string_tdb_data(key)) == 0;
}
BOOL secrets_store_domain_sid(const char *domain, const DOM_SID *sid)
Modified: trunk/source/tdb/tdbutil.c
===
--- trunk/source/tdb/tdbutil.c 2005-03-12 09:49:23 UTC (rev 5767)
+++ trunk/source/tdb/tdbutil.c 2005-03-12 09:49:48 UTC (rev 5768)
@@ -40,7 +40,7 @@
Make a TDB_DATA and keep the const warning in one place
/
-static TDB_DATA make_tdb_data(const char *dptr, size_t dsize)
+TDB_DATA make_tdb_data(const char *dptr, size_t dsize)
{
TDB_DATA ret;
ret.dptr = dptr;
@@ -48,6 +48,11 @@
return ret;
}
+TDB_DATA string_tdb_data(const char *string)
+{
+ return make_tdb_data(string, strlen(string));
+}
+
/
Lock a chain with timeout (in seconds).
/
svn commit: samba r5769 - in branches/SAMBA_4_0/source/lib/ldb/modules: .
Author: tpot
Date: 2005-03-12 09:55:08 + (Sat, 12 Mar 2005)
New Revision: 5769
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5769
Log:
Fix unused variable warning.
Modified:
branches/SAMBA_4_0/source/lib/ldb/modules/timestamps.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/timestamps.c
===
--- branches/SAMBA_4_0/source/lib/ldb/modules/timestamps.c 2005-03-12
09:49:48 UTC (rev 5768)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/timestamps.c 2005-03-12
09:55:08 UTC (rev 5769)
@@ -247,7 +247,7 @@
static int timestamps_destructor(void *module_ctx)
{
- struct ldb_module *ctx = module_ctx;
+ /* struct ldb_module *ctx = module_ctx; */
/* put your clean-up functions here */
return 0;
}
svn commit: samba r5770 - in branches/SAMBA_3_0/source/printing: .
Author: vlendec
Date: 2005-03-12 09:58:35 + (Sat, 12 Mar 2005)
New Revision: 5770
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5770
Log:
Get rid of some compiler warnings
Modified:
branches/SAMBA_3_0/source/printing/printing.c
Changeset:
Modified: branches/SAMBA_3_0/source/printing/printing.c
===
--- branches/SAMBA_3_0/source/printing/printing.c 2005-03-12 09:55:08 UTC
(rev 5769)
+++ branches/SAMBA_3_0/source/printing/printing.c 2005-03-12 09:58:35 UTC
(rev 5770)
@@ -907,7 +907,7 @@
static void store_queue_struct(struct tdb_print_db *pdb, struct
traverse_struct *pts)
{
- TDB_DATA data, key;
+ TDB_DATA data;
int max_reported_jobs = lp_max_reported_jobs(pts-snum);
print_queue_struct *queue = pts-queue;
size_t len;
@@ -951,22 +951,19 @@
queue[i].fs_file);
}
- key.dptr = INFO/linear_queue_array;
- key.dsize = strlen(key.dptr);
- tdb_store(pdb-tdb, key, data, TDB_REPLACE);
+ tdb_store(pdb-tdb, string_tdb_data(INFO/linear_queue_array), data,
+ TDB_REPLACE);
SAFE_FREE(data.dptr);
return;
}
static TDB_DATA get_jobs_changed_data(struct tdb_print_db *pdb)
{
- TDB_DATA data, key;
+ TDB_DATA data;
- key.dptr = INFO/jobs_changed;
- key.dsize = strlen(key.dptr);
ZERO_STRUCT(data);
- data = tdb_fetch(pdb-tdb, key);
+ data = tdb_fetch(pdb-tdb, string_tdb_data(INFO/jobs_changed));
if (data.dptr == NULL || data.dsize == 0 || (data.dsize % 4 != 0)) {
SAFE_FREE(data.dptr);
ZERO_STRUCT(data);
@@ -1736,11 +1733,11 @@
BOOL ret = False;
BOOL gotlock = False;
- key.dptr = INFO/jobs_changed;
- key.dsize = strlen(key.dptr);
ZERO_STRUCT(data);
- if (tdb_chainlock_with_timeout(pdb-tdb, key, 5) == -1)
+ if (tdb_chainlock_with_timeout(pdb-tdb,
+ string_tdb_data(INFO/jobs_changed),
+ 5) == -1)
goto out;
gotlock = True;
@@ -2057,7 +2054,7 @@
static int get_queue_status(const char* sharename, print_status_struct *status)
{
fstring keystr;
- TDB_DATA data, key;
+ TDB_DATA data;
struct tdb_print_db *pdb = get_print_db_byname(sharename);
int len;
@@ -2066,10 +2063,8 @@
if (status) {
ZERO_STRUCTP(status);
- slprintf(keystr, sizeof(keystr)-1, STATUS/%s, sharename);
- key.dptr = keystr;
- key.dsize = strlen(keystr);
- data = tdb_fetch(pdb-tdb, key);
+ fstr_sprintf(keystr, STATUS/%s, sharename);
+ data = tdb_fetch(pdb-tdb, string_tdb_data(keystr));
if (data.dptr) {
if (data.dsize == sizeof(print_status_struct))
/* this memcpy is ok since the status struct
was
@@ -2179,18 +2174,17 @@
static BOOL add_to_jobs_changed(struct tdb_print_db *pdb, uint32 jobid)
{
- TDB_DATA data, key;
+ TDB_DATA data;
uint32 store_jobid;
- key.dptr = INFO/jobs_changed;
- key.dsize = strlen(key.dptr);
SIVAL(store_jobid, 0, jobid);
data.dptr = (char *)store_jobid;
data.dsize = 4;
DEBUG(10,(add_to_jobs_changed: Added jobid %u\n, (unsigned int)jobid
));
- return (tdb_append(pdb-tdb, key, data) == 0);
+ return (tdb_append(pdb-tdb, string_tdb_data(INFO/jobs_changed),
+ data) == 0);
}
/***
@@ -2429,7 +2423,7 @@
static BOOL get_stored_queue_info(struct tdb_print_db *pdb, int snum, int
*pcount, print_queue_struct **ppqueue)
{
- TDB_DATA data, key, cgdata;
+ TDB_DATA data, cgdata;
print_queue_struct *queue = NULL;
uint32 qcount = 0;
uint32 extra_count = 0;
@@ -2449,20 +2443,15 @@
ZERO_STRUCT(data);
ZERO_STRUCT(cgdata);
- key.dptr = INFO/linear_queue_array;
- key.dsize = strlen(key.dptr);
/* Get the stored queue data. */
- data = tdb_fetch(pdb-tdb, key);
+ data = tdb_fetch(pdb-tdb, string_tdb_data(INFO/linear_queue_array));
if (data.dptr data.dsize = sizeof(qcount))
len += tdb_unpack(data.dptr + len, data.dsize - len, d,
qcount);
/* Get the changed jobs list. */
- key.dptr = INFO/jobs_changed;
- key.dsize = strlen(key.dptr);
-
- cgdata = tdb_fetch(pdb-tdb, key);
+ cgdata = tdb_fetch(pdb-tdb, string_tdb_data(INFO/jobs_changed));
if (cgdata.dptr != NULL (cgdata.dsize % 4 == 0))
extra_count = cgdata.dsize/4;
svn commit: samba r5771 - in trunk/source/printing: .
Author: vlendec
Date: 2005-03-12 09:59:13 + (Sat, 12 Mar 2005)
New Revision: 5771
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5771
Log:
Get rid of some compiler warnings
Modified:
trunk/source/printing/printing.c
Changeset:
Modified: trunk/source/printing/printing.c
===
--- trunk/source/printing/printing.c2005-03-12 09:58:35 UTC (rev 5770)
+++ trunk/source/printing/printing.c2005-03-12 09:59:13 UTC (rev 5771)
@@ -907,7 +907,7 @@
static void store_queue_struct(struct tdb_print_db *pdb, struct
traverse_struct *pts)
{
- TDB_DATA data, key;
+ TDB_DATA data;
int max_reported_jobs = lp_max_reported_jobs(pts-snum);
print_queue_struct *queue = pts-queue;
size_t len;
@@ -951,22 +951,19 @@
queue[i].fs_file);
}
- key.dptr = INFO/linear_queue_array;
- key.dsize = strlen(key.dptr);
- tdb_store(pdb-tdb, key, data, TDB_REPLACE);
+ tdb_store(pdb-tdb, string_tdb_data(INFO/linear_queue_array), data,
+ TDB_REPLACE);
SAFE_FREE(data.dptr);
return;
}
static TDB_DATA get_jobs_changed_data(struct tdb_print_db *pdb)
{
- TDB_DATA data, key;
+ TDB_DATA data;
- key.dptr = INFO/jobs_changed;
- key.dsize = strlen(key.dptr);
ZERO_STRUCT(data);
- data = tdb_fetch(pdb-tdb, key);
+ data = tdb_fetch(pdb-tdb, string_tdb_data(INFO/jobs_changed));
if (data.dptr == NULL || data.dsize == 0 || (data.dsize % 4 != 0)) {
SAFE_FREE(data.dptr);
ZERO_STRUCT(data);
@@ -1736,11 +1733,11 @@
BOOL ret = False;
BOOL gotlock = False;
- key.dptr = INFO/jobs_changed;
- key.dsize = strlen(key.dptr);
ZERO_STRUCT(data);
- if (tdb_chainlock_with_timeout(pdb-tdb, key, 5) == -1)
+ if (tdb_chainlock_with_timeout(pdb-tdb,
+ string_tdb_data(INFO/jobs_changed),
+ 5) == -1)
goto out;
gotlock = True;
@@ -2057,7 +2054,7 @@
static int get_queue_status(const char* sharename, print_status_struct *status)
{
fstring keystr;
- TDB_DATA data, key;
+ TDB_DATA data;
struct tdb_print_db *pdb = get_print_db_byname(sharename);
int len;
@@ -2066,10 +2063,8 @@
if (status) {
ZERO_STRUCTP(status);
- slprintf(keystr, sizeof(keystr)-1, STATUS/%s, sharename);
- key.dptr = keystr;
- key.dsize = strlen(keystr);
- data = tdb_fetch(pdb-tdb, key);
+ fstr_sprintf(keystr, STATUS/%s, sharename);
+ data = tdb_fetch(pdb-tdb, string_tdb_data(keystr));
if (data.dptr) {
if (data.dsize == sizeof(print_status_struct))
/* this memcpy is ok since the status struct
was
@@ -2179,18 +2174,17 @@
static BOOL add_to_jobs_changed(struct tdb_print_db *pdb, uint32 jobid)
{
- TDB_DATA data, key;
+ TDB_DATA data;
uint32 store_jobid;
- key.dptr = INFO/jobs_changed;
- key.dsize = strlen(key.dptr);
SIVAL(store_jobid, 0, jobid);
data.dptr = (char *)store_jobid;
data.dsize = 4;
DEBUG(10,(add_to_jobs_changed: Added jobid %u\n, (unsigned int)jobid
));
- return (tdb_append(pdb-tdb, key, data) == 0);
+ return (tdb_append(pdb-tdb, string_tdb_data(INFO/jobs_changed),
+ data) == 0);
}
/***
@@ -2429,7 +2423,7 @@
static BOOL get_stored_queue_info(struct tdb_print_db *pdb, int snum, int
*pcount, print_queue_struct **ppqueue)
{
- TDB_DATA data, key, cgdata;
+ TDB_DATA data, cgdata;
print_queue_struct *queue = NULL;
uint32 qcount = 0;
uint32 extra_count = 0;
@@ -2449,20 +2443,15 @@
ZERO_STRUCT(data);
ZERO_STRUCT(cgdata);
- key.dptr = INFO/linear_queue_array;
- key.dsize = strlen(key.dptr);
/* Get the stored queue data. */
- data = tdb_fetch(pdb-tdb, key);
+ data = tdb_fetch(pdb-tdb, string_tdb_data(INFO/linear_queue_array));
if (data.dptr data.dsize = sizeof(qcount))
len += tdb_unpack(data.dptr + len, data.dsize - len, d,
qcount);
/* Get the changed jobs list. */
- key.dptr = INFO/jobs_changed;
- key.dsize = strlen(key.dptr);
-
- cgdata = tdb_fetch(pdb-tdb, key);
+ cgdata = tdb_fetch(pdb-tdb, string_tdb_data(INFO/jobs_changed));
if (cgdata.dptr != NULL (cgdata.dsize % 4 == 0))
extra_count = cgdata.dsize/4;
svn commit: samba r5772 - in trunk/source/printing: .
Author: vlendec
Date: 2005-03-12 10:41:26 + (Sat, 12 Mar 2005)
New Revision: 5772
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5772
Log:
Fix two memleaks
Modified:
trunk/source/printing/printerdb_file.c
Changeset:
Modified: trunk/source/printing/printerdb_file.c
===
--- trunk/source/printing/printerdb_file.c 2005-03-12 09:59:13 UTC (rev
5771)
+++ trunk/source/printing/printerdb_file.c 2005-03-12 10:41:26 UTC (rev
5772)
@@ -761,29 +761,24 @@
prs_struct ps;
WERROR result = WERR_OK;
- if (asprintf(filename, %s/%s/%s, file_root, SECDESC_PREFIX,
printername) 0)
+ filename = talloc_asprintf(mem_ctx, %s/%s/%s, file_root,
+ SECDESC_PREFIX, printername);
+
+ if (filename == NULL)
return WERR_NOMEM;
- if (!read_complete_file(mem_ctx, filename, buf, len)) {
- result = WERR_INVALID_SECURITY_DESCRIPTOR;
- goto done;
- }
+ if (!read_complete_file(mem_ctx, filename, buf, len))
+ return WERR_INVALID_SECURITY_DESCRIPTOR;
- if (!prs_init(ps, 0, mem_ctx, UNMARSHALL)) {
- result = WERR_NOMEM;
- goto done;
- }
+ if (!prs_init(ps, 0, mem_ctx, UNMARSHALL))
+ return WERR_NOMEM;
prs_give_memory(ps, buf, len, True);
- if (!sec_io_desc_buf(file_get_secdesc, secdesc_ctr, ps, 1)) {
- result = WERR_NOMEM;
- goto done;
- }
+ result = sec_io_desc_buf(file_get_secdesc, secdesc_ctr, ps, 1) ?
+ WERR_OK : WERR_NOMEM;
-done:
- if (ps)
- prs_mem_free(ps);
+ prs_mem_free(ps);
return result;
}
@@ -793,7 +788,10 @@
char *filename;
WERROR result = WERR_OK;
- if (asprintf(filename, %s/%s/%s, file_root, SECDESC_PREFIX,
printername) 0)
+ filename = talloc_asprintf(mem_ctx, %s/%s/%s, file_root,
+ SECDESC_PREFIX, printername);
+
+ if (filename == NULL)
return WERR_NOMEM;
prs_init(ps, (uint32)sec_desc_size(secdesc_ctr-sec) +
@@ -811,9 +809,7 @@
}
done:
- if (ps)
- prs_mem_free(ps);
-
+ prs_mem_free(ps);
return result;
}
svn commit: samba r5773 - in trunk/source/printing: .
Author: gd
Date: 2005-03-12 15:08:07 + (Sat, 12 Mar 2005)
New Revision: 5773
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5773
Log:
give a form a name in file_get_forms().
Guenther
Modified:
trunk/source/printing/printerdb_file.c
Changeset:
Modified: trunk/source/printing/printerdb_file.c
===
--- trunk/source/printing/printerdb_file.c 2005-03-12 10:41:26 UTC (rev
5772)
+++ trunk/source/printing/printerdb_file.c 2005-03-12 15:08:07 UTC (rev
5773)
@@ -417,6 +417,8 @@
form.right, form.bottom) 0)
goto done;
+ fstrcpy(form.name, temp_list-file);
+
tl = SMB_REALLOC_ARRAY(*list, nt_forms_struct, n+1);
if (!tl) {
DEBUG(0,(file_get_forms: Realloc fail.\n));
@@ -688,6 +690,8 @@
driver.monitorname,
driver.defaultdatatype);
+ /* missing dependentfiles */
+
*info_ptr = (NT_PRINTER_DRIVER_INFO_LEVEL_3 *)memdup(driver,
sizeof(driver));
result = WERR_OK;
svn commit: samba r5774 - in trunk/source/printing: .
Author: gd
Date: 2005-03-12 15:40:26 + (Sat, 12 Mar 2005)
New Revision: 5774
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5774
Log:
Fix file_get_c_setprinter().
Guenther
Modified:
trunk/source/printing/printerdb_file.c
Changeset:
Modified: trunk/source/printing/printerdb_file.c
===
--- trunk/source/printing/printerdb_file.c 2005-03-12 15:08:07 UTC (rev
5773)
+++ trunk/source/printing/printerdb_file.c 2005-03-12 15:40:26 UTC (rev
5774)
@@ -35,15 +35,16 @@
char *file;
};
-static BOOL file_find(TALLOC_CTX *mem_ctx, struct file_list **list,
- const char *directory)
+static BOOL file_find(TALLOC_CTX *mem_ctx, const char *directory,
+ struct file_list **list, int *num_files)
{
DIR *dir;
struct file_list *entry;
char *path, *filename;
const char *dname;
- int num_files = 0;
+ *num_files = 0;
+
*list = TALLOC_ZERO_P(mem_ctx, struct file_list);
if (*list == NULL)
return False;
@@ -75,15 +76,15 @@
entry-file = filename;
DLIST_ADD(*list, entry);
- ++num_files;
+ ++(*num_files);
}
closedir(dir);
- if (num_files == 0)
+ if (*num_files == 0)
return False;
- DEBUG(0,(found: %d files\n, num_files));
+ DEBUG(0,(found: %d files\n, *num_files));
return True;
}
@@ -339,12 +340,13 @@
uint32 file_update_c_setprinter(BOOL initialize)
{
TALLOC_CTX *mem_ctx = talloc_init(file_update_c_setprinter);
- char *filename;
+ char *filename, *printerdir;
int len;
uint8_t *buf;
uint32 result = 0;
uint32 c_setprinter;
- uint32 printer_count = 23;
+ uint32 printer_count = 0;
+ struct file_list *file_list;
if (mem_ctx == NULL)
goto done;
@@ -354,8 +356,16 @@
if (filename == NULL)
goto done;
- /* FIXME */
+ printerdir = talloc_asprintf(mem_ctx, %s/%s, file_root,
PRINTERS_PREFIX);
+ if (printerdir == NULL)
+ goto done;
+
+ file_list = NULL;
+
+ if (!file_find(mem_ctx, printerdir, file_list, printer_count))
+ goto done;
+
if (!initialize)
c_setprinter = file_get_c_setprinter() + printer_count;
else
@@ -388,6 +398,7 @@
int i;
int n = 0;
char *dirname;
+ int num_files;
struct file_list *file_list, *temp_list;
if (mem_ctx == NULL)
@@ -399,7 +410,7 @@
file_list = NULL;
- if (!file_find(mem_ctx, file_list, dirname))
+ if (!file_find(mem_ctx, dirname, file_list, num_files))
goto done;
for (temp_list = file_list; temp_list; temp_list = temp_list-next) {
@@ -433,7 +444,6 @@
if (mem_ctx != NULL)
talloc_destroy(mem_ctx);
- DEBUG(0,(file_get_forms: found %d forms\n, n));
return n;
}
@@ -545,6 +555,7 @@
struct file_list *file_list, *temp_list;
int n = 0;
fstring *loc_list;
+ int num_files;
/* never return -1 */
@@ -563,7 +574,7 @@
file_list = NULL;
- if (!file_find(mem_ctx, file_list, filename)) {
+ if (!file_find(mem_ctx, filename, file_list, num_files)) {
goto done;
}
svn commit: samba r5775 - in branches/SAMBA_4_0/source: build/pidl lib/com/dcom libnet librpc/idl librpc/ndr torture/rpc
Author: jelmer
Date: 2005-03-12 17:12:52 + (Sat, 12 Mar 2005)
New Revision: 5775
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5775
Log:
Remove some unused functions (unions are no longer as special as they used to
be)
Add oxid mapping table support in DCOM
Modified:
branches/SAMBA_4_0/source/build/pidl/ndr.pm
branches/SAMBA_4_0/source/lib/com/dcom/main.c
branches/SAMBA_4_0/source/libnet/userinfo.c
branches/SAMBA_4_0/source/librpc/idl/winreg.idl
branches/SAMBA_4_0/source/librpc/ndr/libndr.h
branches/SAMBA_4_0/source/librpc/ndr/ndr.c
branches/SAMBA_4_0/source/torture/rpc/oxidresolve.c
branches/SAMBA_4_0/source/torture/rpc/remact.c
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/ndr.pm
===
--- branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-03-12 15:40:26 UTC (rev
5774)
+++ branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-03-12 17:12:52 UTC (rev
5775)
@@ -549,7 +549,7 @@
my $size = $length;
if (is_conformant_array($e)) {
- $size = ndr_get_array_size($ndr, $var_prefix$e-{NAME});
+ $length = $size = ndr_get_array_size($ndr,
$var_prefix$e-{NAME});
}
# if this is a conformant array then we use that size to allocate, and
make sure
Modified: branches/SAMBA_4_0/source/lib/com/dcom/main.c
===
--- branches/SAMBA_4_0/source/lib/com/dcom/main.c 2005-03-12 15:40:26 UTC
(rev 5774)
+++ branches/SAMBA_4_0/source/lib/com/dcom/main.c 2005-03-12 17:12:52 UTC
(rev 5775)
@@ -119,7 +119,14 @@
struct dcom_object_exporter *object_exporter_by_oxid(struct com_context *ctx,
uint64_t oxid)
{
- return NULL; /* FIXME */
+ struct dcom_object_exporter *ox;
+ for (ox = ctx-dcom-object_exporters; ox; ox = ox-next) {
+ if (ox-oxid == oxid) {
+ return ox;
+ }
+ }
+
+ return NULL;
}
struct dcom_object_exporter *object_exporter_by_ip(struct com_context *ctx,
struct IUnknown *ip)
Modified: branches/SAMBA_4_0/source/libnet/userinfo.c
===
--- branches/SAMBA_4_0/source/libnet/userinfo.c 2005-03-12 15:40:26 UTC (rev
5774)
+++ branches/SAMBA_4_0/source/libnet/userinfo.c 2005-03-12 17:12:52 UTC (rev
5775)
@@ -183,6 +183,7 @@
failure:
talloc_free(c);
+ return NULL;
}
Modified: branches/SAMBA_4_0/source/librpc/idl/winreg.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2005-03-12 15:40:26 UTC
(rev 5774)
+++ branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2005-03-12 17:12:52 UTC
(rev 5775)
@@ -4,7 +4,8 @@
winreg interface definition
*/
-[ uuid(338cd001-2244-31f1--900038001003),
+[
+ uuid(338cd001-2244-31f1--900038001003),
version(1.0),
endpoint(ncacn_np:[\\pipe\\winreg],ncacn_ip_tcp:,ncalrpc:),
pointer_default(unique),
Modified: branches/SAMBA_4_0/source/librpc/ndr/libndr.h
===
--- branches/SAMBA_4_0/source/librpc/ndr/libndr.h 2005-03-12 15:40:26 UTC
(rev 5774)
+++ branches/SAMBA_4_0/source/librpc/ndr/libndr.h 2005-03-12 17:12:52 UTC
(rev 5775)
@@ -137,7 +137,6 @@
/* useful macro for debugging */
#define NDR_PRINT_DEBUG(type, p) ndr_print_debug((ndr_print_fn_t)ndr_print_
##type, #p, p)
-#define NDR_PRINT_UNION_DEBUG(type, level, p)
ndr_print_union_debug((ndr_print_union_fn_t)ndr_print_ ##type, #p, level, p)
#define NDR_PRINT_FUNCTION_DEBUG(type, flags, p)
ndr_print_function_debug((ndr_print_function_t)ndr_print_ ##type, #type, flags,
p)
#define NDR_PRINT_BOTH_DEBUG(type, p) NDR_PRINT_FUNCTION_DEBUG(type, NDR_BOTH,
p)
#define NDR_PRINT_OUT_DEBUG(type, p) NDR_PRINT_FUNCTION_DEBUG(type, NDR_OUT, p)
@@ -242,8 +241,6 @@
typedef NTSTATUS (*ndr_push_flags_fn_t)(struct ndr_push *, int ndr_flags, void
*);
typedef NTSTATUS (*ndr_push_const_fn_t)(struct ndr_push *, int ndr_flags,
const void *);
typedef NTSTATUS (*ndr_pull_flags_fn_t)(struct ndr_pull *, int ndr_flags, void
*);
-typedef NTSTATUS (*ndr_push_union_fn_t)(struct ndr_push *, int ndr_flags,
uint32_t, void *);
-typedef NTSTATUS (*ndr_pull_union_fn_t)(struct ndr_pull *, int ndr_flags,
uint32_t, void *);
typedef void (*ndr_print_fn_t)(struct ndr_print *, const char *, void *);
typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int,
void *);
typedef void (*ndr_print_union_fn_t)(struct ndr_print *, const char *,
uint32_t, void *);
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr.c 2005-03-12 15:40:26 UTC (rev
5774)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr.c 2005-03-12 17:12:52 UTC (rev
5775)
@@
svn commit: samba r5776 - branches/SAMBA_3_0/source/utils trunk/source/utils
Author: gd Date: 2005-03-12 18:03:54 + (Sat, 12 Mar 2005) New Revision: 5776 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5776 Log: Fix typo (found by lieschen). Guenther Modified: branches/SAMBA_3_0/source/utils/net_help.c trunk/source/utils/net_help.c Changeset: Modified: branches/SAMBA_3_0/source/utils/net_help.c === --- branches/SAMBA_3_0/source/utils/net_help.c 2005-03-12 17:12:52 UTC (rev 5775) +++ branches/SAMBA_3_0/source/utils/net_help.c 2005-03-12 18:03:54 UTC (rev 5776) @@ -152,7 +152,7 @@ \t-M or --maxusers=num\t\tmax users allowed for share\n \t --acls\t\t\tcopies ACLs as well\n \t --attrs\t\t\tcopies DOS Attributes as well\n -\t --timestampes\t\tpreserve timestampes while copying files\n +\t --timestamps\t\tpreserve timestamps while copying files\n \t --destination\t\tmigration target server (default: localhost)\n \t-e or --exclude\t\t\tlist of shares to be excluded from mirroring\n \t-v or --verbose\t\t\tgive verbose output\n); Modified: trunk/source/utils/net_help.c === --- trunk/source/utils/net_help.c 2005-03-12 17:12:52 UTC (rev 5775) +++ trunk/source/utils/net_help.c 2005-03-12 18:03:54 UTC (rev 5776) @@ -150,7 +150,7 @@ \t-M or --maxusers=num\t\tmax users allowed for share\n \t --acls\t\t\tcopies ACLs as well\n \t --attrs\t\t\tcopies DOS Attributes as well\n -\t --timestampes\t\tpreserve timestampes while copying files\n +\t --timestamps\t\tpreserve timestamps while copying files\n \t --destination\t\tmigration target server (default: localhost)\n \t-e or --exclude\t\t\tlist of shares to be excluded from mirroring\n \t-v or --verbose\t\t\tgive verbose output\n);
svn commit: samba-docs r408 - in trunk: . Samba-Developers-Guide Samba-Guide manpages
Author: jelmer Date: 2005-03-12 19:33:59 + (Sat, 12 Mar 2005) New Revision: 408 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=408 Log: Use the Samba Variant of the DocBook DTD rather then the original one. Entities are now in samba-web/, so remove them from here. Removed: trunk/entities/ Modified: trunk/Makefile trunk/Samba-Developers-Guide/CodingSuggestions.xml trunk/Samba-Developers-Guide/NetBIOS.xml trunk/Samba-Developers-Guide/Tracing.xml trunk/Samba-Developers-Guide/architecture.xml trunk/Samba-Developers-Guide/cifsntdomain.xml trunk/Samba-Developers-Guide/contributing.xml trunk/Samba-Developers-Guide/debug.xml trunk/Samba-Developers-Guide/encryption.xml trunk/Samba-Developers-Guide/gencache.xml trunk/Samba-Developers-Guide/internals.xml trunk/Samba-Developers-Guide/modules.xml trunk/Samba-Developers-Guide/packagers.xml trunk/Samba-Developers-Guide/parsing.xml trunk/Samba-Developers-Guide/printing.xml trunk/Samba-Developers-Guide/registry.xml trunk/Samba-Developers-Guide/rpc_plugin.xml trunk/Samba-Developers-Guide/unix-smb.xml trunk/Samba-Developers-Guide/vfs.xml trunk/Samba-Developers-Guide/windows-debug.xml trunk/Samba-Developers-Guide/wins.xml trunk/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml trunk/Samba-Guide/Chap02-SimpleOfficeServer.xml trunk/Samba-Guide/Chap03-TheSmallOffice.xml trunk/Samba-Guide/Chap04-SecureOfficeServer.xml trunk/Samba-Guide/Chap05-500UserNetwork.xml trunk/Samba-Guide/Chap06-MakingHappyUsers.xml trunk/Samba-Guide/Chap07-2000UserNetwork.xml trunk/Samba-Guide/Chap08-MigrateNT4Samba3.xml trunk/Samba-Guide/Chap08b-MigrateNW4Samba3.xml trunk/Samba-Guide/Chap09-AddingUNIXClients.xml trunk/Samba-Guide/Chap10-KerberosFastStart.xml trunk/Samba-Guide/Chap10b-DomainAppsSupport.xml trunk/Samba-Guide/Chap11-HighAvailability.xml trunk/Samba-Guide/Chap12-Appendix.xml trunk/Samba-Guide/acknowledgements.xml trunk/Samba-Guide/conventions.xml trunk/Samba-Guide/foreword.xml trunk/Samba-Guide/front-matter.xml trunk/Samba-Guide/glossary.xml trunk/Samba-Guide/gpl.xml trunk/Samba-Guide/inside-cover.xml trunk/Samba-Guide/preface.xml trunk/manpages/editreg.1.xml trunk/manpages/findsmb.1.xml trunk/manpages/lmhosts.5.xml trunk/manpages/log2pcap.1.xml trunk/manpages/mount.cifs.8.xml trunk/manpages/net.8.xml trunk/manpages/nmbd.8.xml trunk/manpages/nmblookup.1.xml trunk/manpages/ntlm_auth.1.xml trunk/manpages/pam_winbind.8.xml trunk/manpages/pdbedit.8.xml trunk/manpages/profiles.1.xml trunk/manpages/rpcclient.1.xml trunk/manpages/samba.7.xml trunk/manpages/smbcacls.1.xml trunk/manpages/smbclient.1.xml trunk/manpages/smbcontrol.1.xml trunk/manpages/smbcquotas.1.xml trunk/manpages/smbd.8.xml trunk/manpages/smbget.1.xml trunk/manpages/smbgetrc.5.xml trunk/manpages/smbmnt.8.xml trunk/manpages/smbmount.8.xml trunk/manpages/smbpasswd.5.xml trunk/manpages/smbpasswd.8.xml trunk/manpages/smbsh.1.xml trunk/manpages/smbspool.8.xml trunk/manpages/smbstatus.1.xml trunk/manpages/smbtar.1.xml trunk/manpages/smbtree.1.xml trunk/manpages/smbumount.8.xml trunk/manpages/swat.8.xml trunk/manpages/tdbbackup.8.xml trunk/manpages/tdbdump.8.xml trunk/manpages/testparm.1.xml trunk/manpages/testprns.1.xml trunk/manpages/vfstest.1.xml trunk/manpages/wbinfo.1.xml trunk/manpages/winbindd.8.xml Changeset: Sorry, the patch is too large (1357 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=408
svn commit: samba-web r574 - in trunk/DTD: .
Author: jelmer Date: 2005-03-12 21:55:51 + (Sat, 12 Mar 2005) New Revision: 574 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=574 Log: Update definition of smbconfoption element Modified: trunk/DTD/samba-doc Changeset: Modified: trunk/DTD/samba-doc === --- trunk/DTD/samba-doc 2005-03-11 22:14:37 UTC (rev 573) +++ trunk/DTD/samba-doc 2005-03-12 21:55:51 UTC (rev 574) @@ -3,6 +3,8 @@ Samba extensions to DocBook PUBLIC identifier: -//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN URL: http://www.samba.org/samba/DTD/samba-doc + + Copyright (C) Jelmer Vernooij 2003-2005 -- !ENTITY % DocBookDTD @@ -24,6 +26,8 @@ !ELEMENT smbconfcomment (#PCDATA) !ELEMENT smbconfsection (#PCDATA) !ELEMENT smbconfoption (#PCDATA) +!ATTLIST smbconfoption + name CDATA #REQUIRED !ELEMENT ntgroup (#PCDATA) !ELEMENT ntuser (#PCDATA) !ELEMENT image (imagedescription?,imagefile) @@ -32,10 +36,9 @@ !ELEMENT imagefile (#PCDATA) !ATTLIST imagefile scale CDATA #IMPLIED !-- -Already defined in DocBook standard.. -!ELEMENT parameterlist (parameter) -!ELEMENT parameter (description,related*,value*) -!ATTLIST parameter +!ELEMENT parameterlist (samba:parameter) +!ELEMENT samba:parameter (description,related*,value*) +!ATTLIST samba:parameter name CDATA #REQUIRED type CDATA #REQUIRED context CDATA #REQUIRED
svn commit: samba r5777 - in branches/SAMBA_4_0/source/scripting/swig: .
Author: tpot Date: 2005-03-12 22:24:46 + (Sat, 12 Mar 2005) New Revision: 5777 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5777 Log: At some stage SIG_ATOMIC_T was renamed to sig_atomic_t. This should fix abartlet's compile problem. Modified: branches/SAMBA_4_0/source/scripting/swig/tdb.i Changeset: Modified: branches/SAMBA_4_0/source/scripting/swig/tdb.i === --- branches/SAMBA_4_0/source/scripting/swig/tdb.i 2005-03-12 18:03:54 UTC (rev 5776) +++ branches/SAMBA_4_0/source/scripting/swig/tdb.i 2005-03-12 22:24:46 UTC (rev 5777) @@ -35,14 +35,11 @@ #undef HAVE_FSTAT #endif -/* The tdb_set_lock_alarm() function requires the SIG_ATOMIC_T - function from includes.h */ +/* The tdb_set_lock_alarm() function requires the sig_atomic_t type */ #include include/config.h -#if defined(HAVE_SIG_ATOMIC_T_TYPE) -typedef sig_atomic_t SIG_ATOMIC_T; -#else -typedef int SIG_ATOMIC_T; +#if !defined(HAVE_SIG_ATOMIC_T_TYPE) +typedef int sig_atomic_t #endif #if (__GNUC__ = 3) @@ -140,7 +137,7 @@ void tdb_unlockall(TDB_CONTEXT *tdb); /* Low level locking functions: use with care */ -void tdb_set_lock_alarm(SIG_ATOMIC_T *palarm); +void tdb_set_lock_alarm(sig_atomic_t *palarm); int tdb_chainlock(TDB_CONTEXT *tdb, TDB_DATA key); int tdb_chainunlock(TDB_CONTEXT *tdb, TDB_DATA key);
svn commit: samba-docs r409 - in trunk: . Samba-Guide Samba-HOWTO-Collection manpages xslt
Author: jelmer Date: 2005-03-12 22:34:38 + (Sat, 12 Mar 2005) New Revision: 409 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=409 Log: Use new definition of smbconfoption, fixes a bunch of validity errors. Added: trunk/xslt/upgrade.pl Modified: trunk/Makefile trunk/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml trunk/Samba-Guide/Chap02-SimpleOfficeServer.xml trunk/Samba-Guide/Chap03-TheSmallOffice.xml trunk/Samba-Guide/Chap04-SecureOfficeServer.xml trunk/Samba-Guide/Chap05-500UserNetwork.xml trunk/Samba-Guide/Chap06-MakingHappyUsers.xml trunk/Samba-Guide/Chap07-2000UserNetwork.xml trunk/Samba-Guide/Chap08-MigrateNT4Samba3.xml trunk/Samba-Guide/Chap08b-MigrateNW4Samba3.xml trunk/Samba-Guide/Chap09-AddingUNIXClients.xml trunk/Samba-Guide/Chap10-KerberosFastStart.xml trunk/Samba-Guide/Chap10b-DomainAppsSupport.xml trunk/Samba-HOWTO-Collection/AccessControls.xml trunk/Samba-HOWTO-Collection/BDC.xml trunk/Samba-HOWTO-Collection/Bugs.xml trunk/Samba-HOWTO-Collection/CUPS-printing.xml trunk/Samba-HOWTO-Collection/Compiling.xml trunk/Samba-HOWTO-Collection/Diagnosis.xml trunk/Samba-HOWTO-Collection/DomainMember.xml trunk/Samba-HOWTO-Collection/FastStart.xml trunk/Samba-HOWTO-Collection/Group-Mapping.xml trunk/Samba-HOWTO-Collection/Install.xml trunk/Samba-HOWTO-Collection/Integrating-with-Windows.xml trunk/Samba-HOWTO-Collection/InterdomainTrusts.xml trunk/Samba-HOWTO-Collection/LargeFile.xml trunk/Samba-HOWTO-Collection/NT4Migration.xml trunk/Samba-HOWTO-Collection/NetworkBrowsing.xml trunk/Samba-HOWTO-Collection/Other-Clients.xml trunk/Samba-HOWTO-Collection/PAM.xml trunk/Samba-HOWTO-Collection/PDC.xml trunk/Samba-HOWTO-Collection/Passdb.xml trunk/Samba-HOWTO-Collection/Printing.xml trunk/Samba-HOWTO-Collection/Problems.xml trunk/Samba-HOWTO-Collection/ProfileMgmt.xml trunk/Samba-HOWTO-Collection/RightsAndPriviliges.xml trunk/Samba-HOWTO-Collection/SWAT.xml trunk/Samba-HOWTO-Collection/Securing.xml trunk/Samba-HOWTO-Collection/ServerType.xml trunk/Samba-HOWTO-Collection/Speed.xml trunk/Samba-HOWTO-Collection/StandAloneServer.xml trunk/Samba-HOWTO-Collection/Unicode.xml trunk/Samba-HOWTO-Collection/VFS.xml trunk/Samba-HOWTO-Collection/Winbind.xml trunk/Samba-HOWTO-Collection/WindowsClientConfig.xml trunk/Samba-HOWTO-Collection/locking.xml trunk/Samba-HOWTO-Collection/msdfs.xml trunk/Samba-HOWTO-Collection/upgrading-to-3.0.xml trunk/manpages/nmbd.8.xml trunk/manpages/ntlm_auth.1.xml trunk/manpages/pdbedit.8.xml trunk/manpages/rpcclient.1.xml trunk/manpages/smb.conf.5.xml trunk/manpages/smbd.8.xml trunk/manpages/smbpasswd.8.xml trunk/manpages/winbindd.8.xml trunk/xslt/expand-sambadoc.xsl trunk/xslt/generate-attributions.xsl trunk/xslt/sambadoc2pearson.xsl Changeset: Sorry, the patch is too large (7437 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=409
svn commit: samba-docs r410 - in trunk: smbdotconf/base smbdotconf/browse smbdotconf/domain smbdotconf/filename smbdotconf/ldap smbdotconf/locking smbdotconf/logging smbdotconf/logon smbdotconf/misc smbdotconf/printing smbdotconf/protocol smbdotconf/security smbdotconf/tuning smbdotconf/vfs smbdotconf/winbind smbdotconf/wins xslt
Author: jelmer Date: 2005-03-12 22:41:20 + (Sat, 12 Mar 2005) New Revision: 410 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=410 Log: Update DTD location Modified: trunk/smbdotconf/base/bindinterfacesonly.xml trunk/smbdotconf/base/comment.xml trunk/smbdotconf/base/displaycharset.xml trunk/smbdotconf/base/doscharset.xml trunk/smbdotconf/base/interfaces.xml trunk/smbdotconf/base/netbiosaliases.xml trunk/smbdotconf/base/netbiosname.xml trunk/smbdotconf/base/netbiosscope.xml trunk/smbdotconf/base/path.xml trunk/smbdotconf/base/realm.xml trunk/smbdotconf/base/serverstring.xml trunk/smbdotconf/base/unixcharset.xml trunk/smbdotconf/base/workgroup.xml trunk/smbdotconf/browse/browseable.xml trunk/smbdotconf/browse/browselist.xml trunk/smbdotconf/browse/domainmaster.xml trunk/smbdotconf/browse/enhancedbrowsing.xml trunk/smbdotconf/browse/lmannounce.xml trunk/smbdotconf/browse/lminterval.xml trunk/smbdotconf/browse/localmaster.xml trunk/smbdotconf/browse/oslevel.xml trunk/smbdotconf/browse/preferredmaster.xml trunk/smbdotconf/domain/machinepasswordtimeout.xml trunk/smbdotconf/filename/casesensitive.xml trunk/smbdotconf/filename/defaultcase.xml trunk/smbdotconf/filename/deletevetofiles.xml trunk/smbdotconf/filename/hidedotfiles.xml trunk/smbdotconf/filename/hidefiles.xml trunk/smbdotconf/filename/hidespecialfiles.xml trunk/smbdotconf/filename/hideunreadable.xml trunk/smbdotconf/filename/hideunwriteablefiles.xml trunk/smbdotconf/filename/mangledmap.xml trunk/smbdotconf/filename/manglednames.xml trunk/smbdotconf/filename/mangleprefix.xml trunk/smbdotconf/filename/manglingchar.xml trunk/smbdotconf/filename/manglingmethod.xml trunk/smbdotconf/filename/maparchive.xml trunk/smbdotconf/filename/maphidden.xml trunk/smbdotconf/filename/mapsystem.xml trunk/smbdotconf/filename/preservecase.xml trunk/smbdotconf/filename/shortpreservecase.xml trunk/smbdotconf/filename/statcache.xml trunk/smbdotconf/filename/storedosattributes.xml trunk/smbdotconf/filename/vetofiles.xml trunk/smbdotconf/filename/vetooplockfiles.xml trunk/smbdotconf/ldap/ldapadmindn.xml trunk/smbdotconf/ldap/ldapdeletedn.xml trunk/smbdotconf/ldap/ldapfilter.xml trunk/smbdotconf/ldap/ldapgroupsuffix.xml trunk/smbdotconf/ldap/ldapidmapsuffix.xml trunk/smbdotconf/ldap/ldapmachinesuffix.xml trunk/smbdotconf/ldap/ldappasswdsync.xml trunk/smbdotconf/ldap/ldapport.xml trunk/smbdotconf/ldap/ldapreplicationsleep.xml trunk/smbdotconf/ldap/ldapsamtrusted.xml trunk/smbdotconf/ldap/ldapserver.xml trunk/smbdotconf/ldap/ldapssl.xml trunk/smbdotconf/ldap/ldapsuffix.xml trunk/smbdotconf/ldap/ldaptimeout.xml trunk/smbdotconf/ldap/ldapusersuffix.xml trunk/smbdotconf/locking/blockinglocks.xml trunk/smbdotconf/locking/cscpolicy.xml trunk/smbdotconf/locking/fakeoplocks.xml trunk/smbdotconf/locking/kerneloplocks.xml trunk/smbdotconf/locking/level2oplocks.xml trunk/smbdotconf/locking/locking.xml trunk/smbdotconf/locking/lockspincount.xml trunk/smbdotconf/locking/lockspintime.xml trunk/smbdotconf/locking/oplockbreakwaittime.xml trunk/smbdotconf/locking/oplockcontentionlimit.xml trunk/smbdotconf/locking/oplocks.xml trunk/smbdotconf/locking/posixlocking.xml trunk/smbdotconf/locking/sharemodes.xml trunk/smbdotconf/locking/strictlocking.xml trunk/smbdotconf/logging/debughirestimestamp.xml trunk/smbdotconf/logging/debugpid.xml trunk/smbdotconf/logging/debugtimestamp.xml trunk/smbdotconf/logging/debuguid.xml trunk/smbdotconf/logging/logfile.xml trunk/smbdotconf/logging/loglevel.xml trunk/smbdotconf/logging/maxlogsize.xml trunk/smbdotconf/logging/syslog.xml trunk/smbdotconf/logging/syslogonly.xml trunk/smbdotconf/logon/abortshutdownscript.xml trunk/smbdotconf/logon/addgroupscript.xml trunk/smbdotconf/logon/addmachinescript.xml trunk/smbdotconf/logon/adduserscript.xml trunk/smbdotconf/logon/addusertogroupscript.xml trunk/smbdotconf/logon/deletegroupscript.xml trunk/smbdotconf/logon/deleteuserfromgroupscript.xml trunk/smbdotconf/logon/deleteuserscript.xml trunk/smbdotconf/logon/domainlogons.xml trunk/smbdotconf/logon/enableprivileges.xml trunk/smbdotconf/logon/logondrive.xml trunk/smbdotconf/logon/logonhome.xml trunk/smbdotconf/logon/logonpath.xml trunk/smbdotconf/logon/logonscript.xml trunk/smbdotconf/logon/setprimarygroupscript.xml trunk/smbdotconf/logon/shutdownscript.xml trunk/smbdotconf/misc/addsharecommand.xml trunk/smbdotconf/misc/afsshare.xml trunk/smbdotconf/misc/afsusernamemap.xml trunk/smbdotconf/misc/available.xml trunk/smbdotconf/misc/changesharecommand.xml trunk/smbdotconf/misc/configfile.xml trunk/smbdotconf/misc/copy.xml trunk/smbdotconf/misc/defaultservice.xml trunk/smbdotconf/misc/deletereadonly.xml
Build status as of Sun Mar 13 00:00:01 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-03-12 00:00:18.0 + +++ /home/build/master/cache/broken_results.txt 2005-03-13 00:00:06.0 + @@ -1,35 +1,31 @@ -Build status as of Sat Mar 12 00:00:02 2005 +Build status as of Sun Mar 13 00:00:01 2005 Build counts: Tree Total Broken Panic -ccache 39 4 0 -distcc 39 2 0 -ppp 23 3 0 -rsync39 4 0 +ccache 38 3 0 +distcc 38 2 0 +ppp 22 2 0 +rsync38 5 0 samba1 1 1 samba-docs 0 0 0 -samba4 43 12 0 -samba_3_040 16 1 +samba4 42 12 0 +samba_3_039 15 1 Currently broken builds: Host Tree Compiler Status fusberta samba4 gccok/ 2/?/? fusberta samba_3_0gccok/ok/ok/ 6/PANIC -samba-s390 samba4 gccok/ 2/?/? rhonwynsamba4 gcc-4.0ok/ 2/?/? rhonwynsamba_3_0gcc-4.0ok/ 2/?/? rhonwynsamba4 tccok/ 2/?/? -quango ccache gcc 137/?/?/? -quango ppp gccok/ 2/?/? -superego samba_3_0gccok/ok/ 2/? +superego samba_3_0gccok/ 2/?/? gc8samba4 gccok/ 1/?/? gc8samba_3_0gccok/ 1/?/? aretnapccache iccok/ok/ok/ 1 -tardis samba_3_0gccok/ 2/?/? gwen distcc cc ok/ 1/?/? gwen samba4 cc ok/ 1/?/? gwen samba_3_0cc ok/ 1/?/? -us4samba_3_0cc ok/ok/ok/ 2 +us4samba_3_0cc 127/?/?/? us4samba_3_0gccok/ok/ok/ 2 flock samba4 gccok/ 1/?/? shubnigurath samba4 cc ok/ 1/?/? @@ -50,9 +46,11 @@ m30ccache gccok/ok/ok/ 2 m30rsyncgccok/ok/ok/ 2 m30samba4 gccok/ 2/?/? -m30samba_3_0gccok/ 2/?/? +m30samba_3_0gccok/ok/ok/ 1 +metze02rsyncgcc 1/?/?/? metze02sambagccok/ok/ok/ 1/PANIC -metze02samba_3_0gccok/ 2/?/? +metze02samba_3_0gcc 77/?/?/? +metze02samba4 gcc-3.4 127/?/?/? l390vme1 samba_3_0gccok/ 2/?/? opippp gccok/ 2/?/?
svn commit: lorikeet r244 - in trunk/ethereal: . include pidl
Author: tpot Date: 2005-03-13 00:23:27 + (Sun, 13 Mar 2005) New Revision: 244 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=244 Log: Move ethereal pidl into its own directory. Added: trunk/ethereal/include/ trunk/ethereal/pidl/ trunk/ethereal/pidl/Makefile trunk/ethereal/pidl/README trunk/ethereal/pidl/atsvc.cap trunk/ethereal/pidl/dlinklist.h trunk/ethereal/pidl/eparser.c trunk/ethereal/pidl/eparser.h trunk/ethereal/pidl/ethereal-pidl.patch trunk/ethereal/pidl/ethereal_headers/ trunk/ethereal/pidl/libndr.h trunk/ethereal/pidl/moduleinfo.c trunk/ethereal/pidl/moduleinfo.h trunk/ethereal/pidl/pidl.c trunk/ethereal/pidl/talloc.c trunk/ethereal/pidl/talloc.h Removed: trunk/ethereal/Makefile trunk/ethereal/README trunk/ethereal/atsvc.cap trunk/ethereal/dlinklist.h trunk/ethereal/eparser.c trunk/ethereal/eparser.h trunk/ethereal/ethereal-pidl.patch trunk/ethereal/ethereal_headers/ trunk/ethereal/include/config.h trunk/ethereal/include/epan/ trunk/ethereal/include/getopt.h trunk/ethereal/include/plugins/ trunk/ethereal/include/svnversion.h trunk/ethereal/include/wiretap/ trunk/ethereal/libndr.h trunk/ethereal/moduleinfo.c trunk/ethereal/moduleinfo.h trunk/ethereal/pidl.c trunk/ethereal/talloc.c trunk/ethereal/talloc.h Changeset: Sorry, the patch is too large (3284 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=244
svn commit: lorikeet r245 - in trunk/ethereal: include pidl/ethereal_headers
Author: tpot Date: 2005-03-13 00:34:15 + (Sun, 13 Mar 2005) New Revision: 245 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=245 Log: Move header files to a common directory. Added: trunk/ethereal/include/config.h trunk/ethereal/include/epan/ trunk/ethereal/include/getopt.h trunk/ethereal/include/plugins/ trunk/ethereal/include/svnversion.h trunk/ethereal/include/wiretap/ Removed: trunk/ethereal/pidl/ethereal_headers/config.h trunk/ethereal/pidl/ethereal_headers/epan/ trunk/ethereal/pidl/ethereal_headers/getopt.h trunk/ethereal/pidl/ethereal_headers/plugins/ trunk/ethereal/pidl/ethereal_headers/svnversion.h trunk/ethereal/pidl/ethereal_headers/wiretap/ Changeset: Sorry, the patch is too large (400 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=245
svn commit: samba r5778 - in branches/SAMBA_4_0/source/scripting/swig: .
Author: tpot Date: 2005-03-13 01:01:24 + (Sun, 13 Mar 2005) New Revision: 5778 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5778 Log: Remove tdb_set_lock_alarm() function from wrappers at tridge's request. Modified: branches/SAMBA_4_0/source/scripting/swig/tdb.i Changeset: Modified: branches/SAMBA_4_0/source/scripting/swig/tdb.i === --- branches/SAMBA_4_0/source/scripting/swig/tdb.i 2005-03-12 22:24:46 UTC (rev 5777) +++ branches/SAMBA_4_0/source/scripting/swig/tdb.i 2005-03-13 01:01:24 UTC (rev 5778) @@ -35,13 +35,6 @@ #undef HAVE_FSTAT #endif -/* The tdb_set_lock_alarm() function requires the sig_atomic_t type */ - -#include include/config.h -#if !defined(HAVE_SIG_ATOMIC_T_TYPE) -typedef int sig_atomic_t -#endif - #if (__GNUC__ = 3) /** Use gcc attribute to check printf fns. a1 is the 1-based index of * the parameter containing the format, and a2 the index of the first @@ -137,7 +130,6 @@ void tdb_unlockall(TDB_CONTEXT *tdb); /* Low level locking functions: use with care */ -void tdb_set_lock_alarm(sig_atomic_t *palarm); int tdb_chainlock(TDB_CONTEXT *tdb, TDB_DATA key); int tdb_chainunlock(TDB_CONTEXT *tdb, TDB_DATA key);
svn commit: samba-docs r411 - in trunk: . Samba-Developers-Guide Samba-HOWTO-Collection smbdotconf/base xslt
Author: jelmer Date: 2005-03-13 01:38:40 + (Sun, 13 Mar 2005) New Revision: 411 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=411 Log: Fix validation for the developers guide. Modified: trunk/Makefile trunk/Makefile.settings.in trunk/Samba-Developers-Guide/CodingSuggestions.xml trunk/Samba-Developers-Guide/NetBIOS.xml trunk/Samba-Developers-Guide/Tracing.xml trunk/Samba-Developers-Guide/architecture.xml trunk/Samba-Developers-Guide/cifsntdomain.xml trunk/Samba-Developers-Guide/contributing.xml trunk/Samba-Developers-Guide/debug.xml trunk/Samba-Developers-Guide/encryption.xml trunk/Samba-Developers-Guide/gencache.xml trunk/Samba-Developers-Guide/index.xml trunk/Samba-Developers-Guide/internals.xml trunk/Samba-Developers-Guide/modules.xml trunk/Samba-Developers-Guide/packagers.xml trunk/Samba-Developers-Guide/parsing.xml trunk/Samba-Developers-Guide/printing.xml trunk/Samba-Developers-Guide/registry.xml trunk/Samba-Developers-Guide/rpc_plugin.xml trunk/Samba-Developers-Guide/unix-smb.xml trunk/Samba-Developers-Guide/vfs.xml trunk/Samba-Developers-Guide/windows-debug.xml trunk/Samba-Developers-Guide/wins.xml trunk/Samba-HOWTO-Collection/Group-Mapping.xml trunk/Samba-HOWTO-Collection/PDC.xml trunk/smbdotconf/base/interfaces.xml trunk/xslt/generate-attributions.xsl Changeset: Sorry, the patch is too large (377 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=411
svn commit: samba r5779 - in branches/SAMBA_4_0/source/lib/tdb: common include
Author: tpot
Date: 2005-03-13 01:40:45 + (Sun, 13 Mar 2005)
New Revision: 5779
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5779
Log:
Remove signal and timeout gubbage from tdb.
Modified:
branches/SAMBA_4_0/source/lib/tdb/common/tdb.c
branches/SAMBA_4_0/source/lib/tdb/common/tdbutil.c
branches/SAMBA_4_0/source/lib/tdb/include/tdb.h
Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/common/tdb.c
===
--- branches/SAMBA_4_0/source/lib/tdb/common/tdb.c 2005-03-13 01:01:24 UTC
(rev 5778)
+++ branches/SAMBA_4_0/source/lib/tdb/common/tdb.c 2005-03-13 01:40:45 UTC
(rev 5779)
@@ -61,7 +61,6 @@
#include errno.h
#include sys/mman.h
#include sys/stat.h
-#include signal.h
#include tdb.h
#else
#include includes.h
@@ -193,18 +192,6 @@
*/
};
-/***
- Allow a caller to set a alarm flag that tdb can check to abort
- a blocking lock on SIGALRM.
-***/
-
-static sig_atomic_t *palarm_fired;
-
-void tdb_set_lock_alarm(sig_atomic_t *palarm)
-{
- palarm_fired = palarm;
-}
-
/* a byte range locking function - return 0 on success
this functions locks/unlocks 1 byte at the specified offset.
@@ -231,27 +218,16 @@
do {
ret = fcntl(tdb-fd,lck_type,fl);
- if (ret == -1 errno == EINTR palarm_fired
*palarm_fired)
- break;
} while (ret == -1 errno == EINTR);
if (ret == -1) {
if (!probe lck_type != F_SETLK) {
/* Ensure error code is set for log fun to examine. */
- if (errno == EINTR palarm_fired *palarm_fired)
- tdb-ecode = TDB_ERR_LOCK_TIMEOUT;
- else
- tdb-ecode = TDB_ERR_LOCK;
+ tdb-ecode = TDB_ERR_LOCK;
TDB_LOG((tdb, 5,tdb_brlock failed (fd=%d) at offset %d
rw_type=%d lck_type=%d\n,
tdb-fd, offset, rw_type, lck_type));
}
- /* Was it an alarm timeout ? */
- if (errno == EINTR palarm_fired *palarm_fired) {
- TDB_LOG((tdb, 5, tdb_brlock timed out (fd=%d) at
offset %d rw_type=%d lck_type=%d\n,
-tdb-fd, offset, rw_type, lck_type));
- return TDB_ERRCODE(TDB_ERR_LOCK_TIMEOUT, -1);
- }
- /* Otherwise - generic lock error. errno set by fcntl.
+ /* Generic lock error. errno set by fcntl.
* EAGAIN is an expected return from non-blocking
* locks. */
if (errno != EAGAIN) {
Modified: branches/SAMBA_4_0/source/lib/tdb/common/tdbutil.c
===
--- branches/SAMBA_4_0/source/lib/tdb/common/tdbutil.c 2005-03-13 01:01:24 UTC
(rev 5778)
+++ branches/SAMBA_4_0/source/lib/tdb/common/tdbutil.c 2005-03-13 01:40:45 UTC
(rev 5779)
@@ -29,58 +29,7 @@
/* these are little tdb utility functions that are meant to make
dealing with a tdb database a little less cumbersome in Samba */
-static sig_atomic_t gotalarm;
-
/***
- Signal function to tell us we timed out.
-/
-
-static void gotalarm_sig(void)
-{
- gotalarm = 1;
-}
-
-
-/***
- THIS is a copy of the function CatchSignal found in lib/signal.c
- I need to copy it there to avoid sucking all of the samba source
- into tdb.
-
- Catch a signal. This should implement the following semantics:
-
- 1) The handler remains installed after being called.
- 2) The signal should be blocked during handler execution.
-/
-
-static void (*TdbCatchSignal(int signum,void (*handler)(int )))(int)
-{
-#ifdef HAVE_SIGACTION
- struct sigaction act;
- struct sigaction oldact;
-
- ZERO_STRUCT(act);
-
- act.sa_handler = handler;
-#ifdef SA_RESTART
- /*
-* We *want* SIGALRM to interrupt a system call.
-*/
- if(signum != SIGALRM)
- act.sa_flags = SA_RESTART;
-#endif
- sigemptyset(act.sa_mask);
- sigaddset(act.sa_mask,signum);
- sigaction(signum,act,oldact);
- return oldact.sa_handler;
-#else /* !HAVE_SIGACTION */
- /* FIXME: need to handle sigvec and systems with broken signal() */
- return signal(signum, handler);
-#endif
-}
-
-
-
-/***
Make a TDB_DATA and keep the const warning in one place
/
@@
svn commit: samba r5780 - in branches/SAMBA_4_0/source/lib/tdb: common include
Author: tpot
Date: 2005-03-13 02:20:51 + (Sun, 13 Mar 2005)
New Revision: 5780
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5780
Log:
Remove unused arguments.
Modified:
branches/SAMBA_4_0/source/lib/tdb/common/tdbutil.c
branches/SAMBA_4_0/source/lib/tdb/include/tdbutil.h
Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/common/tdbutil.c
===
--- branches/SAMBA_4_0/source/lib/tdb/common/tdbutil.c 2005-03-13 01:40:45 UTC
(rev 5779)
+++ branches/SAMBA_4_0/source/lib/tdb/common/tdbutil.c 2005-03-13 02:20:51 UTC
(rev 5780)
@@ -42,10 +42,10 @@
}
/
- Lock a chain by string. Return -1 if timeout or lock failed.
+ Lock a chain by string. Return -1 if lock failed.
/
-int tdb_lock_bystring(TDB_CONTEXT *tdb, const char *keyval, uint_t timeout)
+int tdb_lock_bystring(TDB_CONTEXT *tdb, const char *keyval)
{
TDB_DATA key = make_tdb_data(keyval, strlen(keyval)+1);
@@ -64,10 +64,10 @@
}
/
- Read lock a chain by string. Return -1 if timeout or lock failed.
+ Read lock a chain by string. Return -1 if lock failed.
/
-int tdb_read_lock_bystring(TDB_CONTEXT *tdb, const char *keyval, uint_t
timeout)
+int tdb_read_lock_bystring(TDB_CONTEXT *tdb, const char *keyval)
{
TDB_DATA key = make_tdb_data(keyval, strlen(keyval)+1);
@@ -252,7 +252,7 @@
int32_t val;
int32_t ret = -1;
- if (tdb_lock_bystring(tdb, keystr,0) == -1)
+ if (tdb_lock_bystring(tdb, keystr) == -1)
return -1;
if ((val = tdb_fetch_int32(tdb, keystr)) == -1) {
@@ -293,7 +293,7 @@
uint32_t val;
BOOL ret = False;
- if (tdb_lock_bystring(tdb, keystr,0) == -1)
+ if (tdb_lock_bystring(tdb, keystr) == -1)
return False;
if (!tdb_fetch_uint32(tdb, keystr, val)) {
Modified: branches/SAMBA_4_0/source/lib/tdb/include/tdbutil.h
===
--- branches/SAMBA_4_0/source/lib/tdb/include/tdbutil.h 2005-03-13 01:40:45 UTC
(rev 5779)
+++ branches/SAMBA_4_0/source/lib/tdb/include/tdbutil.h 2005-03-13 02:20:51 UTC
(rev 5780)
@@ -35,7 +35,7 @@
TDB_LIST_NODE *tdb_search_keys(TDB_CONTEXT*, const char*);
void tdb_search_list_free(TDB_LIST_NODE*);
int32_t tdb_change_int32_atomic(TDB_CONTEXT *tdb, const char *keystr, int32_t
*oldval, int32_t change_val);
-int tdb_lock_bystring(TDB_CONTEXT *tdb, const char *keyval, uint_t timeout);
+int tdb_lock_bystring(TDB_CONTEXT *tdb, const char *keyval);
void tdb_unlock_bystring(TDB_CONTEXT *tdb, const char *keyval);
int32_t tdb_fetch_int32(TDB_CONTEXT *tdb, const char *keystr);
int tdb_store_int32(TDB_CONTEXT *tdb, const char *keystr, int32_t v);
svn commit: samba r5781 - in branches/SAMBA_4_0/source: lib passdb
Author: tpot
Date: 2005-03-13 02:48:16 + (Sun, 13 Mar 2005)
New Revision: 5781
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5781
Log:
Fix build.
Modified:
branches/SAMBA_4_0/source/lib/gencache.c
branches/SAMBA_4_0/source/passdb/secrets.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/gencache.c
===
--- branches/SAMBA_4_0/source/lib/gencache.c2005-03-13 02:20:51 UTC (rev
5780)
+++ branches/SAMBA_4_0/source/lib/gencache.c2005-03-13 02:48:16 UTC (rev
5781)
@@ -363,7 +363,7 @@
int gencache_lock_entry( const char *key )
{
- return tdb_lock_bystring(cache-tdb, key, 0);
+ return tdb_lock_bystring(cache-tdb, key);
}
/
Modified: branches/SAMBA_4_0/source/passdb/secrets.c
===
--- branches/SAMBA_4_0/source/passdb/secrets.c 2005-03-13 02:20:51 UTC (rev
5780)
+++ branches/SAMBA_4_0/source/passdb/secrets.c 2005-03-13 02:48:16 UTC (rev
5781)
@@ -139,7 +139,7 @@
return False;
if (ref_count == 0) {
- ret = tdb_lock_bystring(tdb-tdb, name, timeout);
+ ret = tdb_lock_bystring(tdb-tdb, name);
if (ret == 0)
DEBUG(10,(secrets_named_mutex: got mutex for %s\n,
name ));
}
svn commit: lorikeet r246 - in trunk/ethereal: . ndrdump
Author: tpot
Date: 2005-03-13 02:57:35 + (Sun, 13 Mar 2005)
New Revision: 246
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=246
Log:
Ethereal plugin to use the output of ndrdump to generate parser output.
Needs a patch to ndrdump to accept data from stdin.
Added:
trunk/ethereal/ndrdump/
trunk/ethereal/ndrdump/Makefile
trunk/ethereal/ndrdump/moduleinfo.c
trunk/ethereal/ndrdump/moduleinfo.h
trunk/ethereal/ndrdump/ndrdump.c
Changeset:
Added: trunk/ethereal/ndrdump/Makefile
===
--- trunk/ethereal/ndrdump/Makefile 2005-03-13 00:34:15 UTC (rev 245)
+++ trunk/ethereal/ndrdump/Makefile 2005-03-13 02:57:35 UTC (rev 246)
@@ -0,0 +1,9 @@
+PLUGIN = ndrdump.so
+
+CFLAGS = -I ../include $(shell pkg-config --cflags glib-2.0) -g
+LDFLAGS= -shared -Wl,--export-dynamic -Wl,-soname -Wl,$(PLUGIN)
+
+OBJS = moduleinfo.o ndrdump.o
+
+ndrdump.so: $(OBJS)
+ $(CC) -o $(PLUGIN) $(OBJS) $(LDFLAGS)
Copied: trunk/ethereal/ndrdump/moduleinfo.c (from rev 244,
trunk/ethereal/pidl/moduleinfo.c)
Copied: trunk/ethereal/ndrdump/moduleinfo.h (from rev 244,
trunk/ethereal/pidl/moduleinfo.h)
Added: trunk/ethereal/ndrdump/ndrdump.c
===
--- trunk/ethereal/ndrdump/ndrdump.c2005-03-13 00:34:15 UTC (rev 245)
+++ trunk/ethereal/ndrdump/ndrdump.c2005-03-13 02:57:35 UTC (rev 246)
@@ -0,0 +1,172 @@
+#include config.h
+
+#include gmodule.h
+#include plugins/plugin_api.h
+#include epan/packet.h
+#include epan/dissectors/packet-dcerpc.h
+
+#include sys/types.h
+#include sys/wait.h
+
+static int proto_dcerpc_samr = -1;
+
+static gint ett_dcerpc_samr = -1;
+
+static int hf_samr_opnum = -1;
+
+static e_uuid_t uuid_dcerpc_samr = {
+0x12345778, 0x1234, 0xabcd,
+{ 0xef, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89, 0xac }
+};
+
+static guint16 ver_dcerpc_samr = 1.0;
+
+static void process_data(char *data, int data_len, proto_tree *tree,
+tvbuff_t *tvb, int offset)
+{
+ gchar **lines = g_strsplit(data, \n, 0);
+
+ if (*lines) { /* skip opcode */
+ proto_tree_add_text(tree, tvb, offset, 0, *lines);
+ lines++;
+ }
+
+ if (*lines) { /* skip in/out */
+ proto_tree_add_text(tree, tvb, offset, 0, *lines);
+ lines++;
+ }
+
+#define END_TOKEN pull returned
+
+ while (*lines) {
+ if (strncmp(*lines, END_TOKEN, strlen(END_TOKEN)) == 0) {
+ proto_tree_add_text(tree, tvb, offset, 0,
+ *lines + strlen(END_TOKEN));
+ break;
+ }
+
+ proto_tree_add_text(tree, tvb, offset, 0, *lines);
+ lines++;
+ }
+}
+
+static int
+ndrdump_dissect_packet(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree, guint8 *drep)
+{
+ dcerpc_info *di = (dcerpc_info *)pinfo-private_data;
+ dcerpc_call_value *dcv = (dcerpc_call_value *)di-call_data;
+ int read_pipe[2], write_pipe[2];
+ pid_t child_pid;
+ int status;
+
+ /* Create pipe to ndrdump */
+
+ if (pipe(read_pipe) == -1 || pipe(write_pipe) == -1) {
+ perror(pipe);
+ return 1;
+ }
+
+ if ((child_pid = fork()) == -1) {
+ perror(fork);
+ return 1;
+ }
+
+#definePARENT_READ read_pipe[0]
+#defineCHILD_WRITE read_pipe[1]
+#define CHILD_READ write_pipe[0]
+#define PARENT_WRITE write_pipe[1]
+
+ if (child_pid == 0) {
+
+ close(PARENT_WRITE);
+ close(PARENT_READ);
+
+ dup2(CHILD_READ, fileno(stdin));
+ dup2(CHILD_WRITE, fileno(stdout));
+
+ char *opnum;
+ asprintf(opnum, %d, dcv-opnum);
+
+ execlp(ndrdump, ndrdump, samr, opnum,
+ (di-ptype == PDU_REQ) ? in : out, NULL);
+ exit(1);
+ }
+
+ close(CHILD_READ);
+ close(CHILD_WRITE);
+
+ /* Write data */
+
+ char *tvb_data = (char *)tvb_get_ptr(tvb, offset, -1);
+
+ int result = write(PARENT_WRITE, tvb_data,
+ tvb_length_remaining(tvb, offset));
+
+ close(PARENT_WRITE);
+
+ /* Read ndrdump output */
+
+ char *data = NULL, buf[255];
+ int num_read, data_len = 0;
+
+ while((num_read = read(PARENT_READ, buf, 255)) 0) {
+ data = realloc(data, data_len + num_read);
+ memcpy(data + data_len, buf, num_read);
+ data_len += num_read;
+ }
+
+ if (data data_len)
+ process_data(data, data_len, tree, tvb, offset);
+
+ waitpid(child_pid, status, 0);
+
+ if (WIFSIGNALED(status)) {
+
svn commit: samba r5782 - in branches/SAMBA_4_0/source/utils: .
Author: tpot
Date: 2005-03-13 03:16:07 + (Sun, 13 Mar 2005)
New Revision: 5782
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5782
Log:
Use standard input for reading packet data if filename not specified.
Modified:
branches/SAMBA_4_0/source/utils/ndrdump.c
Changeset:
Modified: branches/SAMBA_4_0/source/utils/ndrdump.c
===
--- branches/SAMBA_4_0/source/utils/ndrdump.c 2005-03-13 02:48:16 UTC (rev
5781)
+++ branches/SAMBA_4_0/source/utils/ndrdump.c 2005-03-13 03:16:07 UTC (rev
5782)
@@ -21,6 +21,7 @@
#include includes.h
#include lib/cmdline/popt_common.h
#include system/iconv.h
+#include system/filesys.h
static const struct dcerpc_interface_call *find_function(
const struct dcerpc_interface_table *p,
@@ -70,6 +71,32 @@
exit(1);
}
+static char *stdin_load(TALLOC_CTX *mem_ctx, size_t *size)
+{
+ int num_read, total_len = 0;
+ char buf[255];
+ char *result = NULL;
+
+ while((num_read = read(STDIN_FILENO, buf, 255)) 0) {
+
+ if (result) {
+ result = (char *) talloc_realloc(
+ mem_ctx, result, char *, total_len + num_read);
+ } else {
+ result = talloc_size(mem_ctx, num_read);
+ }
+
+ memcpy(result + total_len, buf, num_read);
+
+ total_len += num_read;
+ }
+
+ if (size)
+ *size = total_len;
+
+ return result;
+}
+
int main(int argc, const char *argv[])
{
const struct dcerpc_interface_table *p;
@@ -100,7 +127,7 @@
pc = poptGetContext(ndrdump, argc, argv, long_options, 0);
- poptSetOtherOptionHelp(pc, pipe function inout filename);
+ poptSetOtherOptionHelp(pc, pipe function inout [filename]);
while ((opt = poptGetNextOpt(pc)) != -1) {
}
@@ -124,7 +151,7 @@
inout = poptGetArg(pc);
filename = poptGetArg(pc);
- if (!function || !inout || !filename) {
+ if (!function || !inout) {
poptPrintUsage(pc, stderr, 0);
show_functions(p);
exit(1);
@@ -180,9 +207,16 @@
}
}
- data = (uint8_t *)file_load(filename, size);
+ if (filename)
+ data = (uint8_t *)file_load(filename, size);
+ else
+ data = (uint8_t *)stdin_load(mem_ctx, size);
+
if (!data) {
- perror(filename);
+ if (filename)
+ perror(filename);
+ else
+ perror(stdin);
exit(1);
}
svn commit: samba r5783 - in branches/SAMBA_4_0/source: librpc/idl rpc_server/samr torture/rpc
Author: abartlet
Date: 2005-03-13 06:43:34 + (Sun, 13 Mar 2005)
New Revision: 5783
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=5783
Log:
Test renaming of accounts in the RPC-SAMR test, and add support into
the SAMR server.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/librpc/idl/samr.idl
branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
branches/SAMBA_4_0/source/torture/rpc/samr.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/samr.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/samr.idl 2005-03-13 03:16:07 UTC
(rev 5782)
+++ branches/SAMBA_4_0/source/librpc/idl/samr.idl 2005-03-13 06:43:34 UTC
(rev 5783)
@@ -665,7 +665,8 @@
/* this defines the bits used for fields_present in info21 */
typedef [bitmap32bit] bitmap {
- SAMR_FIELD_NAME = 0x0002,
+ SAMR_FIELD_ACCOUNT_NAME = 0x0001,
+ SAMR_FIELD_FULL_NAME= 0x0002,
SAMR_FIELD_DESCRIPTION = 0x0010,
SAMR_FIELD_COMMENT = 0x0020,
SAMR_FIELD_LOGON_SCRIPT = 0x0100,
Modified: branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
===
--- branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c 2005-03-13
03:16:07 UTC (rev 5782)
+++ branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c 2005-03-13
06:43:34 UTC (rev 5783)
@@ -2635,6 +2635,10 @@
SET_STRING(msg, info6.full_name.string,displayName);
break;
+ case 7:
+ SET_STRING(msg, info7.account_name.string,
samAccountName);
+ break;
+
case 8:
SET_STRING(msg, info8.full_name.string,displayName);
break;
@@ -2674,7 +2678,9 @@
case 21:
#define IFSET(bit) if (bit r-in.info-info21.fields_present)
- IFSET(SAMR_FIELD_NAME)
+ IFSET(SAMR_FIELD_ACCOUNT_NAME)
+ SET_STRING(msg, info21.account_name.string,
samAccountName);
+ IFSET(SAMR_FIELD_FULL_NAME)
SET_STRING(msg, info21.full_name.string,
displayName);
IFSET(SAMR_FIELD_DESCRIPTION)
SET_STRING(msg, info21.description.string,
description);
@@ -2704,7 +2710,9 @@
case 23:
#define IFSET(bit) if (bit r-in.info-info23.info.fields_present)
- IFSET(SAMR_FIELD_NAME)
+ IFSET(SAMR_FIELD_ACCOUNT_NAME)
+ SET_STRING(msg, info23.info.account_name.string,
samAccountName);
+ IFSET(SAMR_FIELD_FULL_NAME)
SET_STRING(msg, info23.info.full_name.string,
displayName);
IFSET(SAMR_FIELD_DESCRIPTION)
SET_STRING(msg, info23.info.description.string,
description);
@@ -2756,7 +2764,9 @@
case 25:
#define IFSET(bit) if (bit r-in.info-info25.info.fields_present)
- IFSET(SAMR_FIELD_NAME)
+ IFSET(SAMR_FIELD_ACCOUNT_NAME)
+ SET_STRING(msg, info25.info.account_name.string,
samAccountName);
+ IFSET(SAMR_FIELD_FULL_NAME)
SET_STRING(msg, info25.info.full_name.string,
displayName);
IFSET(SAMR_FIELD_DESCRIPTION)
SET_STRING(msg, info25.info.description.string,
description);
Modified: branches/SAMBA_4_0/source/torture/rpc/samr.c
===
--- branches/SAMBA_4_0/source/torture/rpc/samr.c2005-03-13 03:16:07 UTC
(rev 5782)
+++ branches/SAMBA_4_0/source/torture/rpc/samr.c2005-03-13 06:43:34 UTC
(rev 5783)
@@ -28,8 +28,8 @@
#define TEST_ACCOUNT_NAME samrtorturetest
#define TEST_ALIASNAME samrtorturetestalias
#define TEST_GROUPNAME samrtorturetestgroup
-#define TEST_MACHINENAME samrtorturetestmach$
-#define TEST_DOMAINNAME samrtorturetestdom$
+#define TEST_MACHINENAME samrtestmach$
+#define TEST_DOMAINNAME samrtestdom$
static BOOL test_QueryUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
@@ -162,7 +162,8 @@
static BOOL test_SetUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-struct policy_handle *handle, uint32_t
base_acct_flags)
+struct policy_handle *handle, uint32_t
base_acct_flags,
+const char *base_account_name)
{
NTSTATUS status;
struct samr_SetUserInfo s;
@@ -171,6 +172,7 @@
struct samr_QueryUserInfo q0;
union samr_UserInfo u;
BOOL ret = True;
+ const char *test_account_name;
uint32_t user_extra_flags = 0;
if (base_acct_flags == ACB_NORMAL) {
@@ -191,24 +193,24
