[Samba] smbpasswd - RAP86 error - 3.0.20
System Fedora Core 4/SeLinuxSecurity disabled SAMBA 3.0.20 unix password sync=yes passwd backend smbpasswd Problem - Users logged into XP pro cannot change password Detail: When a user tries to change their password they get the error message: You do not have permission to change your password. However - the Linux password is changed and the SAMBA password is not. logging in to Fedora as root and invoking passwd and smbpasswd for the user returns no errors su 'username' and repeating the process (with good password given) passwd - okay smbpasswd - machine 127.0.0.1 rejected the password change: Error was: RAP86: The specified password is invalid. The only difference if you use a bad password - passwd won't allow the change either. So my conclusion thus far is that passwd is being invoked as root but smbpasswd is being invoked as the logged in user and refuses the password change. However, I have no idea what to do now and I cannot set unix passwd sync = no (even though that fixes it) - Please help -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba + OpenLDAP: LDAP server is running but could not respond to a search request
Hi, all. I am trying to set up SAMBA PDC with OpenLDAP using smbldap-tools from IDEALX. This is on a SLES 9 and I had run the latest online update as well as SP1 and SP2 for it. At this point smb is off and ldap is running. I have gotten up to where I needed to test for: ldapsearch -x -b dc=sample,dc=com (ObjectClass=*) # extended LDIF # # LDAPv3 # base dc=sample,dc=com with scope sub # filter: (objectClass=*) # requesting: ALL # # search result search: 2 result: 0 Success # numResponses: 1 Here is the log for this request from /var/log/ldaplogs Sep 9 04:32:51 Ns02 slapd[10449]: conn=52 fd=18 ACCEPT from IP= 127.0.0.1:1510 http://127.0.0.1:1510 (IP=0.0.0.0:389 http://0.0.0.0:389) Sep 9 04:32:51 Ns02 slapd[10449]: conn=52 op=0 BIND dn= method=128 Sep 9 04:32:51 Ns02 slapd[10449]: conn=52 op=0 RESULT tag=97 err=0 text= Sep 9 04:32:51 Ns02 slapd[10449]: conn=52 op=1 SRCH base=dc=nanostellar,dc=com scope=2 deref=0 filter=(objectClass=*) Sep 9 04:32:51 Ns02 slapd[10449]: conn=52 op=1 SEARCH RESULT tag=101 err=0 nentries=0 text= Sep 9 04:32:51 Ns02 slapd[10449]: conn=52 op=2 UNBIND Sep 9 04:32:51 Ns02 slapd[10449]: conn=52 fd=18 closed If you looked at the log, the second line where BIND dn=, I don't know if this is correct or an indication that something is missing. slapcat getent password getent group smbldap-useradd -m -a testuser smbldap-passwd testuser id testuser pdbedit -Lv testuser all of these tests work fine. However, net groupmap list [2005/09/09 04:39:30, 0] passdb/pdb_ldap.c:ldapsam_setsamgrent(2763) ldapsam_setsamgrent: LDAP search failed: No such object [2005/09/09 04:39:30, 0] passdb/pdb_ldap.c:ldapsam_enum_group_mapping(2828) ldapsam_enum_group_mapping: Unable to open passdb Here is the log for this command: Sep 9 04:39:52 Ns02 slapd[10449]: conn=61 fd=18 ACCEPT from IP= 127.0.0.1:1519 http://127.0.0.1:1519 (IP=0.0.0.0:389 http://0.0.0.0:389) Sep 9 04:39:52 Ns02 slapd[10449]: conn=61 op=0 BIND dn=cn=Admin,dc=sample,dc=com method=128 Sep 9 04:39:52 Ns02 slapd[10449]: conn=61 op=0 BIND dn=cn=Admin,dc=sample,dc=com mech=SIMPLE ssf=0 Sep 9 04:39:52 Ns02 slapd[10449]: conn=61 op=0 RESULT tag=97 err=0 text= Sep 9 04:39:52 Ns02 slapd[10449]: conn=61 op=1 SRCH base= scope=0 deref=0 filter=(objectClass=*) Sep 9 04:39:52 Ns02 slapd[10449]: conn=61 op=1 SRCH attr=supportedControl Sep 9 04:39:52 Ns02 slapd[10449]: conn=61 op=1 SEARCH RESULT tag=101 err=0 nentries=1 text= Sep 9 04:39:52 Ns02 slapd[10449]: conn=61 op=2 SRCH base=dc=sample,dc=com scope=2 deref=0 filter=((objectClass=sambaDomain)(sambaDomainName=sample)) Sep 9 04:39:52 Ns02 slapd[10449]: conn=61 op=2 SRCH attr=sambaDomainName sambaNextRid sambaNextUserRid sambaNextGroupRid sambaSID sambaAlgorithmicRidBase objectClass Sep 9 04:39:52 Ns02 slapd[10449]: conn=61 op=2 SEARCH RESULT tag=101 err=0 nentries=1 text= Sep 9 04:39:52 Ns02 slapd[10449]: conn=61 op=3 SRCH base=ou=Goups,dc=sample,dc=com scope=2 deref=0 filter=(objectClass=sambaGroupMapping) Sep 9 04:39:52 Ns02 slapd[10449]: conn=61 op=3 SRCH attr=gidNumber sambaSID sambaGroupType sambaSIDList description displayName cn objectClass Sep 9 04:39:52 Ns02 slapd[10449]: conn=61 op=3 SEARCH RESULT tag=101 err=32 nentries=0 text= Sep 9 04:39:52 Ns02 slapd[10449]: conn=61 fd=18 close Please help me as I am struggling with this for more than a week already and still do not advance any further. Thank you very much for your help. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] encrypted file system with samba
Hi there - does anyone have a good cookbook how-to for using samba with an encrypted file system? Or even some pointers to get me in the right direction. Thanks! Dustin -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba + OpenLDAP: LDAP server is running but could not respond to a search request
Steven Truong wrote: If you looked at the log, the second line where BIND dn=, I don't know if this is correct or an indication that something is missing. It means bind anonymously, make sure you give suficient raed access for anon user. What ldap * suffix in smb.conf? try searching from there, ie. ldapsearch -xLLL -b dc=sample,dc=com uid=testuser However, net groupmap list [2005/09/09 04:39:30, 0] passdb/pdb_ldap.c:ldapsam_setsamgrent(2763) ldapsam_setsamgrent: LDAP search failed: No such object [2005/09/09 04:39:30, 0] passdb/pdb_ldap.c:ldapsam_enum_group_mapping(2828) ldapsam_enum_group_mapping: Unable to open passdb Did you already run net groupmap add? http://us1.samba.org/samba/docs/man/Samba-HOWTO-Collection/groupmapping.html -- --beast -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Activate HTML Pages
Hi All, I have a design some html pages. Now I want to activate it throug Samba Server, infact I have no Idea, how active my page so that every user able to access it. It should be treated like a web pages. Thanks Rajeev -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] SuSE 9.3 samba binaries FUBAR??
Mates, I dunno if nobody else is using the samba binaries to put 3.0.20-1 on SuSE 9.3 -- or -- if I'm just doing something stupid, but there seem to be library problems. Specifically, we are getting library errors for the *.so.2 libraries, regardless of whether we try via YAST or RPM. [EMAIL PROTECTED]:~/Documents/linux/rpms/samba320 ll total 19970 -rw-r--r-- 1 david users 60998 2005-09-09 22:24 cifs-mount-3.0.20-0.1.i586.rpm -rwx-- 1 david users 61244 2005-09-09 22:24 ldapsmb-1.33-3.i586.rpm -rwx-- 1 david users 747362 2005-09-09 22:24 libsmbclient3-3.0.20-1.i586.rpm -rwx-- 1 david users 714166 2005-09-09 22:24 libsmbclient3-devel-3.0.20-1.i586.rpm -rwx-- 1 david users 2955213 2005-09-09 22:24 samba3-3.0.20-1.i586.rpm -rwx-- 1 david users 8008179 2005-09-09 22:24 samba3-client-3.0.20-1.i586.rpm -rwx-- 1 david users 72193 2005-09-09 22:24 samba3-pdb-3.0.20-1.i586.rpm -rwx-- 1 david users 5744281 2005-09-09 22:24 samba3-python-3.0.20-1.i586.rpm -rwx-- 1 david users 154476 2005-09-09 22:24 samba3-vscan-0.3.6-1.i586.rpm -rwx-- 1 david users 1892868 2005-09-09 22:24 samba3-winbind-3.0.20-1.i586.rpm nemesis:/home/david/Documents/linux/rpms/samba320 # rpm -Uvh * warning: cifs-mount-3.0.20-0.1.i586.rpm: V3 DSA signature: NOKEY, key ID 414a57c3 error: Failed dependencies: perl-ldap is needed by ldapsmb-1.33-3 liblber.so.2 is needed by libsmbclient3-3.0.20-1 libldap.so.2 is needed by libsmbclient3-3.0.20-1 liblber.so.2 is needed by samba3-3.0.20-1 libldap.so.2 is needed by samba3-3.0.20-1 liblber.so.2 is needed by samba3-client-3.0.20-1 libldap.so.2 is needed by samba3-client-3.0.20-1 libreadline.so.4 is needed by samba3-client-3.0.20-1 libmysqlclient.so.12 is needed by samba3-pdb-3.0.20-1 python 2.3.99 is needed by samba3-python-3.0.20-1 liblber.so.2 is needed by samba3-python-3.0.20-1 libldap.so.2 is needed by samba3-python-3.0.20-1 liblber.so.2 is needed by samba3-winbind-3.0.20-1 libldap.so.2 is needed by samba3-winbind-3.0.20-1 Now in SuSE 9.3, the installed libraries are: [EMAIL PROTECTED]:~/Documents/linux/rpms/samba320 ls /usr/lib/libl* /usr/lib/liblber-2.2.so.7 /usr/lib/libldapcpp.so.0 /usr/lib/liblirc_client.so/usr/lib/libltdl.so.3 /usr/lib/liblber-2.2.so.7.0.16 /usr/lib/libldapcpp.so.0.0.3 /usr/lib/liblirc_client.so.0 /usr/lib/libltdl.so.3.1.1 /usr/lib/liblcms.so.1 /usr/lib/libldap_r-2.2.so.7 /usr/lib/liblirc_client.so.0.0.0 /usr/lib/liblwres.so.1 /usr/lib/liblcms.so.1.0.14 /usr/lib/libldap_r-2.2.so.7.0.16 /usr/lib/libltdl.a/usr/lib/liblwres.so.1.2.2 /usr/lib/libldap-2.2.so.7 /usr/lib/liblirc_client.a /usr/lib/libltdl.la /usr/lib/libldap-2.2.so.7.0.16 /usr/lib/liblirc_client.la /usr/lib/libltdl.so So, it looks like the SuSE 3.0.20-1 libraries are looking for outdated libraries?? I had no trouble installing 3.0.20 on my SuSE 9.0 box, but it is a no-go on the 9.3 box. So, what say the experts -- 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 -- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Samba + OpenLDAP: LDAP server is running but could notrespond to a search request
Have you face the problem that the smbldap-adduser would not declare the new user as objectClass=sambaSamAccount. I use smbldap-adduser smbldap-passwd (smbldap-tools-0.9.1-1) to add new user 'testuser1', and then use Softerra (TM) LDAP Browser 2.6 on Window client to browse the LDAP data. I found that the user 'testuser1' is only declared as objectClass 'top,inetOrgPerson,posixAccount shadowAccount', but NOT 'sambaSamAccount'. The error 'no such object' may be caused by the missing of declaration 'sambaSamAccount'. Beast [EMAIL PROTECTED] ??? news:[EMAIL PROTECTED] ???... Steven Truong wrote: If you looked at the log, the second line where BIND dn=, I don't know if this is correct or an indication that something is missing. It means bind anonymously, make sure you give suficient raed access for anon user. What ldap * suffix in smb.conf? try searching from there, ie. ldapsearch -xLLL -b dc=sample,dc=com uid=testuser However, net groupmap list [2005/09/09 04:39:30, 0] passdb/pdb_ldap.c:ldapsam_setsamgrent(2763) ldapsam_setsamgrent: LDAP search failed: No such object [2005/09/09 04:39:30, 0] passdb/pdb_ldap.c:ldapsam_enum_group_mapping(2828) ldapsam_enum_group_mapping: Unable to open passdb Did you already run net groupmap add? http://us1.samba.org/samba/docs/man/Samba-HOWTO-Collection/groupmapping.html -- --beast -- 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] File permission problems
Hi knowledgeable samba users, I had to upgrade from samba 2.2.0 on a suse linux server (7.2). Server died after two 2+ years of loyal services - otherwise I would not have changed... Now I have a samba 3.0.9-2.6 on suse 9.1. I can access the files only r-x, i.e. all files appear as read only. Trying to trouble shoot I have: - chmod-ed all the files of all the shares to 777 - in swat put the masks to 777 in the global section - in swat put the masks to 777 in all the shares It is a home office environment where I access the SMB server from XP and W2K stations. Is there anywhere else I should look at? thanks in advance, Dominique __ Switch to Netscape Internet Service. As low as $9.95 a month -- Sign up today at http://isp.netscape.com/register Netscape. Just the Net You Need. New! Netscape Toolbar for Internet Explorer Search from anywhere on the Web and block those annoying pop-ups. Download now at http://channels.netscape.com/ns/search/install.jsp -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] smbpasswd and LDAP backend
Dear List, If I have a PDC with an LDAP backend, would just running smbpasswd username update the users passwd in both the LDAP directory and smb secrets? Thanks, Paul. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] File permission problems
[EMAIL PROTECTED] wrote: Hi knowledgeable samba users, I had to upgrade from samba 2.2.0 on a suse linux server (7.2). Server died after two 2+ years of loyal services - otherwise I would not have changed... Now I have a samba 3.0.9-2.6 on suse 9.1. I can access the files only r-x, i.e. all files appear as read only. Have you moved the files and users from the old server? Are the owner of the home directories the one you would expect, i.e. does the user xyz own the directory /home/xyz: ls -ld /home/xyz (replace xyz with some real owners). What does the command testparm write? Mogens -- Mogens Kjaer, Carlsberg A/S, Computer Department Gamle Carlsberg Vej 10, DK-2500 Valby, Denmark Phone: +45 33 27 53 25, Fax: +45 33 27 47 08 Email: [EMAIL PROTECTED] Homepage: http://www.crc.dk -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE [Samba] smbpasswd and LDAP backend
I think you have to use smbldap-tools (available at samba.org) Cyrille Paul Henry [EMAIL PROTECTED] Envoyé par : [EMAIL PROTECTED] 09/09/2005 09:43 Veuillez répondre à [EMAIL PROTECTED] A samba@lists.samba.org cc Objet [Samba] smbpasswd and LDAP backend Dear List, If I have a PDC with an LDAP backend, would just running smbpasswd username update the users passwd in both the LDAP directory and smb secrets? Thanks, Paul. -- 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] cups driver
hello i think always the same problem :( so i would like to put drivers on my samba server in $print in howto they said in section Add printer wizard driver installation chap 20 : Do not click on Yes! Instead, click on No in the error dialog. Now you will be presented with the printer properties window. From here, the way to assign a driver to a printer is open. - Select a driver from the pop-up list of installed drivers. Initially this list will be empty. ok it's really empty but i cannot add new driver (hide) so what can i do ? so what's wrong thank you ! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] cups driver
Hi. Do you have print admin privileges? Best Regards, Bruno Guerreiro -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: sexta-feira, 9 de Setembro de 2005 9:55 To: samba@lists.samba.org Subject: [Samba] cups driver hello i think always the same problem :( so i would like to put drivers on my samba server in $print in howto they said in section Add printer wizard driver installation chap 20 : Do not click on Yes! Instead, click on No in the error dialog. Now you will be presented with the printer properties window. From here, the way to assign a driver to a printer is open. - Select a driver from the pop-up list of installed drivers. Initially this list will be empty. ok it's really empty but i cannot add new driver (hide) so what can i do ? so what's wrong thank you ! -- 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: RE: [Samba] cups driver
hi, how do i configure the admin privileges ? because i'm logged in administrator account on my windows i don't understand ... thanks Hi. Do you have print admin privileges? Best Regards, Bruno Guerreiro -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: sexta-feira, 9 de Setembro de 2005 9:55 To: samba@lists.samba.org Subject: [Samba] cups driver hello i think always the same problem :( so i would like to put drivers on my samba server in $print in howto they said in section Add printer wizard driver installation chap 20 : Do not click on Yes! Instead, click on No in the error dialog. Now you will be presented with the printer properties window. From here, the way to assign a driver to a printer is open. - Select a driver from the pop-up list of installed drivers. Initially this list will be empty. ok it's really empty but i cannot add new driver (hide) so what can i do ? so what's wrong thank you ! -- 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: RE: [Samba] cups driver
First thing first? Which samba release are you using? Bruno Guerreiro -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: sexta-feira, 9 de Setembro de 2005 10:19 To: [EMAIL PROTECTED] Cc: samba@lists.samba.org Subject: Re: RE: [Samba] cups driver hi, how do i configure the admin privileges ? because i'm logged in administrator account on my windows i don't understand ... thanks Hi. Do you have print admin privileges? Best Regards, Bruno Guerreiro -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: sexta-feira, 9 de Setembro de 2005 9:55 To: samba@lists.samba.org Subject: [Samba] cups driver hello i think always the same problem :( so i would like to put drivers on my samba server in $print in howto they said in section Add printer wizard driver installation chap 20 : Do not click on Yes! Instead, click on No in the error dialog. Now you will be presented with the printer properties window. From here, the way to assign a driver to a printer is open. - Select a driver from the pop-up list of installed drivers. Initially this list will be empty. ok it's really empty but i cannot add new driver (hide) so what can i do ? so what's wrong thank you ! -- 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] Samba 3.0.14 + W2K3 Terminal Services + terminal server profiles
hi, does samba 3.0.14 supports terminal server profiles? If not, is it planned? Regards, Alex -- * Alexander Födisch - Central IT Department- Max Planck Institute for Evolutionary Anthropology Deutscher Platz 6 D-04103 Leipzig Germany Email: [EMAIL PROTECTED] Phone: (+49) 0341 3550-168 Fax:(+49) 0341 3550-119 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] cups driver
hi , so my samba server : $ smbd -V Version 3.0.14a-Debian and my smb.conf : [global] log file = /var/log/samba/log.%m dns proxy = no netbios name = pykota security = user passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n . server string = sprint socket options = TCP_NODELAY invalid users = root obey pam restrictions = yes workgroup = PyKoTa os level = 20 auto services = printers encrypt passwords = true syslog = 0 passwd program = /usr/bin/passwd %u passdb backend = tdbsam guest panic action = /usr/share/samba/panic-action %d max log size = 1000 load printer = Yes printing = cups printcap name = cups use client driver = yes [printers] comment = All Printers browseable = Yes path = /tmp printable = yes public = yes writable = no create mode = 0700 # Windows clients look for this share name as a source of downloadable # printer drivers [print$] comment = Printer Drivers path = /var/lib/samba/printers browseable = yes read only = yes guest ok = yes # Uncomment to allow remote administration of Windows print drivers. # Replace 'ntadmin' with the name of the group your admin users are # members of. write list = root, @ntadmin i've just seen in my config invalid users = root- it's important ? i did smbpasswd -a root ? usefull or useless ? thanks -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] file permission problems
Hi knowledgeable samba users, I had to upgrade from samba 2.2.0 on a suse linux server (7.2). Server died after two 2+ years of loyal services - otherwise I would not have changed... Now I have a samba 3.0.9-2.6 on suse 9.1. I can access the files only r-x, i.e. all files appear as read only. Trying to trouble shoot I have: - chmod-ed all the files of all the shares to 777 - in swat put the masks to 777 in the global section - in swat put the masks to 777 in all the shares It is a home office environment where I access the SMB server from XP and W2K stations. Is there anywhere else I should look at? thanks in advance, Dominique __ Switch to Netscape Internet Service. As low as $9.95 a month -- Sign up today at http://isp.netscape.com/register Netscape. Just the Net You Need. New! Netscape Toolbar for Internet Explorer Search from anywhere on the Web and block those annoying pop-ups. Download now at http://channels.netscape.com/ns/search/install.jsp -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] cups driver
[EMAIL PROTECTED] schrieb: hello i think always the same problem :( so i would like to put drivers on my samba server in $print try to do it like this: 2) configure your CUPS printer, make sure your server can print on that printer 1) put PostScript drivers into /usr/share/cups/drivers: ps5ui.dll pscript5.dll pscript.hlp pscript.ntf These four files you will find on every Windows XP workstation. 2) configure your CUPS printer, make sure your server can print on that printer 3) when printer works, reload (or restart) Samba - it has to be aware of new printers: /etc/init.d/smb reload (or restart) 4) finally, add cups drivers to a given printer: # cupsaddsmb -U Administrator -a -v where Administrator is the domain admin. You will be prompted for a password, and after supplying one, the drivers will be attached to a given printer. 5) right click on the printer from the server, and choose Connect. the drivers will be downloaded from the workstation to the server automatically. You can do it also in startup scripts - so you don't even need to touch any workstation, and can do everything remotely: This one has to be executed as Administrator or SYSTEM - you can use WPKG for that :) rundll32 printui.dll,PrintUIEntry /q /y /ga /in /n \\server\kyocera And once again, as a user netlogon script: rundll32 printui.dll,PrintUIEntry /q /y /ga /in /n \\server\kyocera That's because the normal user has no permission to set a new printer, unless it's first installed on the workstation by someone with appropriate privileges. -- Tomek http://wpkg.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba 2.2.5 Domain Administrator
Although I will be updating this server to Samba 3.x soon, I have to come up with a quick solution as soon as possible for the following problem: I have a WinXP user which currently is registered as a User of WinXP but must be changed to Domain Admin in order for some new software which he must use to be operable. Of course giving him the root passwd is definately out of the question. I already have the domain admin group = @domadm parameter in my smb.conf file and the only memeber of domadm is root. I added via YAST the user to domadm group as well (was only a member of users group) but when I try to use any Admin issues in WinXP when the user logs in, I see that he doesn't have the priviledges required. It appears that the user is not an admin user as stated in smb.conf. I have also tried domain admin group = @domadm johnq as well (where johnyq is the username of the user which logs in) but still nothing! Does the user by any chance have to be a memeber only of the domadm group or can he be a memeber of users domadm at the same time, or is this an irrelevant issue? Thank you all for your help! Chris PS: SuSE 8.1 running Samba 2.2.5. Samba is running lovely for all Win users (98, XP, 2000 etc) including the user in question, up to now that I have to give hime Admin priviledges. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] cups driver
Hi, -Original Message- From: stenon [mailto:[EMAIL PROTECTED] Sent: sexta-feira, 9 de Setembro de 2005 10:34 To: Bruno Guerreiro; samba@lists.samba.org Subject: Re: [Samba] cups driver hi , so my samba server : $ smbd -V Version 3.0.14a-Debian and my smb.conf : [global] log file = /var/log/samba/log.%m dns proxy = no netbios name = pykota security = user passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n . server string = sprint socket options = TCP_NODELAY invalid users = root obey pam restrictions = yes workgroup = PyKoTa os level = 20 auto services = printers encrypt passwords = true syslog = 0 passwd program = /usr/bin/passwd %u passdb backend = tdbsam guest panic action = /usr/share/samba/panic-action %d max log size = 1000 load printer = Yes printing = cups printcap name = cups use client driver = yes [printers] comment = All Printers browseable = Yes path = /tmp printable = yes public = yes writable = no create mode = 0700 # Windows clients look for this share name as a source of downloadable # printer drivers [print$] comment = Printer Drivers path = /var/lib/samba/printers browseable = yes read only = yes guest ok = yes # Uncomment to allow remote administration of Windows print drivers. # Replace 'ntadmin' with the name of the group your admin users are # members of. write list = root, @ntadmin i've just seen in my config invalid users = root- it's important ? I think it, as it is in the global section I believe it prevents root from connecting to any share ( file/print). Since you're using 3.0.14a you should have a printer admin = users_or_groups_who_admin_printers You are using the local windows Administrator account. I believe that when you logon to the samba services, you send the user in this format: winmachinename\administrator. Does that user belong to the administrators group at the Samba box? Or does it get mapped to root via smbusers? Hope this helps, Bruno Guerreiro i did smbpasswd -a root ? usefull or useless ? thanks -- 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.14 + W2K3 Terminal Services + terminal server profiles
Alexander Födisch schrieb: hi, does samba 3.0.14 supports terminal server profiles? If not, is it planned? I don't really know what you mean by terminal server profiles, so this answer might not be quite correct. Here we have a Samba PDC/LDAP master in a central location, and lots of BDCs (over WAN/VPN). We also have one W2K3 Terminal Server, which folks from remote locations use. We just joined this TS to the domain, and use the Samba PDC to keep roaming profiles. -- Tomek http://wpkg.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Authentication problem
Hello,
os: linux 2.4.30
samba: 3.0.20
I have a problem with authentication of squid users in AD.
For trying to resolve this problem run script:
--cut--
#!/bin/sh
while [ 1 = 1 ]; do {
echo ''
/bin/date
/usr/bin/wbinfo -a 'domain\user'%'password'
/bin/date
sleep 2
echo
};
done
--cut--
and logging it`s output:
--cut--
...
Thu Sep 8 16:29:06 MSD 2005
plaintext password authentication succeeded
challenge/response password authentication succeeded
Thu Sep 8 16:29:06 MSD 2005
Thu Sep 8 16:29:08 MSD 2005
plaintext password authentication succeeded
challenge/response password authentication succeeded
Thu Sep 8 16:30:09 MSD 2005
Thu Sep 8 16:30:11 MSD 2005
plaintext password authentication succeeded
challenge/response password authentication succeeded
Thu Sep 8 16:30:11 MSD 2005
...
--cut--
at 16:29:08 there is a pause in authentication process.
at 16:32:01 squid dying whith Too many queued ntlmauthenticator requests (251
on 50)
Observe this error 2-3 times per day.
Thanks for any help.
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] sambaLMPassowrd and sambaNTPassword
Hi all, I have plan to upgrade samba 3.0.2 to current release, aparently some work must be done on the user entries on LDAP since the samba.schema has change. While do some changes, I want to remove sambaLMPassword attribute so I don't need to maintain it in sync with sambaNTPassword. Will I break something if I remove this attribute? -- --beast -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba 2.2.5 Domain Administrator
Chris Roubekas wrote: Although I will be updating this server to Samba 3.x soon, I have to come up with a quick solution as soon as possible for the following problem: I have a WinXP user which currently is registered as a User of WinXP but must be changed to Domain Admin in order for some new software which he must use to be operable. Of course giving him the root passwd is definately out of the question. You might consider using sanur to give user permission to install software. http://www.commandline.co.uk/sanur/ -- --beast -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] smbpasswd and LDAP backend
Paul Henry wrote: Dear List, If I have a PDC with an LDAP backend, would just running smbpasswd username update the users passwd in both the LDAP directory and smb secrets? Yes, as long as you give the correct setting for passwd program in smb.conf. -- --beast -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] cups driver
hi, it's almost good ! i can add new driver and it's uploading in my $print share on my samba server but when i want to save my change ... printer configuration connot be saved, access denied so i have change access on my directory /var/lib/samba/printers ... nothing where could i see my access denied ? which directory is it ? because logs are empty thanks ... -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba as a domain controller for Linux workstations?
I managed to download from Resolvo website and installed on a Suse Server. Was able to create new Samba shares and users via the management console. Anyone tried the Migration Tool? I don't have a NT 4 Server running, but it'll be cool if the tool worked. Regards, Alysson On 02/09/05, Bruno Guerreiro [EMAIL PROTECTED] wrote: Hi, Trying to download the tar.gz gives me a 404. Do you know any other place to get it? Thanks, Bruno Guerreiro -Original Message- From: Alysson Chen [mailto:[EMAIL PROTECTED] Sent: sexta-feira, 2 de Setembro de 2005 7:43 To: samba@lists.samba.org Subject: [Samba] Samba as a domain controller for Linux workstations? I came across this product called Quro http://www.resolvo.com/products/quro/index.htm It seems to have a web-based centralised management console that allows you to configure ldap and samba without having to edit smb.conf file. It supposedly comes with a migration tool to migrate all NT/2000 server users profiles to a Linux server too. Regards, Alysson Well, basically I only wanted to know how would it look if we wanted one day to switch the whole company or half of it to Linux workstations. So I can see, there are lots of approaches, but there are some serious problems: - no standard, as Samba in a Windows world (i.e., widely used) - laptop users will have a problem if they are out of the company building - have to engineer, build, test, everything from scratch; with Samba, 90% of work is editing the smb.conf file What we talk about is a little not very specific to this Samba group, but certainly it is nice to hear how the things can be solved in the UNIX/Linux environment. -- Tomek http://wpkg.org -- 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] multi-domain authentication
with local you mean DOMA or the samba workstation itself? we recently implemented a one-way trust between DOMA and DOMB to allow MS Terminal Server users to authenticate users from both domains. all member servers (samba) have to use winbindd to see trusted accounts. please read the appropriate chapters in JHT's docs and trust settings in smb.conf. then you will be able to specify valid users = DOMA\joe DOMB\joe for example. greez David F. Newman wrote: On Thursday 08 September 2005 02:34, Michael Gasch wrote: David F. Newman wrote: Can samba be used with security = server to authenticate a user in a domain other than what the samba server is in? i.e. The samba server is set to workgroup NA and I have a user called EU\joe that is trying to access a share but it seems it is checking the password against NA\joe. I have a username map of joe EU\joe i think you have to establish a trust between DOM NA and DOM EU - for this to work you have to deal with winbindd, too. mapping won't be sufficient until your users (joe EU\joe) have the same passwords I am not looking to authenticate shell access against a windows server. I'm only trying to authenticate access to smbd against a windows server. I'm using security = server with the password server set to the domain controllers of my local domain. There is a trust between the two domains. But smbd only seems to authenticate users who are in the local domain. -Dave -- Michael Gasch Max Planck Institute for Evolutionary Anthropology Department of Human Evolution (IT) Deutscher Platz 6 D-04103 Leipzig Germany Phone: 49 (0)341 - 3550 137 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] smbpasswd and LDAP backend
Hello, you have to set unix password sync = No ldap passwd sync = Yes and use an LDAP-server that supports the password modify extended operation (like OpenLDAP). A password change via smbpasswd will update all userPassword attributes of the LDAP entry Mark -- 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.14 + W2K3 Terminal Services + terminal server profiles
Tomasz Chmielewski schrieb: Alexander Födisch schrieb: hi, does samba 3.0.14 supports terminal server profiles? If not, is it planned? I don't really know what you mean by terminal server profiles, so this answer might not be quite correct. Here we have a Samba PDC/LDAP master in a central location, and lots of BDCs (over WAN/VPN). We also have one W2K3 Terminal Server, which folks from remote locations use. We just joined this TS to the domain, and use the Samba PDC to keep roaming profiles. Terminal server profiles are special profiles for terminal server sessions. When you devide normal profiles and terminal server profiles you can for example use local profiles on workstations for domain accounts and romaing profiles on the terminal servers - for the same user account. this means that the pdc have to be able to differ if the machine where the user logs on is a terminal server or not and deliver the appropriate information of the location of the profiles. ts-profiles are necessary when you have a terminal server farm/ cluster because the user should have the same profile on every terminal server. on windows nt4 (and higher) it is possible to differ between this two kinds of profiles. Regards, Alex -- * Alexander Födisch - Central IT Department- Max Planck Institute for Evolutionary Anthropology Deutscher Platz 6 D-04103 Leipzig Germany Email: [EMAIL PROTECTED] Phone: (+49) 0341 3550-168 Fax:(+49) 0341 3550-119 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Office (2003) saving excel sheet takes VERY long..
Thanks alot this solved my Problem! Now time's about 10seconds on wifi.. that's ok! Thanks! John Mazza wrote: Max, I'd try working on the TCP Socket options. Adjust the SO_RCVBUF and SO_SNDBUF values up in steps of 1024, restarting Samba after each change. You can then time the transfers. That should help! On Wed, 07 Sep 2005 19:22:58 +0200, Max Riedel wrote: Hi! Maybe you can help me, would be very nice! I'm new to the list and I'm very glad that it exists... A week ago we migrated to samba and since then it's taking very long to save a 1,8MB excel document. On fast ethernet it takes us about 10 seconds, on wireless lan it can take up to a minute, although transferring the same amount of data from the very same machine, that is connected via 802.11g, to samba (by copying a file) takes only about 3-4seconds over the wireless connection. We use Excel in Office 2003 with SP1. Machine is a WinXP Pro SP2. It looks as if it was Excel's fault, but it also seems to be much slower now since the files are stored on the samba server. Is there any way to enhance Excel's writing or maybe the caching on the server?Most of the files are smaller than 300kbytes, but this particular one is ~1,8MB and used VERY frequently. Samba version is 3.0.20 System's running on an Athlon XP 2.400+, 512MB ram, Redhat Enterprise WS 4 The smb.conf looks like: [global] netbios name = smb workgroup = WORKGROUP server string = Samba Server hosts allow = 192.168.0. guest account = guest log file = /var/log/samba/%m.log max log size = 500 security = user ;oplocks = no ;level2 oplocks = no encrypt passwords = yes smb passwd file = /etc/samba/smbpasswd socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 IPTOS_LOWDELAY ;getwd cache = yes ;dead time = 15 ;read raw = yes ;write raw = yes interfaces = 192.168.0.102/24 remote announce = 192.168.0.255 local master = yes os level = 200 preferred master = yes name resolve order = wins lmhosts bcast wins support = yes dns proxy = no preserve case = no default case = lower case sensitive = no idmap uid = 16777216-33554431 idmap gid = 16777216-33554431 template shell = /bin/false winbind use default domain = no [shared] comment = Temporary file space path = /smb/shared public = yes writeable = yes create mask = 0640 directory mask = 750 force create mode = 020 force directory mode = 020 guest ok = yes force group = users [daten] comment = Root path = /smb/daten valid users = @verwaltung write list = @verwaltung force group = users create mask = 0640 directory mask = 750 force create mode = 020 force directory mode = 020 [folder1] path = /smb/daten/folder1 valid users = @users writeable = yes public = yes force group = users create mask = 0640 directory mask = 750 force create mode = 020 force directory mode = 020 [folder2] path = /smb/daten/folder2/ valid users = @users writeable = no write list = silvia, @verwaltung force group = users create mask = 0640 directory mask = 750 force create mode = 020 force directory mode = 020 Thanks alot for any help! -- 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] Samba 3.0.14 + W2K3 Terminal Services + terminal serverprofiles
does samba 3.0.14 supports terminal server profiles? If not, is it planned? There is no parameter in the backend for the 'Terminal Server Profile Path', 'Terminal Server Home Path' or 'Allow Logon to Terminal Server' variables you see on the Terminal Server tab of an AD user properties. Given the vagueness of the question, is that what you're looking for? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] cups driver
hi yes i'm sure ... i'm logged in administrator (user in administrator group) why did you say machinename ? so my problem is that drivers are well uploaded on samba share $print (/printer/W32X86/3/hp*) but after when i want to finish installation i get : not saved , access denied ??? Bruno Guerreiro a écrit : You're sure the machinename\administrator belongs to the printer admin group? Bruno Guerreiro -Original Message- From: stenon [mailto:[EMAIL PROTECTED] Sent: sexta-feira, 9 de Setembro de 2005 11:40 To: Bruno Guerreiro; samba@lists.samba.org Subject: Re: [Samba] cups driver hi, it's almost good ! i can add new driver and it's uploading in my $print share on my samba server but when i want to save my change ... printer configuration connot be saved, access denied so i have change access on my directory /var/lib/samba/printers ... nothing where could i see my access denied ? which directory is it ? because logs are empty thanks ... -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] couldn't find service ???
Brought back on list so that others may benefit... Do you have a [homes] share specified and a valid home directory for antonyf? No. Might that be a problem ? I just have two shares, [Profiles] and [Netlogon] . -- --smb.conf-- [netlogon] comment = Network Logon Service path = /usr/local/lib/samba/netlogon guest ok = no writable = no share modes = no # 'Roving Profile' share (in lieu of the user's home directory) [Profiles] path = /usr/local/lib/samba/profiles browseable = no guest ok = no writable = yes -- --smb.conf-- Most likely it is searching for those missing home directories. That being said and without seeing the rest of your smb.conf, you might find another way around it by making the following 3 values blank; not defaulted, defined as blank: logon path = logon drive = logon home = -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] cups driver
Hi, Because I think when not in NT Domain, every user presents itself as machinename/username. Imagine this: Administrator from PC1 can administrate samba Administrator from PC2 can't administrate samba. If only Administrator was sent, how would they be diferentiated? In fact it also happens on a domain infrastructure. The only difference is that instead of machinename, the domainname is used. Anyone feel free to jump in and correct me, if I'm wrong... (Pre-wekeend brain reboot) Best Regards, Bruno Guerreiro -Original Message- From: stenon [mailto:[EMAIL PROTECTED] Sent: sexta-feira, 9 de Setembro de 2005 14:02 To: Bruno Guerreiro; samba@lists.samba.org Subject: Re: [Samba] cups driver hi yes i'm sure ... i'm logged in administrator (user in administrator group) why did you say machinename ? so my problem is that drivers are well uploaded on samba share $print (/printer/W32X86/3/hp*) but after when i want to finish installation i get : not saved , access denied ??? Bruno Guerreiro a écrit : You're sure the machinename\administrator belongs to the printer admin group? Bruno Guerreiro -Original Message- From: stenon [mailto:[EMAIL PROTECTED] Sent: sexta-feira, 9 de Setembro de 2005 11:40 To: Bruno Guerreiro; samba@lists.samba.org Subject: Re: [Samba] cups driver hi, it's almost good ! i can add new driver and it's uploading in my $print share on my samba server but when i want to save my change ... printer configuration connot be saved, access denied so i have change access on my directory /var/lib/samba/printers ... nothing where could i see my access denied ? which directory is it ? because logs are empty thanks ... -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] cups driver
[print$] comment = Printer Drivers path = /var/lib/samba/printers browseable = yes why you set browseable = yes ?, normally browseable = no read only = yes guest ok = yes # Uncomment to allow remote administration of Windows print drivers. # Replace 'ntadmin' with the name of the group your admin users are # members of. write list = root, @ntadmin I suppose that administrator is in ntadmin group ? [global] log file = /var/log/samba/log.%m dns proxy = no netbios name = pykota security = user passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n . server string = sprint socket options = TCP_NODELAY invalid users = root obey pam restrictions = yes workgroup = PyKoTa os level = 20 auto services = printers encrypt passwords = true syslog = 0 passwd program = /usr/bin/passwd %u passdb backend = tdbsam guest panic action = /usr/share/samba/panic-action %d max log size = 1000 load printer = Yes printing = cups printcap name = cups use client driver = yes Please modify this line : use client driver = no. The permission of /var/lib/printers is correct. try with no invalid users parameter in a second step --- Stéphane PURNELLE [EMAIL PROTECTED] Service Informatique Corman S.A. Tel : 00 32 087/342467 [EMAIL PROTECTED] a écrit sur 09/09/2005 15:02:12 : hi yes i'm sure ... i'm logged in administrator (user in administrator group) why did you say machinename ? so my problem is that drivers are well uploaded on samba share $print (/printer/W32X86/3/hp*) but after when i want to finish installation i get : not saved , access denied ??? Bruno Guerreiro a écrit : You're sure the machinename\administrator belongs to the printer admin group? Bruno Guerreiro -Original Message- From: stenon [mailto:[EMAIL PROTECTED] Sent: sexta-feira, 9 de Setembro de 2005 11:40 To: Bruno Guerreiro; samba@lists.samba.org Subject: Re: [Samba] cups driver hi, it's almost good ! i can add new driver and it's uploading in my $print share on my samba server but when i want to save my change ... printer configuration connot be saved, access denied so i have change access on my directory /var/lib/samba/printers ... nothing where could i see my access denied ? which directory is it ? because logs are empty thanks ... -- 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] CUPS username case wrong from Windows 98 client
I have a problem getting Windows 98 clients printing to CUPS printers where I have the printer access allowed/denied by username. It appears that samba is passing the username in uppercase to CUPS as the owner of the printjob and then CUPS does not recognise that username and rejects the job. It all works under Windows NT/XP. I am running samba 3.0.20 and cups 1.1.23. The smb.conf file is below # Samba config file created using SWAT # from 131.227.115.22 (131.227.115.22) # Date: 2005/05/12 12:36:36 # Global parameters [global] display charset = ASCII workgroup = SEPS netbios name = PHSMB netbios aliases = moria update encrypted = Yes smb passwd file = /etc/samba/smbpasswd private dir = /etc/samba passdb backend = ldapsam:ldap://eldar username map = /etc/samba/smbusers log level = 0 log file = /var/log/samba/log.%m max log size = 1000 name resolve order = wins lmhosts bcast host time server = Yes lpq cache time = 60 max open files = 1000 socket options = TCP_NODELAY SO_SNDBUF=8192 SO_RCVBUF=8192 logon script = logon.cmd logon path = \\phsmb\homes\.winprofile logon drive = H: logon home = \\phsmb\homes domain logons = Yes domain master = No wins server = 131.227.76.25 ldap admin dn = cn=Manager,dc=eps,dc=surrey,dc=ac,dc=uk ldap delete dn = Yes ldap group suffix = ou=Groups ldap idmap suffix = dc=eps,dc=surrey,dc=ac,dc=uk ldap machine suffix = ou=Computers ldap suffix = dc=eps,dc=surrey,dc=ac,dc=uk ldap ssl = no ldap user suffix = ou=People lock directory = /var/cache/samba pid directory = /var/run utmp directory = /var/run wtmp directory = /var/log utmp = Yes template shell = /usr/local/bin/tcsh printing = cups printer admin = phs1dm, phs2jd, @scs hosts allow = 131.227. [netlogon] path = /usr/local/samba/netlogon write list = root, phs1dm [homes] comment = Home Directories read only = No create mask = 0740 directory mask = 0751 browseable = No [printers] comment = All Printers path = /tmp create mask = 0700 printable = Yes browseable = No And here is the relevant printers.conf entry from cups DefaultPrinter wells Info Physics Computer support printer Location 1BC04 DeviceURI cupspykota:socket://wells:9100 State Idle Accepting Yes JobSheets none none QuotaPeriod 0 PageLimit 0 KLimit 0 AllowUser phs1dm /Printer This is the relevant entries from the cups error log D [09/Sep/2005:10:40:13 +] [Job 1] printer-uri = ipp://marvin.ph.surrey.ac.uk:631/printers/wells D [09/Sep/2005:10:40:13 +] [Job 1] requesting-user-name = PHS1DM D [09/Sep/2005:10:40:13 +] [Job 1] job-name = smbprn.0001 Printer Test Page E [09/Sep/2005:10:40:13 +] [Job 1] Print file was not accepted (client-error-not-possible)! E [09/Sep/2005:10:40:13 +] PID 27866 stopped with status 1! Here samba is converting the username as passed from Win 98 in upper case to lower case for authentication but it still passes the upper case username to CUPS. I've turned the debug level up to 20 but I still can't find any log message showing where that is. [2005/09/09 10:39:52, 2] auth/auth.c:(307) check_ntlm_password: authentication for user [PHS1DM] - [PHS1DM] - [phs1dm] succeeded -- David Munro email: [EMAIL PROTECTED] Department of Physics phone: 01483 689415 (direct line) University of Surreyfax: 01483 686781 Guildford, Surrey, UK, GU2 7XH -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Permissions problem - smb 3 and FBSD 5.4-stable
Hi Folks, I'm using samba 3.0.14a_1,1 on FreeBSD 5.4-STABLE. I'm having a problem that all my samba users must be set in 'admins users' directive in smb.conf. Users that aren't on 'admin users' in smb.conf don't have permissions to read/write some shares and their own home directory. Any suggestion? Thanks, Felipe. -- 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.14 + W2K3 Terminal Services + terminal serverprofiles
Paul Gienger schrieb: does samba 3.0.14 supports terminal server profiles? If not, is it planned? There is no parameter in the backend for the 'Terminal Server Profile Path', 'Terminal Server Home Path' or 'Allow Logon to Terminal Server' variables you see on the Terminal Server tab of an AD user properties. Given the vagueness of the question, is that what you're looking for? we use samba with a ldap backend. we do NOT use roaming profiles for the users on their workstations. but I want to use roaming profiles when a user log on on a terminal server (and then only) because we have three citrix ts in a farm. all three ts are identical systems with same software etc. we use loadbalancing between these three ts and the user should have the same settings of applications regardless on which ts the application is running. so you have the possibility to set up the profile path on each terminal server server, but this does not work with the special citrix user Anonymous which we're also using. I hope you can follow me and my mind :) cheers, Alex -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] File permission problems
[EMAIL PROTECTED] wrote: ... chaotic quote removed ... testparm lists section [data1], [data2], and [data3], but they are not listed under services definitions? How many users do you actually have? Do you have any files under /home/user1, /home/user2, etc. for these users? If the owner of these files are not set correctly, you should find the uid and gid in the /etc/passwd file for these users and do a: chown -R uid1.gid1 /home/user1 I guess that swat has changed the global settings for create and directory mask, but you still have to change the settings for the [homes] section. Mogens -- Mogens Kjaer, Carlsberg A/S, Computer Department Gamle Carlsberg Vej 10, DK-2500 Valby, Denmark Phone: +45 33 27 53 25, Fax: +45 33 27 47 08 Email: [EMAIL PROTECTED] Homepage: http://www.crc.dk -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] problem with printing
Hi, I have samba and a printer installed on a FreeBSD 4.11 machine and I am trying to print from a WinXP machine in the same workgroup. This is for a home network so I'm not too worry about security etc. I can see temp files appear in the samba spool directory and the printer spool directory, such as smbprn.00125.0vTiLi, lock, status, errs.FFOJqrb, etc. Interestingly, the printer log file I defined is missing. But of course, the reason I'm posting this is that nothing gets printed. I tried various things I found on google, such as changing the guest account from nobody to an account that can print, different print command, turning on guest only, different create mode permission, etc. File sharing across samba works just fine. I can also print with the printer on the BSD machine. I'm using BSD printing style. The printer shows up on WinXP as access denied, but I heard it's a WinXP problem. Here is my smb.conf # Samba config file created using SWAT # from 192.168.0.100 (192.168.0.100) # Date: 2005/09/07 17:46:57 # Global parameters [global] comment = FreeBSD Haven - Samba %v debuglevel = 5 workgroup = TEST server string = BSD Samba Server security = SHARE encrypt passwords = No log file = /var/log/samba.log.%m max log size = 500 printcap name = /etc/printcap dns proxy = No printing = bsd #print command = lpr -s -P %p %s; rm %s print command = lpr -P %p -o raw %s -r #print command = logger %p %s #guest only = Yes [printers] comment = hp920 connected to FreeBSD create mode = 1777 read only = Yes writable = Yes public = No guest ok = No printable = Yes use client driver = yes browseable = No directory = /tmp [samba] comment = Samba printer printer = samba printable = Yes public = Yes guest ok = Yes path = /var/spool/samba browseable = Yes read only = No -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] admin users not granted administrative privileges
Dear all, When I create a share with the admin users permission (see smb.conf) and map a drive to it from win2k, it does not allow me to: Edit files Create files Remove files Add Directories Remove Directories Each time it gives me a permissions error. And I ever tried adding user1 to the UNIX group that maps to the Windows Domain Admins group: net groupmap modify ntgroup=Domain Admins unixgroup=admins Then add user1 to the admins group in the /etc/group file, but it still doesn't work. Could anybody shed some light? Many thanks, Yuci ---smb.conf--- security = user valid users = user1 admin users = user1 ---samba version --- 3.0.1 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] guest user (from session setup) not permitted to access this share
Reiterating the help request. On Thursday 08 September 2005 06:34 pm, Chris wrote: The Samba logs have many of the subject's lines:: - - [2005/09/08 15:43:48, 2] smbd/service.c:make_connection_snum(314) guest user (from session setup) not permitted to access this share (EACM) [2005/09/08 15:43:48, 2] smbd/service.c:make_connection_snum(314) guest user (from session setup) not permitted to access this share (EACM) - - This is on a Debian 3.0.14a system. The one with the problems I reported earlier in these posts: can't update msaccess mdb file log files created for both the hostname and the IP address? I ran grep 'guest user' /var/log/samba/* and virtually every client log has many of these entries, with virtually every share, going back as far as the logs. Running the same grep command on 4 other PDC's that I have installed (didn't install this one, just trying to troubleshoot) display exactly zero instances of such entries. Help! What is the guest user (from session setup)? Any ideas why is it trying to access shares from the clients? What can I provide to help get this problem resolved? Thank you. Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] log files created for both the hostname and the IP address?
Reiterating the help request. On Thursday 08 September 2005 11:41 am, Chris wrote: At a new account where they run Samba 3.0.14a on a Debian server I'm seeing log files being created for both the hostname and the IP address. The log files, however, are not identical. But the timestamps are close. None of my installations have this quirk. If the hostname is resolvable the log is made using it, if not resolvable then the log is made with the IP address but not both. Any ideas on what could cause this? Thanks. Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] can't update msaccess mdb file
Reiterating the help request. On Thursday 08 September 2005 12:53 pm, Chris wrote: At an account running 3.0.14a Debian (same account as the dual log file issue posted earlier). A user sporadically cannot update an Access mdb file and gets access denied errors. The log: [2005/09/08 12:14:31, 2] smbd/open.c:open_file(245) ginny opened file database/EACM ECC Reports Secure.ldb read=Yes write=Yes (numopen=4) [2005/09/08 12:14:36, 2] smbd/open.c:open_file(245) ginny opened file database/EACM ECC Reports Secure.mdb read=Yes write=No (numopen=5) [2005/09/08 12:14:36, 2] smbd/close.c:close_normal_file(272) ginny closed file database/EACM ECC Reports Secure.mdb (numopen=4) [2005/09/08 12:21:13, 2] smbd/service.c:make_connection_snum(314) guest user (from session setup) not permitted to access this share (EACM) [2005/09/08 12:21:13, 2] smbd/service.c:make_connection_snum(314) guest user (from session setup) not permitted to access this share (EACM) [2005/09/08 12:21:13, 2] smbd/service.c:make_connection_snum(314) guest user (from session setup) not permitted to access this share (EACM) [2005/09/08 12:21:13, 2] smbd/service.c:make_connection_snum(314) guest user (from session setup) not permitted to access this share (EACM) [2005/09/08 12:21:13, 2] smbd/service.c:make_connection_snum(314) guest user (from session setup) not permitted to access this share (EACM) [2005/09/08 12:21:13, 2] smbd/service.c:make_connection_snum(314) guest user (from session setup) not permitted to access this share (EACM) [2005/09/08 12:21:13, 2] smbd/service.c:make_connection_snum(314) guest user (from session setup) not permitted to access this share (EACM) [2005/09/08 12:21:13, 2] smbd/service.c:make_connection_snum(314) guest user (from session setup) not permitted to access this share (EACM) [2005/09/08 12:21:13, 2] smbd/service.c:make_connection_snum(314) guest user (from session setup) not permitted to access this share (EACM) [2005/09/08 12:21:13, 2] smbd/service.c:make_connection_snum(314) guest user (from session setup) not permitted to access this share (EACM) Oplocks are off. smbstatus shows: PID Username Group Machine --- 8896 ginny users backoffice (192.168.1.212) Service pid machine Connected at --- EACM 8896 backofficeThu Sep 8 12:13:52 2005 Locked files: PidDenyMode Access R/WOplock Name -- 8896 DENY_NONE 0x2019f RDWR NONE /home/samba/eacm/database/Secured.ldb Thu Sep 8 12:14:31 2005 8896 DENY_NONE 0x2019f RDWR NONE /home/samba/eacm/database/EACM ECC Reports Secure.ldb Thu Sep 8 12:14:31 2005 8896 DENY_NONE 0x2019f RDWR NONE /home/samba/eacm/database/EACM ECC Reports Secure.mdb Thu Sep 8 12:14:31 2005 8896 DENY_NONE 0x2019f RDWR NONE /home/samba/eacm/database/Secured.mdw Thu Sep 8 12:14:31 2005 Any ideas? Thanks. Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] File permission problem
Hi Mogens,
I'll try more during the week-end but I am sorry all this is not very clear to
me (not your fault).
And I cannot reply directly to the news group, I have to go to the crappy
netscape mail thing to send this...
Anyway, see below.
Thanks again,
Dominique
Mogens Kjaer wrote:
[EMAIL PROTECTED] wrote:
... chaotic quote removed ...
Well it is chaotic because I like to answer inline but OK ;-)
testparm lists section [data1], [data2], and [data3], but
they are not listed under services definitions?
see below
How many users do you actually have? Do you have
any files under /home/user1, /home/user2, etc. for
these users?
currently: 1 active user: myself (uid 500) , the login which I use for samba
and for the linux box itself to work on it. One inactive user (my wife ;-) uid
501) In the future I want more users (my kids are getting bigger :-). I have a
users group (gid 100? I suppose).
But I want to share the /data1 etc. only with 1 user (me), this is more
important and immediately urgent than the homes directory.
If the owner of these files are not set correctly,
you should find the uid and gid in the /etc/passwd
file for these users and do a:
chown -R uid1.gid1 /home/user1
Thank you, but what about the /data1,2,3 ? by whom should they be owned and in
which group should they be for all this to work? This I don't understand.
I guess that swat has changed the global settings
for create and directory mask, but you still have
to change the settings for the [homes] section.
swat did not change much - or I use it wrongly.
the real testparm output, I forgot some parts before:
p1g:/ # testparm
Load smb config files from /etc/samba/smb.conf
Processing section [homes]
Processing section [printers]
Processing section [print$]
Processing section [data1]
Processing section [data2]
Processing section [data3]
Processing section [fun_data]
Loaded services file OK.
Server role: ROLE_STANDALONE
Press enter to see a dump of your service definitions
# Global parameters
[global]
workgroup = HOME
netbios name =
server string = xxx
interfaces = x
update encrypted = Yes
map to guest = Bad Password
guest account = ftp
log level = 2
log file = /var/log/samba/client_log.%m
max log size = 500
debug hires timestamp = Yes
time server = Yes
socket options = SO_KEEPALIVE IPTOS_LOWDELAY TCP_NODELAY
os level = 1
local master = No
domain master = No
wins support = Yes
ldap suffix = dc=example,dc=com
ldap ssl = no
template homedir = /home/%U
admin users = acl
create mask = 0777
directory mask = 0777
veto files = /*.eml/*.nws/riched20.dll/*.{*}/
[homes]
comment = Home Directories
path = /home/%u
valid users = %S
read only = No
create mask = 0640
directory mask = 0750
[printers]
comment = All Printers
path = /var/tmp
create mask = 0600
printable = Yes
browseable = No
[print$]
comment = Printer Drivers
path = /var/lib/samba/drivers
write list = @ntadmin, root
force group = ntadmin
create mask = 0664
directory mask = 0775
[data1]
comment = data55GB
path = /data1
[data2]
comment = data19GB
path = /data2
[data3]
comment = data116GB
path = /data3
create mask = 0775
directory mask = 0775
[fun_data]
comment = fun_data92GB
path = /usr/rem_data1/
create mask = 0775
__
Switch to Netscape Internet Service.
As low as $9.95 a month -- Sign up today at http://isp.netscape.com/register
Netscape. Just the Net You Need.
New! Netscape Toolbar for Internet Explorer
Search from anywhere on the Web and block those annoying pop-ups.
Download now at http://channels.netscape.com/ns/search/install.jsp
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba r10105 - in branches/SAMBA_3_0/source/modules: .
Author: jht Date: 2005-09-09 06:25:28 + (Fri, 09 Sep 2005) New Revision: 10105 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10105 Log: Fix typos. Oops, modules are called objects. Modified: branches/SAMBA_3_0/source/modules/vfs_default_quota.c Changeset: Modified: branches/SAMBA_3_0/source/modules/vfs_default_quota.c === --- branches/SAMBA_3_0/source/modules/vfs_default_quota.c 2005-09-09 04:22:58 UTC (rev 10104) +++ branches/SAMBA_3_0/source/modules/vfs_default_quota.c 2005-09-09 06:25:28 UTC (rev 10105) @@ -34,8 +34,8 @@ * This module takes 2 parametric parameters in smb.conf: * (the default prefix for them is 'default_quota', * it can be overwrittem when you load the module in - * the 'vfs modules' parameter like this: - * vfs modules = default_quota:myprefix) + * the 'vfs object' parameter like this: + * vfs object = default_quota:myprefix) * * prefix:uid parameter takes a integer argument, * it specifies the uid of the quota record, that will be taken for
svn commit: samba r10106 - in branches/SAMBA_3_0/source/modules: .
Author: jht Date: 2005-09-09 06:40:17 + (Fri, 09 Sep 2005) New Revision: 10106 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10106 Log: Fix typos. Oops, more fixes. Modified: branches/SAMBA_3_0/source/modules/vfs_default_quota.c Changeset: Modified: branches/SAMBA_3_0/source/modules/vfs_default_quota.c === --- branches/SAMBA_3_0/source/modules/vfs_default_quota.c 2005-09-09 06:25:28 UTC (rev 10105) +++ branches/SAMBA_3_0/source/modules/vfs_default_quota.c 2005-09-09 06:40:17 UTC (rev 10106) @@ -34,17 +34,17 @@ * This module takes 2 parametric parameters in smb.conf: * (the default prefix for them is 'default_quota', * it can be overwrittem when you load the module in - * the 'vfs object' parameter like this: - * vfs object = default_quota:myprefix) + * the 'vfs objects' parameter like this: + * vfs objects = default_quota:myprefix) * - * prefix:uid parameter takes a integer argument, + * myprefix:uid parameter takes a integer argument, * it specifies the uid of the quota record, that will be taken for * storing the default USER-quotas. * * - default value: '0' (for root user) * - e.g.: default_quota:uid = 65534 * - * prefix:uid nolimit parameter takes a boolean argument, + * myprefix:uid nolimit parameter takes a boolean argument, * it specifies if we should report the stored default quota values, * also for the user record, or if you should just report NO_LIMIT * to the windows client for the user specified by the prefix:uid parameter. @@ -52,14 +52,14 @@ * - default value: yes (that means to report NO_LIMIT) * - e.g.: default_quota:uid nolimit = no * - * prefix:gid parameter takes a integer argument, + * myprefix:gid parameter takes a integer argument, * it's just like prefix:uid but for group quotas. * (NOTE: group quotas are not supported from the windows explorer!) * * - default value: '0' (for root group) * - e.g.: default_quota:gid = 65534 * - * prefix:gid nolimit parameter takes a boolean argument, + * myprefix:gid nolimit parameter takes a boolean argument, * it's just like prefix:uid nolimit but for group quotas. * (NOTE: group quotas are not supported from the windows explorer!) *
svn commit: samba-docs r812 - in trunk/Samba3-HOWTO: .
Author: jht Date: 2005-09-09 06:52:15 + (Fri, 09 Sep 2005) New Revision: 812 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=812 Log: Fixing typos. Modified: trunk/Samba3-HOWTO/TOSHARG-VFS.xml Changeset: Modified: trunk/Samba3-HOWTO/TOSHARG-VFS.xml === --- trunk/Samba3-HOWTO/TOSHARG-VFS.xml 2005-09-09 05:49:26 UTC (rev 811) +++ trunk/Samba3-HOWTO/TOSHARG-VFS.xml 2005-09-09 06:52:15 UTC (rev 812) @@ -138,11 +138,11 @@ /para para - This module takes 2 parametric entries in the mb.conf; file. The default prefix for each is the + This module takes 2 parametric entries in the smb.conf; file. The default prefix for each is the quotedefault_quota/quote. This can be overwrittem when you load the module in the emphasisvfs modules/emphasis parameter like this: screen -vfs modules = default_quota:myprefix) +vfs objects = default_quota:myprefix /screen /para @@ -152,7 +152,7 @@ variablelist varlistentry -termprefix:uid/term +termmyprefix:uid/term listitempara This parameter takes a integer argument that specifies the uid of the quota record that will be used for storing the default user quotas. @@ -161,13 +161,21 @@ para The default value is 0 (for root user). An example of use is: screen -default_quota:uid = 65534 +vfs objects = default_quota +default_quota: uid = 65534 /screen + The above demonstrates the case where the constantmyprefix/constant was omitted, thus the + default prefix is the name of the module. When a constantmyprefix/constant parameter is + specified the above can be re-written like this: +screen +vfs objects = default_quota:myprefix +myprefix: uid = 65534 +/screen /para/listitem /varlistentry varlistentry -termprefix:uid nolimit/term +termmyprefix:uid nolimit/term listitempara This parameter takes a boolean argument that specifies if the stored default quota values also be reported for the user record, or if the value constantNO_LIMIT/constant should be reported to @@ -178,13 +186,14 @@ The default value is constantyes/constant (which means to report NO_LIMIT). An example of use is shown here: screen -default_quota:uid nolimit = no +vfs objects = default_quota:myprefix +myprefix: uid nolimit = no /screen /para/listitem /varlistentry varlistentry - termprefix:gid/term + termmyprefix:gid/term listitempara This parameter takes an integer argument, it's just like the parameterprefix:uid/parameter but for group quotas. NOTE: group quotas are not supported from the windows explorer. @@ -193,13 +202,14 @@ para The default value is 0 (for root group). An example of use is shown here: screen -default_quota:gid = 65534 +vfs objects = default_quota +default_quota: gid = 65534 /screen /para/listitem /varlistentry varlistentry - termprefix:gid nolimit/term + termmyprefix:gid nolimit/term listitempara This parameter takes a boolean argument, just like the parameterprefix:uid nolimit/parameter but for group quotas. NOTE: group quotas are not supported from the windows explorer. @@ -209,12 +219,25 @@ The default value is constantyes/constant (which means to report NO_LIMIT). An example of use is shown here: screen -default_quota:uid nolimit = no +vfs objects = default_quota +default_quota: uid nolimit = no /screen /para/listitem /varlistentry /variablelist + para + An example of use of multiple parametric specifications is shown here: +screen +... +vfs objects = default_quota:quotasettings +quotasettings: uid nolimit = no +quotasettings: gid = 65534 +quotasettings: gid nolimit = no +... +/screen + /para + /sect2 sect2
svn commit: samba r10107 - in trunk/source/modules: .
Author: metze Date: 2005-09-09 09:52:27 + (Fri, 09 Sep 2005) New Revision: 10107 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10107 Log: sync with SAMBA_3_0 metze Modified: trunk/source/modules/vfs_default_quota.c Changeset: Modified: trunk/source/modules/vfs_default_quota.c === --- trunk/source/modules/vfs_default_quota.c2005-09-09 06:40:17 UTC (rev 10106) +++ trunk/source/modules/vfs_default_quota.c2005-09-09 09:52:27 UTC (rev 10107) @@ -34,17 +34,17 @@ * This module takes 2 parametric parameters in smb.conf: * (the default prefix for them is 'default_quota', * it can be overwrittem when you load the module in - * the 'vfs modules' parameter like this: - * vfs modules = default_quota:myprefix) + * the 'vfs objects' parameter like this: + * vfs objects = default_quota:myprefix) * - * prefix:uid parameter takes a integer argument, + * myprefix:uid parameter takes a integer argument, * it specifies the uid of the quota record, that will be taken for * storing the default USER-quotas. * * - default value: '0' (for root user) * - e.g.: default_quota:uid = 65534 * - * prefix:uid nolimit parameter takes a boolean argument, + * myprefix:uid nolimit parameter takes a boolean argument, * it specifies if we should report the stored default quota values, * also for the user record, or if you should just report NO_LIMIT * to the windows client for the user specified by the prefix:uid parameter. @@ -52,14 +52,14 @@ * - default value: yes (that means to report NO_LIMIT) * - e.g.: default_quota:uid nolimit = no * - * prefix:gid parameter takes a integer argument, + * myprefix:gid parameter takes a integer argument, * it's just like prefix:uid but for group quotas. * (NOTE: group quotas are not supported from the windows explorer!) * * - default value: '0' (for root group) * - e.g.: default_quota:gid = 65534 * - * prefix:gid nolimit parameter takes a boolean argument, + * myprefix:gid nolimit parameter takes a boolean argument, * it's just like prefix:uid nolimit but for group quotas. * (NOTE: group quotas are not supported from the windows explorer!) *
svn commit: samba r10108 - in branches/tmp/samba4-winsrepl: . source source/build/smb_build source/heimdal_build source/lib/registry source/libcli/util source/pidl source/pidl/lib/Parse/Pidl source/pi
Author: metze Date: 2005-09-09 09:52:50 + (Fri, 09 Sep 2005) New Revision: 10108 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10108 Log: [EMAIL PROTECTED] (orig r10089): mimir | 2005-09-08 21:58:59 +0200 Fix a typo breaking the Makefile generator and therefore - the build. rafal [EMAIL PROTECTED] (orig r10091): jelmer | 2005-09-08 22:34:35 +0200 Fix perl warnings [EMAIL PROTECTED] (orig r10093): jelmer | 2005-09-08 23:59:40 +0200 Fix the HF_FIELD conformance file command [EMAIL PROTECTED] (orig r10094): jelmer | 2005-09-09 00:33:48 +0200 Support quoted arguments in conformance files Update pidl manpage [EMAIL PROTECTED] (orig r10097): jpeach | 2005-09-09 02:42:18 +0200 Remove extraneous include patch heimdal/include. Add configure checks for getipnodeby*(). [EMAIL PROTECTED] (orig r10100): jpeach | 2005-09-09 03:19:32 +0200 Check for more networking headers so the resolv.h test can succeed. [EMAIL PROTECTED] (orig r10103): tpot | 2005-09-09 06:21:19 +0200 Put an #ifdef guard around ENOTSUP to fix systems that don't have it (OpenBSD 3.7). [EMAIL PROTECTED] (orig r10104): tpot | 2005-09-09 06:22:58 +0200 Fix code before declaration. Modified: branches/tmp/samba4-winsrepl/ branches/tmp/samba4-winsrepl/source/build/smb_build/config_mk.pm branches/tmp/samba4-winsrepl/source/build/smb_build/makefile.pm branches/tmp/samba4-winsrepl/source/extra_cflags.txt branches/tmp/samba4-winsrepl/source/heimdal_build/config.m4 branches/tmp/samba4-winsrepl/source/lib/registry/config.mk branches/tmp/samba4-winsrepl/source/lib/registry/reg_backend_nt4.c branches/tmp/samba4-winsrepl/source/libcli/util/errormap.c branches/tmp/samba4-winsrepl/source/pidl/README branches/tmp/samba4-winsrepl/source/pidl/TODO branches/tmp/samba4-winsrepl/source/pidl/idl.yp branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/IDL.pm branches/tmp/samba4-winsrepl/source/pidl/pidl.1.xml Changeset: Sorry, the patch is too large (462 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10108
svn commit: samba r10109 - in branches/tmp/samba4-winsrepl/source: include wrepl_server
Author: metze Date: 2005-09-09 10:29:12 + (Fri, 09 Sep 2005) New Revision: 10109 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10109 Log: - move structs to a seperate header file - move the code for the wreplsrv_in_call handling to a seperate file metze Added: branches/tmp/samba4-winsrepl/source/wrepl_server/wrepl_in_call.c branches/tmp/samba4-winsrepl/source/wrepl_server/wrepl_server.h Modified: branches/tmp/samba4-winsrepl/source/include/structs.h branches/tmp/samba4-winsrepl/source/wrepl_server/config.mk branches/tmp/samba4-winsrepl/source/wrepl_server/wrepl_server.c Changeset: Sorry, the patch is too large (426 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10109
svn commit: samba r10110 - in branches/SAMBA_4_0/source/pidl: . lib/Parse/Pidl/Ethereal
Author: jelmer
Date: 2005-09-09 10:30:19 + (Fri, 09 Sep 2005)
New Revision: 10110
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10110
Log:
Add some more warnings, implement FIELD_DESCRIPTION
Modified:
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
branches/SAMBA_4_0/source/pidl/pidl.1.xml
Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
2005-09-09 10:29:12 UTC (rev 10109)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
2005-09-09 10:30:19 UTC (rev 10110)
@@ -14,12 +14,31 @@
use Parse::Pidl::Util qw(has_property);
-sub handle_type()
+sub handle_type($$)
{
- my
($data,$name,$dissectorname,$ft_type,$base_type,$mask,$valsstring,$alignment) =
@_;
+ my
($pos,$data,$name,$dissectorname,$ft_type,$base_type,$mask,$valsstring,$alignment)
= @_;
+ unless(defined($alignment)) {
+ print $pos: error incomplete TYPE command\n;
+ return;
+ }
+
+ unless ($dissectorname =~ /.*dissect_.*/) {
+ print $pos: warning: dissector name does not contain
`dissect'\n;
+ }
+
+ unless(valid_ft_type($ft_type)) {
+ print $pos: warning: invalid FT_TYPE `$ft_type'\n;
+ }
+
+ unless(alid_base_type($base_type)) {
+ print $pos: warning: invalid BASE_TYPE `$base_type'\n;
+ }
+
$data-{types}-{$name} = {
NAME = $name,
+ POS = $pos,
+ USED = 0,
DISSECTOR_NAME = $dissectorname,
FT_TYPE = $ft_type,
BASE_TYPE = $base_type,
@@ -29,25 +48,65 @@
};
}
-sub handle_hf_rename($$$)
+sub handle_hf_rename()
{
- my ($data,$old,$new) = @_;
- $data-{hf_renames}{$old} = $new;
+ my ($pos,$data,$old,$new) = @_;
+
+ unless(defined($new)) {
+ print $pos: error incomplete HF_RENAME command\n;
+ return;
+ }
+
+ $data-{hf_renames}-{$old} = $new;
}
-sub handle_param_value($$$)
+sub handle_param_value()
{
- my ($data,$dissector_name,$value) = @_;
+ my ($pos,$data,$dissector_name,$value) = @_;
+ unless(defined($value)) {
+ print $pos: error: incomplete PARAM_VALUE command\n;
+ return;
+ }
+
$data-{dissectorparams}-{$dissector_name} = $value;
}
-sub handle_hf_field($)
+sub valid_base_type($)
{
- my
($data,$index,$name,$filter,$ft_type,$base_type,$valsstring,$mask,$blurb) = @_;
+ my $t = shift;
+ return 0 unless($t =~ /^BASE_.*/);
+ return 1;
+}
+sub valid_ft_type($)
+{
+ my $t = shift;
+ return 0 unless($t =~ /^FT_.*/);
+ return 1;
+}
+
+sub handle_hf_field($$)
+{
+ my
($pos,$data,$index,$name,$filter,$ft_type,$base_type,$valsstring,$mask,$blurb)
= @_;
+
+ unless(defined($blurb)) {
+ print $pos: error: incomplete HF_FIELD command\n;
+ return;
+ }
+
+ unless(valid_ft_type($ft_type)) {
+ print $pos: warning: invalid FT_TYPE `$ft_type'\n;
+ }
+
+ unless(valid_base_type($base_type)) {
+ print $pos: warning: invalid BASE_TYPE `$base_type'\n;
+ }
+
$data-{header_fields}-{$index} = {
INDEX = $index,
+ POS = $pos,
+ USED = 0,
NAME = $name,
FILTER = $filter,
FT_TYPE = $ft_type,
@@ -58,16 +117,16 @@
};
}
-sub handle_strip_prefix($$)
+sub handle_strip_prefix($$$)
{
- my ($data,$x) = @_;
+ my ($pos,$data,$x) = @_;
push (@{$data-{strip_prefixes}}, $x);
}
-sub handle_noemit($$)
+sub handle_noemit($$$)
{
- my ($data) = shift;
+ my ($pos,$data) = @_;
my $type;
$type = shift if ($#_ == 1);
@@ -79,9 +138,9 @@
}
}
-sub handle_protocol($)
+sub handle_protocol($$)
{
- my ($data, $name, $longname, $shortname, $filtername) = @_;
+ my ($pos, $data, $name, $longname, $shortname, $filtername) = @_;
$data-{protocols}-{$name} = {
LONGNAME = $longname,
@@ -90,18 +149,24 @@
};
}
-sub handle_fielddescription($$$)
+sub handle_fielddescription()
{
- my ($data,$field,$desc) = @_;
+ my ($pos,$data,$field,$desc) = @_;
$data-{fielddescription}-{$field} = $desc;
}
sub handle_import
{
+ my $pos = shift @_;
my $data = shift @_;
my $dissectorname = shift @_;
+ unless(defined($dissectorname)) {
+ print $pos: error: no dissectorname specified\n;
+ return;
+ }
+
svn commit: samba r10111 - in branches/SAMBA_4_0/source: lib/registry pidl script
Author: jelmer
Date: 2005-09-09 10:59:54 + (Fri, 09 Sep 2005)
New Revision: 10111
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10111
Log:
Make pidl by default assume the input file is an IDL file rather
then a .pidl file.
Modified:
branches/SAMBA_4_0/source/lib/registry/config.mk
branches/SAMBA_4_0/source/pidl/pidl
branches/SAMBA_4_0/source/pidl/pidl.1.xml
branches/SAMBA_4_0/source/script/build_idl.sh
Changeset:
Modified: branches/SAMBA_4_0/source/lib/registry/config.mk
===
--- branches/SAMBA_4_0/source/lib/registry/config.mk2005-09-09 10:30:19 UTC
(rev 10110)
+++ branches/SAMBA_4_0/source/lib/registry/config.mk2005-09-09 10:59:54 UTC
(rev 10111)
@@ -18,7 +18,7 @@
lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c
lib/registry/tdr_regf.c: lib/registry/regf.idl
- @CPP=$(CPP) $(PERL) pidl/pidl --header --outputdir=lib/registry
--parse --tdr-header --tdr-parser -- lib/registry/regf.idl
+ @CPP=$(CPP) $(PERL) pidl/pidl --header --outputdir=lib/registry
--tdr-header --tdr-parser -- lib/registry/regf.idl
# Start MODULE registry_w95
Modified: branches/SAMBA_4_0/source/pidl/pidl
===
--- branches/SAMBA_4_0/source/pidl/pidl 2005-09-09 10:30:19 UTC (rev 10110)
+++ branches/SAMBA_4_0/source/pidl/pidl 2005-09-09 10:59:54 UTC (rev 10111)
@@ -62,8 +62,9 @@
}
my($opt_help) = 0;
-my($opt_parse) = 0;
-my($opt_dump) = 0;
+my($opt_parse_tree) = 0;
+my($opt_dump_tree);
+my($opt_dump_idl) = 0;
my($opt_uint_enums) = 0;
my($opt_diff) = 0;
my($opt_header);
@@ -75,7 +76,6 @@
my($opt_tdr_header);
my($opt_tdr_parser);
my($opt_eth_parser);
-my($opt_keep);
my($opt_swig);
my($opt_dcom_proxy);
my($opt_com_header);
@@ -98,15 +98,17 @@
Generic Options:
--help this help page
--outputdir=OUTDIR put output in OUTDIR/ [.]
- --parse parse a idl file to a .pidl file
- --dump dump a pidl file back to idl
- --diff run diff on the idl and dumped output
- --keep[=OUTFILE]keep the .pidl file [BASENAME.pidl]
--odl accept ODL input
--warn-compat warn about incompatibility with other compilers
--quiet be quiet
--verbose be verbose
+Debugging:
+ --dump-tree[=OUTFILE] dump internal representation to file [BASENAME.pidl]
+ --parse-treeread internal representation instead of IDL
+ --dump-idl regenerate IDL file
+ --diff run diff on original IDL and dumped output
+
Samba 4 output:
--header[=OUTFILE] create generic header file [BASENAME.h]
--uint-enumsdon't use C enums, instead use uint* types
@@ -132,8 +134,9 @@
GetOptions (
'help|h|?' = \$opt_help,
'outputdir=s' = \$opt_outputdir,
- 'parse' = \$opt_parse,
- 'dump' = \$opt_dump,
+ 'dump-idl' = \$opt_dump_idl,
+ 'dump-tree:s' = \$opt_dump_tree,
+ 'parse-tree' = \$opt_parse_tree,
'uint-enums' = \$opt_uint_enums,
'ndr-header:s' = \$opt_ndr_header,
'header:s' = \$opt_header,
@@ -147,7 +150,6 @@
'ejs' = \$opt_ejs,
'diff' = \$opt_diff,
'odl' = \$opt_odl,
- 'keep:s' = \$opt_keep,
'swig:s' = \$opt_swig,
'dcom-proxy:s' = \$opt_dcom_proxy,
'com-header:s' = \$opt_com_header,
@@ -170,11 +172,14 @@
my $basename = basename($idl_file, .idl);
- my($pidl_file) = ($opt_keep or $outputdir/$basename.pidl);
+ my($pidl_file) = ($opt_dump_tree or $outputdir/$basename.pidl);
unless ($opt_quiet) { print Compiling $idl_file\n; }
- if ($opt_parse) {
+ if ($opt_parse_tree) {
+ $pidl = LoadStructure($pidl_file);
+ defined $pidl || die Failed to load $pidl_file;
+ } else {
require Parse::Pidl::IDL;
my $idl_parser = new Parse::Pidl::IDL;
@@ -182,19 +187,17 @@
defined @$pidl || die Failed to parse $idl_file;
require Parse::Pidl::Typelist;
Parse::Pidl::Typelist::LoadIdl($pidl);
- if (defined($opt_keep) !SaveStructure($pidl_file, $pidl)) {
- die Failed to save $pidl_file\n;
- }
- } else {
- $pidl = LoadStructure($pidl_file);
- defined $pidl || die Failed to load $pidl_file - maybe you
need --parse\n;
}
+
+ if (defined($opt_dump_tree) !SaveStructure($pidl_file, $pidl)) {
+ die Failed to save $pidl_file\n;
+ }
if ($opt_uint_enums) {
Parse::Pidl::Util::setUseUintEnums(1);
}
- if ($opt_dump) {
+ if
svn commit: samba r10112 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: metze
Date: 2005-09-09 11:03:53 + (Fri, 09 Sep 2005)
New Revision: 10112
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10112
Log:
- check attributes depending on the section type
metze
Modified:
branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2005-09-09
10:59:54 UTC (rev 10111)
+++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2005-09-09
11:03:53 UTC (rev 10112)
@@ -11,28 +11,73 @@
use strict;
-my %attribute_types = (
- NOPROTO = bool,
- REQUIRED_SUBSYSTEMS = list,
- OUTPUT_TYPE = string,
- INIT_OBJ_FILES = list,
- ADD_OBJ_FILES = list,
- OBJ_FILES = list,
- SUBSYSTEM = string,
- CFLAGS = list,
- CPPFLAGS = list,
- LDFLAGS = list,
- INSTALLDIR = string,
- LIBS = list,
- INIT_FUNCTION = string,
- MAJOR_VERSION = string,
- MINOR_VERSION = string,
- RELEASE_VERSION = string,
- ENABLE = bool,
- CMD = string,
- MANPAGE = string
-);
+my $section_types = {
+ EXT_LIB = {
+ LIBS = list,
+ CFLAGS= list,
+ CPPFLAGS = list,
+ LDFLAGS = list,
+ },
+ SUBSYSTEM = {
+ INIT_FUNCTION = string,
+ INIT_OBJ_FILES= list,
+ ADD_OBJ_FILES = list,
+ OBJ_FILES = list,
+ REQUIRED_SUBSYSTEMS = list,
+ TARGET_DEPS = list,
+
+ ENABLE= bool,
+ NOPROTO = bool,
+
+ MANPAGE = string,
+ },
+ MODULE = {
+ SUBSYSTEM = string,
+
+ INIT_FUNCTION = string,
+ INIT_OBJ_FILES= list,
+ ADD_OBJ_FILES = list,
+ OBJ_FILES = list,
+
+ REQUIRED_SUBSYSTEMS = list,
+ TARGET_DEPS = list,
+
+ ENABLE= bool,
+ NOPROTO = bool,
+
+ MANPAGE = string,
+ },
+ BINARY = {
+ OBJ_FILES = list,
+
+ REQUIRED_SUBSYSTEMS = list,
+ TARGET_DEPS = list,
+
+ ENABLE= bool,
+ NOPROTO = bool,
+
+ MANPAGE = string,
+ INSTALLDIR= string,
+ },
+ LIBRARY = {
+ MAJOR_VERSION = string,
+ MINOR_VERSION = string,
+ RELEASE_VERSION = string,
+
+ OBJ_FILES = list,
+
+ REQUIRED_SUBSYSTEMS = list,
+ TARGET_DEPS = list,
+
+ ENABLE= bool,
+ NOPROTO = bool,
+
+ MANPAGE = string,
+ INSTALLDIR= string,
+ }
+};
+
use vars qw(@parsed_files);
@parsed_files = ();
@@ -118,15 +163,20 @@
foreach my $section (keys %{$result}) {
my ($type, $name) = split(/::/, $section, 2);
-
+
+ my $sectype = $section_types-{$type};
+ if (not defined($sectype)) {
+ die($filename.:[.$section.] unknown section type
\.$type.\!);
+ }
+
$input-{$name}{NAME} = $name;
$input-{$name}{TYPE} = $type;
foreach my $key (values %{$result-{$section}}) {
$key-{VAL} = smb_build::input::strtrim($key-{VAL});
- my $vartype = $attribute_types{$key-{KEY}};
+ my $vartype = $sectype-{$key-{KEY}};
if (not defined($vartype)) {
- die($filename:Unknown attribute $key-{KEY}
with value $key-{VAL} in section $section);
+ die($filename.:[.$section.]: unknown
attribute type \$key-{KEY}\!);
}
if ($vartype eq string) {
$input-{$name}{$key-{KEY}} = $key-{VAL};
svn commit: samba r10113 - in branches/SAMBA_4_0/source: libcli libcli/wrepl torture/nbt
Author: metze
Date: 2005-09-09 16:00:02 + (Fri, 09 Sep 2005)
New Revision: 10113
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10113
Log:
rename libcli/wins to libcli/wrepl
metze
Added:
branches/SAMBA_4_0/source/libcli/wrepl/
Removed:
branches/SAMBA_4_0/source/libcli/wins/
Modified:
branches/SAMBA_4_0/source/libcli/config.mk
branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c
branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/config.mk
===
--- branches/SAMBA_4_0/source/libcli/config.mk 2005-09-09 11:03:53 UTC (rev
10112)
+++ branches/SAMBA_4_0/source/libcli/config.mk 2005-09-09 16:00:02 UTC (rev
10113)
@@ -55,7 +55,7 @@
[SUBSYSTEM::LIBCLI_WREPL]
ADD_OBJ_FILES = \
- libcli/wins/winsrepl.o
+ libcli/wrepl/winsrepl.o
REQUIRED_SUBSYSTEMS = NDR_WINSREPL SOCKET LIBEVENTS
[SUBSYSTEM::LIBCLI_RESOLVE]
Copied: branches/SAMBA_4_0/source/libcli/wrepl (from rev 8832,
branches/SAMBA_4_0/source/libcli/wins)
Modified: branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c
===
--- branches/SAMBA_4_0/source/libcli/wins/winsrepl.c2005-07-28 14:37:54 UTC
(rev 8832)
+++ branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c 2005-09-09 16:00:02 UTC
(rev 10113)
@@ -24,7 +24,7 @@
#include lib/events/events.h
#include dlinklist.h
#include lib/socket/socket.h
-#include libcli/wins/winsrepl.h
+#include libcli/wrepl/winsrepl.h
/*
mark all pending requests as dead - called when a socket error happens
Modified: branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
===
--- branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2005-09-09
11:03:53 UTC (rev 10112)
+++ branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2005-09-09
16:00:02 UTC (rev 10113)
@@ -22,7 +22,7 @@
#include includes.h
#include libcli/nbt/libnbt.h
-#include libcli/wins/winsrepl.h
+#include libcli/wrepl/winsrepl.h
#define CHECK_STATUS(status, correct) do { \
if (!NT_STATUS_EQUAL(status, correct)) { \
svn commit: samba r10114 - in branches/tmp/RPCREWRITE/source/utils: .
Author: jra Date: 2005-09-09 16:01:31 + (Fri, 09 Sep 2005) New Revision: 10114 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10114 Log: Getting closer to full compile, bin/net compiles now. Jeremy Modified: branches/tmp/RPCREWRITE/source/utils/net_rpc_registry.c branches/tmp/RPCREWRITE/source/utils/net_rpc_service.c Changeset: Sorry, the patch is too large (408 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10114
svn commit: samba r10115 - in branches/SAMBA_4_0/source/libcli/wrepl: .
Author: metze Date: 2005-09-09 16:01:49 + (Fri, 09 Sep 2005) New Revision: 10115 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10115 Log: bind client connection to the best interface, to the partner metze Modified: branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c Changeset: Modified: branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c === --- branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c 2005-09-09 16:01:31 UTC (rev 10114) +++ branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c 2005-09-09 16:01:49 UTC (rev 10115) @@ -339,7 +339,7 @@ talloc_set_destructor(req, wrepl_request_destructor); - status = socket_connect(wrepl_socket-sock, NULL, 0, address, + status = socket_connect(wrepl_socket-sock, iface_best_ip(address), 0, address, WINS_REPLICATION_PORT, 0); if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) goto failed;
svn commit: samba r10116 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal: .
Author: jelmer
Date: 2005-09-09 16:23:50 + (Fri, 09 Sep 2005)
New Revision: 10116
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10116
Log:
Print out a couple more warnings.
Modified:
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
2005-09-09 16:01:49 UTC (rev 10115)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
2005-09-09 16:23:50 UTC (rev 10116)
@@ -57,7 +57,12 @@
return;
}
- $data-{hf_renames}-{$old} = $new;
+ $data-{hf_renames}-{$old} = {
+ OLDNAME = $old,
+ NEWNAME = $new,
+ POS = $pos,
+ USED = 0
+ };
}
sub handle_param_value()
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
2005-09-09 16:01:49 UTC (rev 10115)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
2005-09-09 16:23:50 UTC (rev 10116)
@@ -18,6 +18,9 @@
my %types;
my @ett;
+my %hf_used = ();
+my %dissector_used = ();
+
my $conformance = undef;
my %ptrtype_mappings = (
@@ -196,6 +199,8 @@
my ($en,$ev) = ($1,$2);
my $hf_bitname = hf_$ifname\_$name\_$en;
my $filtername = $ifname\.$name\.$en;
+
+ $hf_used{$hf_bitname} = 1;
register_hf_field($hf_bitname, field2name($en), $filtername,
FT_BOOLEAN, $e-{ALIGN} * 8, TFS($name\_$en\_tfs), $ev, );
@@ -321,6 +326,7 @@
my $call_code = offset = $dissectorname(tvb, offset, pinfo, tree,
drep);;
my $hf = register_hf_field(hf_$ifname\_$pn\_$e-{NAME},
field2name($e-{NAME}), $ifname.$pn.$e-{NAME}, type2ft($e-{TYPE}),
BASE_HEX, NULL, 0, );
+ $hf_used{$hf} = 1;
my $eltname = StripPrefixes($pn) . .$e-{NAME};
if (defined($conformance-{noemit}-{$eltname})) {
@@ -378,9 +384,14 @@
if (not defined($fn-{RETURN_TYPE})) {
} elsif ($fn-{RETURN_TYPE} eq NTSTATUS) {
pidl_code offset = dissect_ntstatus(tvb, offset, pinfo, tree,
drep, hf\_$ifname\_status, NULL);;
+ $hf_used{hf\_$ifname\_status} = 1;
} elsif ($fn-{RETURN_TYPE} eq WERROR) {
pidl_code offset = dissect_ndr_uint32(tvb, offset, pinfo,
tree, drep, hf\_$ifname\_werror, NULL);;
+ $hf_used{hf\_$ifname\_werror} = 1;
+ } else {
+ print $fn-{FILE}:$fn-{LINE}: error: return type
`$fn-{RETURN_TYPE}' not yet supported\n;
}
+
pidl_code return offset;;
deindent;
@@ -587,6 +598,8 @@
pidl_code \t$x-{NAME}_dissectors, hf_$x-{NAME}_opnum);;
deindent;
pidl_code };
+
+ $hf_used{hf_$x-{NAME}_opnum} = 1;
}
}
@@ -611,8 +624,6 @@
pidl_def static gint proto_dcerpc_$x-{NAME} = -1;;
register_ett(ett_dcerpc_$x-{NAME});
register_hf_field(hf_$x-{NAME}_opnum, Operation,
$x-{NAME}.opnum, FT_UINT16, BASE_DEC, NULL, 0, );
- register_hf_field(hf_$x-{NAME}_status, Status,
$x-{NAME}.status, FT_UINT32, BASE_HEX, VALS(NT_errors), 0, );
- register_hf_field(hf_$x-{NAME}_werror, Windows Error,
$x-{NAME}.werror, FT_UINT32, BASE_HEX, NULL, 0, );
if (defined($x-{UUID})) {
my $if_uuid = $x-{UUID};
@@ -643,6 +654,15 @@
pidl_code \n.DumpFunctionTable($x);
+ # Only register these two return types if they were actually used
+ if (defined($hf_used{hf_$x-{NAME}_status})) {
+ register_hf_field(hf_$x-{NAME}_status, Status,
$x-{NAME}.status, FT_UINT32, BASE_HEX, VALS(NT_errors), 0, );
+ }
+
+ if (defined($hf_used{hf_$x-{NAME}_werror})) {
+ register_hf_field(hf_$x-{NAME}_werror, Windows Error,
$x-{NAME}.werror, FT_UINT32, BASE_HEX, NULL, 0, );
+ }
+
RegisterInterface($x);
RegisterInterfaceHandoff($x);
@@ -770,6 +790,8 @@
my $header = /* autogenerated by pidl */\n\n;
$header.=$res{hdr};
+
+ CheckUsed($conformance);
return ($parser,$header);
}
@@ -813,7 +835,10 @@
{
my
($index,$name,$filter_name,$ft_type,$base_type,$valsstring,$mask,$blurb) = @_;
- return $conformance-{hf_renames}-{$index} if defined
($conformance-{hf_renames}-{$index});
+ if (defined ($conformance-{hf_renames}-{$index})) {
+ $conformance-{hf_renames}-{$index}-{USED} = 1;
+ return $conformance-{hf_renames}-{$index}-{NEWNAME};
+ }
svn commit: samba r10117 - in branches/tmp/RPCREWRITE/source: libsmb utils
Author: jra
Date: 2005-09-09 16:26:42 + (Fri, 09 Sep 2005)
New Revision: 10117
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10117
Log:
w00t! This now compiles !
MERGE MERGE MERGE...
Jeremy
Modified:
branches/tmp/RPCREWRITE/source/libsmb/libsmbclient.c
branches/tmp/RPCREWRITE/source/utils/smbcacls.c
branches/tmp/RPCREWRITE/source/utils/smbcquotas.c
Changeset:
Modified: branches/tmp/RPCREWRITE/source/libsmb/libsmbclient.c
===
--- branches/tmp/RPCREWRITE/source/libsmb/libsmbclient.c2005-09-09
16:23:50 UTC (rev 10116)
+++ branches/tmp/RPCREWRITE/source/libsmb/libsmbclient.c2005-09-09
16:26:42 UTC (rev 10117)
@@ -80,6 +80,23 @@
return False;
}
+/*
+ * Find an lsa pipe handle associated with a cli struct.
+ */
+
+static struct rpc_pipe_client *find_lsa_pipe_hnd(struct cli_state *ipc_cli)
+{
+ struct rpc_pipe_client *pipe_hnd;
+
+ for (pipe_hnd = ipc_cli-pipe_list; pipe_hnd; pipe_hnd =
pipe_hnd-next) {
+ if (pipe_hnd-pipe_idx == PI_LSARPC) {
+ return pipe_hnd;
+ }
+ }
+
+ return NULL;
+}
+
static int smbc_close_ctx(SMBCCTX *context, SMBCFILE *file);
static off_t smbc_lseek_ctx(SMBCCTX *context, SMBCFILE *file, off_t offset,
int whence);
@@ -800,6 +817,7 @@
{
struct in_addr ip;
struct cli_state *ipc_cli;
+ struct rpc_pipe_client *pipe_hnd;
NTSTATUS nt_status;
SMBCSRV *ipc_srv=NULL;
@@ -835,7 +853,8 @@
return NULL;
}
-if (!cli_nt_session_open(ipc_cli, PI_LSARPC)) {
+ pipe_hnd = cli_rpc_pipe_open_noauth(ipc_cli, PI_LSARPC,
nt_status);
+if (!pipe_hnd) {
DEBUG(1, (cli_nt_session_open fail!\n));
errno = ENOTSUP;
cli_shutdown(ipc_cli);
@@ -845,7 +864,7 @@
/* Some systems don't support SEC_RIGHTS_MAXIMUM_ALLOWED,
but NT sends 0x200 so we might as well do it too. */
-nt_status = cli_lsa_open_policy(ipc_cli,
+nt_status = rpccli_lsa_open_policy(pipe_hnd,
ipc_cli-mem_ctx,
True,
GENERIC_EXECUTE_ACCESS,
@@ -3127,14 +3146,20 @@
char **domains = NULL;
char **names = NULL;
uint32 *types = NULL;
-
+ struct rpc_pipe_client *pipe_hnd = find_lsa_pipe_hnd(ipc_cli);
sid_to_string(str, sid);
-if (numeric) return; /* no lookup desired */
-
+ if (numeric) {
+ return; /* no lookup desired */
+ }
+
+ if (!pipe_hnd) {
+ return;
+ }
+
/* Ask LSA to convert the sid to a name */
- if (!NT_STATUS_IS_OK(cli_lsa_lookup_sids(ipc_cli, ipc_cli-mem_ctx,
+ if (!NT_STATUS_IS_OK(rpccli_lsa_lookup_sids(pipe_hnd, ipc_cli-mem_ctx,
pol, 1, sid, domains,
names, types)) ||
!domains || !domains[0] || !names || !names[0]) {
@@ -3158,7 +3183,12 @@
uint32 *types = NULL;
DOM_SID *sids = NULL;
BOOL result = True;
+ struct rpc_pipe_client *pipe_hnd = find_lsa_pipe_hnd(ipc_cli);
+ if (!pipe_hnd) {
+ return False;
+ }
+
if (numeric) {
if (strncmp(str, S-, 2) == 0) {
return string_to_sid(sid, str);
@@ -3168,7 +3198,7 @@
goto done;
}
- if (!NT_STATUS_IS_OK(cli_lsa_lookup_names(ipc_cli, ipc_cli-mem_ctx,
+ if (!NT_STATUS_IS_OK(rpccli_lsa_lookup_names(pipe_hnd,
ipc_cli-mem_ctx,
pol, 1, str, sids,
types))) {
result = False;
Modified: branches/tmp/RPCREWRITE/source/utils/smbcacls.c
===
--- branches/tmp/RPCREWRITE/source/utils/smbcacls.c 2005-09-09 16:23:50 UTC
(rev 10116)
+++ branches/tmp/RPCREWRITE/source/utils/smbcacls.c 2005-09-09 16:26:42 UTC
(rev 10117)
@@ -64,6 +64,7 @@
};
static struct cli_state *global_hack_cli;
+static struct rpc_pipe_client *global_pipe_hnd;
static POLICY_HND pol;
static BOOL got_policy_hnd;
@@ -76,8 +77,10 @@
/* Initialise cli LSA connection */
if (!global_hack_cli) {
+ NTSTATUS ret;
global_hack_cli = connect_one(IPC$);
- if (!cli_nt_session_open (global_hack_cli, PI_LSARPC)) {
+ global_pipe_hnd = cli_rpc_pipe_open_noauth(global_hack_cli,
PI_LSARPC, ret);
+ if (!global_pipe_hnd) {
svn commit: samba r10118 - in branches/tmp/RPCREWRITE/source/modules: .
Author: jra Date: 2005-09-09 16:27:31 + (Fri, 09 Sep 2005) New Revision: 10118 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10118 Log: Merge from head (hopefully the last this way around) Jeremy Modified: branches/tmp/RPCREWRITE/source/modules/vfs_default_quota.c Changeset: Modified: branches/tmp/RPCREWRITE/source/modules/vfs_default_quota.c === --- branches/tmp/RPCREWRITE/source/modules/vfs_default_quota.c 2005-09-09 16:26:42 UTC (rev 10117) +++ branches/tmp/RPCREWRITE/source/modules/vfs_default_quota.c 2005-09-09 16:27:31 UTC (rev 10118) @@ -34,17 +34,17 @@ * This module takes 2 parametric parameters in smb.conf: * (the default prefix for them is 'default_quota', * it can be overwrittem when you load the module in - * the 'vfs modules' parameter like this: - * vfs modules = default_quota:myprefix) + * the 'vfs objects' parameter like this: + * vfs objects = default_quota:myprefix) * - * prefix:uid parameter takes a integer argument, + * myprefix:uid parameter takes a integer argument, * it specifies the uid of the quota record, that will be taken for * storing the default USER-quotas. * * - default value: '0' (for root user) * - e.g.: default_quota:uid = 65534 * - * prefix:uid nolimit parameter takes a boolean argument, + * myprefix:uid nolimit parameter takes a boolean argument, * it specifies if we should report the stored default quota values, * also for the user record, or if you should just report NO_LIMIT * to the windows client for the user specified by the prefix:uid parameter. @@ -52,14 +52,14 @@ * - default value: yes (that means to report NO_LIMIT) * - e.g.: default_quota:uid nolimit = no * - * prefix:gid parameter takes a integer argument, + * myprefix:gid parameter takes a integer argument, * it's just like prefix:uid but for group quotas. * (NOTE: group quotas are not supported from the windows explorer!) * * - default value: '0' (for root group) * - e.g.: default_quota:gid = 65534 * - * prefix:gid nolimit parameter takes a boolean argument, + * myprefix:gid nolimit parameter takes a boolean argument, * it's just like prefix:uid nolimit but for group quotas. * (NOTE: group quotas are not supported from the windows explorer!) *
svn commit: samba r10119 - in trunk/source: auth include libads libsmb nsswitch passdb rpc_client rpc_parse rpc_server rpcclient smbd utils
Author: jra Date: 2005-09-09 17:39:09 + (Fri, 09 Sep 2005) New Revision: 10119 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10119 Log: Ok, I'm being really evil here. The RPC rewrite is finished, but needs testing. I could leave it in my tree and test, but if I do that it will never get enough testing. By moving it over into HEAD, I make it everyone else's problem :-). Hey - at least it compiles ! Be thankfull for small mercies :-). Jeremy. Modified: trunk/source/auth/auth_domain.c trunk/source/include/client.h trunk/source/include/includes.h trunk/source/include/ntdomain.h trunk/source/include/rpc_client.h trunk/source/include/rpc_dce.h trunk/source/include/rpc_dfs.h trunk/source/include/rpc_misc.h trunk/source/include/rpc_netlogon.h trunk/source/include/smb.h trunk/source/libads/ldap_printer.c trunk/source/libsmb/clientgen.c trunk/source/libsmb/clierror.c trunk/source/libsmb/clireadwrite.c trunk/source/libsmb/clitrans.c trunk/source/libsmb/credentials.c trunk/source/libsmb/libsmbclient.c trunk/source/libsmb/passchange.c trunk/source/libsmb/pwd_cache.c trunk/source/libsmb/trusts_util.c trunk/source/nsswitch/winbindd.h trunk/source/nsswitch/winbindd_ads.c trunk/source/nsswitch/winbindd_cm.c trunk/source/nsswitch/winbindd_misc.c trunk/source/nsswitch/winbindd_pam.c trunk/source/passdb/secrets.c trunk/source/rpc_client/cli_dfs.c trunk/source/rpc_client/cli_ds.c trunk/source/rpc_client/cli_echo.c trunk/source/rpc_client/cli_lsarpc.c trunk/source/rpc_client/cli_netlogon.c trunk/source/rpc_client/cli_pipe.c trunk/source/rpc_client/cli_reg.c trunk/source/rpc_client/cli_samr.c trunk/source/rpc_client/cli_shutdown.c trunk/source/rpc_client/cli_spoolss.c trunk/source/rpc_client/cli_spoolss_notify.c trunk/source/rpc_client/cli_srvsvc.c trunk/source/rpc_client/cli_svcctl.c trunk/source/rpc_client/cli_unixinfo.c trunk/source/rpc_client/cli_wkssvc.c trunk/source/rpc_parse/parse_ds.c trunk/source/rpc_parse/parse_net.c trunk/source/rpc_parse/parse_prs.c trunk/source/rpc_parse/parse_rpc.c trunk/source/rpc_server/srv_netlog_nt.c trunk/source/rpc_server/srv_pipe.c trunk/source/rpc_server/srv_spoolss_nt.c trunk/source/rpcclient/cmd_dfs.c trunk/source/rpcclient/cmd_ds.c trunk/source/rpcclient/cmd_echo.c trunk/source/rpcclient/cmd_lsarpc.c trunk/source/rpcclient/cmd_netlogon.c trunk/source/rpcclient/cmd_samr.c trunk/source/rpcclient/cmd_spoolss.c trunk/source/rpcclient/cmd_srvsvc.c trunk/source/rpcclient/cmd_test.c trunk/source/rpcclient/cmd_unixinfo.c trunk/source/rpcclient/cmd_wkssvc.c trunk/source/rpcclient/rpcclient.c trunk/source/rpcclient/rpcclient.h trunk/source/smbd/change_trust_pw.c trunk/source/smbd/process.c trunk/source/utils/net.c trunk/source/utils/net.h trunk/source/utils/net_rpc.c trunk/source/utils/net_rpc_join.c trunk/source/utils/net_rpc_printer.c trunk/source/utils/net_rpc_registry.c trunk/source/utils/net_rpc_rights.c trunk/source/utils/net_rpc_samsync.c trunk/source/utils/net_rpc_service.c trunk/source/utils/smbcacls.c trunk/source/utils/smbcquotas.c Changeset: Sorry, the patch is too large (27048 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10119
svn commit: samba r10120 - in branches/tmp/samba4-winsrepl: . source/pidl source/pidl/lib/Parse/Pidl/Ethereal
Author: metze
Date: 2005-09-09 18:09:01 + (Fri, 09 Sep 2005)
New Revision: 10120
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10120
Log:
[EMAIL PROTECTED]: jelmer | 2005-09-09 12:30:19 +0200
Add some more warnings, implement FIELD_DESCRIPTION
Modified:
branches/tmp/samba4-winsrepl/
branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
branches/tmp/samba4-winsrepl/source/pidl/pidl.1.xml
Changeset:
Property changes on: branches/tmp/samba4-winsrepl
___
Name: svk:merge
- 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10104
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11627
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10110
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11627
Modified:
branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
===
---
branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
2005-09-09 17:39:09 UTC (rev 10119)
+++
branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
2005-09-09 18:09:01 UTC (rev 10120)
@@ -14,12 +14,31 @@
use Parse::Pidl::Util qw(has_property);
-sub handle_type()
+sub handle_type($$)
{
- my
($data,$name,$dissectorname,$ft_type,$base_type,$mask,$valsstring,$alignment) =
@_;
+ my
($pos,$data,$name,$dissectorname,$ft_type,$base_type,$mask,$valsstring,$alignment)
= @_;
+ unless(defined($alignment)) {
+ print $pos: error incomplete TYPE command\n;
+ return;
+ }
+
+ unless ($dissectorname =~ /.*dissect_.*/) {
+ print $pos: warning: dissector name does not contain
`dissect'\n;
+ }
+
+ unless(valid_ft_type($ft_type)) {
+ print $pos: warning: invalid FT_TYPE `$ft_type'\n;
+ }
+
+ unless(alid_base_type($base_type)) {
+ print $pos: warning: invalid BASE_TYPE `$base_type'\n;
+ }
+
$data-{types}-{$name} = {
NAME = $name,
+ POS = $pos,
+ USED = 0,
DISSECTOR_NAME = $dissectorname,
FT_TYPE = $ft_type,
BASE_TYPE = $base_type,
@@ -29,25 +48,65 @@
};
}
-sub handle_hf_rename($$$)
+sub handle_hf_rename()
{
- my ($data,$old,$new) = @_;
- $data-{hf_renames}{$old} = $new;
+ my ($pos,$data,$old,$new) = @_;
+
+ unless(defined($new)) {
+ print $pos: error incomplete HF_RENAME command\n;
+ return;
+ }
+
+ $data-{hf_renames}-{$old} = $new;
}
-sub handle_param_value($$$)
+sub handle_param_value()
{
- my ($data,$dissector_name,$value) = @_;
+ my ($pos,$data,$dissector_name,$value) = @_;
+ unless(defined($value)) {
+ print $pos: error: incomplete PARAM_VALUE command\n;
+ return;
+ }
+
$data-{dissectorparams}-{$dissector_name} = $value;
}
-sub handle_hf_field($)
+sub valid_base_type($)
{
- my
($data,$index,$name,$filter,$ft_type,$base_type,$valsstring,$mask,$blurb) = @_;
+ my $t = shift;
+ return 0 unless($t =~ /^BASE_.*/);
+ return 1;
+}
+sub valid_ft_type($)
+{
+ my $t = shift;
+ return 0 unless($t =~ /^FT_.*/);
+ return 1;
+}
+
+sub handle_hf_field($$)
+{
+ my
($pos,$data,$index,$name,$filter,$ft_type,$base_type,$valsstring,$mask,$blurb)
= @_;
+
+ unless(defined($blurb)) {
+ print $pos: error: incomplete HF_FIELD command\n;
+ return;
+ }
+
+ unless(valid_ft_type($ft_type)) {
+ print $pos: warning: invalid FT_TYPE `$ft_type'\n;
+ }
+
+ unless(valid_base_type($base_type)) {
+ print $pos: warning: invalid BASE_TYPE `$base_type'\n;
+ }
+
$data-{header_fields}-{$index} = {
INDEX = $index,
+ POS = $pos,
+ USED = 0,
NAME = $name,
FILTER = $filter,
FT_TYPE = $ft_type,
@@ -58,16 +117,16 @@
};
}
-sub handle_strip_prefix($$)
+sub handle_strip_prefix($$$)
{
- my ($data,$x) = @_;
+ my ($pos,$data,$x) = @_;
push (@{$data-{strip_prefixes}}, $x);
}
-sub handle_noemit($$)
+sub handle_noemit($$$)
{
- my ($data) = shift;
+ my ($pos,$data) = @_;
my $type;
$type = shift if ($#_ == 1);
@@ -79,9 +138,9 @@
}
}
-sub handle_protocol($)
+sub handle_protocol($$)
{
- my ($data, $name, $longname, $shortname, $filtername) = @_;
+ my ($pos, $data,
svn commit: samba r10121 - in branches/tmp/samba4-winsrepl: . source/lib/registry source/pidl source/script
Author: metze
Date: 2005-09-09 18:09:29 + (Fri, 09 Sep 2005)
New Revision: 10121
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10121
Log:
[EMAIL PROTECTED]: jelmer | 2005-09-09 12:59:54 +0200
Make pidl by default assume the input file is an IDL file rather
then a .pidl file.
Modified:
branches/tmp/samba4-winsrepl/
branches/tmp/samba4-winsrepl/source/lib/registry/config.mk
branches/tmp/samba4-winsrepl/source/pidl/pidl
branches/tmp/samba4-winsrepl/source/pidl/pidl.1.xml
branches/tmp/samba4-winsrepl/source/script/build_idl.sh
Changeset:
Property changes on: branches/tmp/samba4-winsrepl
___
Name: svk:merge
- 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10110
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11627
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10111
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11627
Modified: branches/tmp/samba4-winsrepl/source/lib/registry/config.mk
===
--- branches/tmp/samba4-winsrepl/source/lib/registry/config.mk 2005-09-09
18:09:01 UTC (rev 10120)
+++ branches/tmp/samba4-winsrepl/source/lib/registry/config.mk 2005-09-09
18:09:29 UTC (rev 10121)
@@ -18,7 +18,7 @@
lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c
lib/registry/tdr_regf.c: lib/registry/regf.idl
- @CPP=$(CPP) $(PERL) pidl/pidl --header --outputdir=lib/registry
--parse --tdr-header --tdr-parser -- lib/registry/regf.idl
+ @CPP=$(CPP) $(PERL) pidl/pidl --header --outputdir=lib/registry
--tdr-header --tdr-parser -- lib/registry/regf.idl
# Start MODULE registry_w95
Modified: branches/tmp/samba4-winsrepl/source/pidl/pidl
===
--- branches/tmp/samba4-winsrepl/source/pidl/pidl 2005-09-09 18:09:01 UTC
(rev 10120)
+++ branches/tmp/samba4-winsrepl/source/pidl/pidl 2005-09-09 18:09:29 UTC
(rev 10121)
@@ -62,8 +62,9 @@
}
my($opt_help) = 0;
-my($opt_parse) = 0;
-my($opt_dump) = 0;
+my($opt_parse_tree) = 0;
+my($opt_dump_tree);
+my($opt_dump_idl) = 0;
my($opt_uint_enums) = 0;
my($opt_diff) = 0;
my($opt_header);
@@ -75,7 +76,6 @@
my($opt_tdr_header);
my($opt_tdr_parser);
my($opt_eth_parser);
-my($opt_keep);
my($opt_swig);
my($opt_dcom_proxy);
my($opt_com_header);
@@ -98,15 +98,17 @@
Generic Options:
--help this help page
--outputdir=OUTDIR put output in OUTDIR/ [.]
- --parse parse a idl file to a .pidl file
- --dump dump a pidl file back to idl
- --diff run diff on the idl and dumped output
- --keep[=OUTFILE]keep the .pidl file [BASENAME.pidl]
--odl accept ODL input
--warn-compat warn about incompatibility with other compilers
--quiet be quiet
--verbose be verbose
+Debugging:
+ --dump-tree[=OUTFILE] dump internal representation to file [BASENAME.pidl]
+ --parse-treeread internal representation instead of IDL
+ --dump-idl regenerate IDL file
+ --diff run diff on original IDL and dumped output
+
Samba 4 output:
--header[=OUTFILE] create generic header file [BASENAME.h]
--uint-enumsdon't use C enums, instead use uint* types
@@ -132,8 +134,9 @@
GetOptions (
'help|h|?' = \$opt_help,
'outputdir=s' = \$opt_outputdir,
- 'parse' = \$opt_parse,
- 'dump' = \$opt_dump,
+ 'dump-idl' = \$opt_dump_idl,
+ 'dump-tree:s' = \$opt_dump_tree,
+ 'parse-tree' = \$opt_parse_tree,
'uint-enums' = \$opt_uint_enums,
'ndr-header:s' = \$opt_ndr_header,
'header:s' = \$opt_header,
@@ -147,7 +150,6 @@
'ejs' = \$opt_ejs,
'diff' = \$opt_diff,
'odl' = \$opt_odl,
- 'keep:s' = \$opt_keep,
'swig:s' = \$opt_swig,
'dcom-proxy:s' = \$opt_dcom_proxy,
'com-header:s' = \$opt_com_header,
@@ -170,11 +172,14 @@
my $basename = basename($idl_file, .idl);
- my($pidl_file) = ($opt_keep or $outputdir/$basename.pidl);
+ my($pidl_file) = ($opt_dump_tree or $outputdir/$basename.pidl);
unless ($opt_quiet) { print Compiling $idl_file\n; }
- if ($opt_parse) {
+ if ($opt_parse_tree) {
+ $pidl = LoadStructure($pidl_file);
+ defined $pidl || die Failed to load $pidl_file;
+ } else {
require Parse::Pidl::IDL;
my $idl_parser = new Parse::Pidl::IDL;
@@ -182,19 +187,17 @@
defined @$pidl || die Failed to parse $idl_file;
require
svn commit: samba r10122 - in branches/tmp/samba4-winsrepl: . source/build/smb_build
Author: metze
Date: 2005-09-09 18:09:44 + (Fri, 09 Sep 2005)
New Revision: 10122
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10122
Log:
[EMAIL PROTECTED]: metze | 2005-09-09 13:03:53 +0200
- check attributes depending on the section type
metze
Modified:
branches/tmp/samba4-winsrepl/
branches/tmp/samba4-winsrepl/source/build/smb_build/config_mk.pm
Changeset:
Property changes on: branches/tmp/samba4-winsrepl
___
Name: svk:merge
- 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10111
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11627
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10112
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11627
Modified: branches/tmp/samba4-winsrepl/source/build/smb_build/config_mk.pm
===
--- branches/tmp/samba4-winsrepl/source/build/smb_build/config_mk.pm
2005-09-09 18:09:29 UTC (rev 10121)
+++ branches/tmp/samba4-winsrepl/source/build/smb_build/config_mk.pm
2005-09-09 18:09:44 UTC (rev 10122)
@@ -11,28 +11,73 @@
use strict;
-my %attribute_types = (
- NOPROTO = bool,
- REQUIRED_SUBSYSTEMS = list,
- OUTPUT_TYPE = string,
- INIT_OBJ_FILES = list,
- ADD_OBJ_FILES = list,
- OBJ_FILES = list,
- SUBSYSTEM = string,
- CFLAGS = list,
- CPPFLAGS = list,
- LDFLAGS = list,
- INSTALLDIR = string,
- LIBS = list,
- INIT_FUNCTION = string,
- MAJOR_VERSION = string,
- MINOR_VERSION = string,
- RELEASE_VERSION = string,
- ENABLE = bool,
- CMD = string,
- MANPAGE = string
-);
+my $section_types = {
+ EXT_LIB = {
+ LIBS = list,
+ CFLAGS= list,
+ CPPFLAGS = list,
+ LDFLAGS = list,
+ },
+ SUBSYSTEM = {
+ INIT_FUNCTION = string,
+ INIT_OBJ_FILES= list,
+ ADD_OBJ_FILES = list,
+ OBJ_FILES = list,
+ REQUIRED_SUBSYSTEMS = list,
+ TARGET_DEPS = list,
+
+ ENABLE= bool,
+ NOPROTO = bool,
+
+ MANPAGE = string,
+ },
+ MODULE = {
+ SUBSYSTEM = string,
+
+ INIT_FUNCTION = string,
+ INIT_OBJ_FILES= list,
+ ADD_OBJ_FILES = list,
+ OBJ_FILES = list,
+
+ REQUIRED_SUBSYSTEMS = list,
+ TARGET_DEPS = list,
+
+ ENABLE= bool,
+ NOPROTO = bool,
+
+ MANPAGE = string,
+ },
+ BINARY = {
+ OBJ_FILES = list,
+
+ REQUIRED_SUBSYSTEMS = list,
+ TARGET_DEPS = list,
+
+ ENABLE= bool,
+ NOPROTO = bool,
+
+ MANPAGE = string,
+ INSTALLDIR= string,
+ },
+ LIBRARY = {
+ MAJOR_VERSION = string,
+ MINOR_VERSION = string,
+ RELEASE_VERSION = string,
+
+ OBJ_FILES = list,
+
+ REQUIRED_SUBSYSTEMS = list,
+ TARGET_DEPS = list,
+
+ ENABLE= bool,
+ NOPROTO = bool,
+
+ MANPAGE = string,
+ INSTALLDIR= string,
+ }
+};
+
use vars qw(@parsed_files);
@parsed_files = ();
@@ -118,15 +163,20 @@
foreach my $section (keys %{$result}) {
my ($type, $name) = split(/::/, $section, 2);
-
+
+ my $sectype = $section_types-{$type};
+ if (not defined($sectype)) {
+ die($filename.:[.$section.] unknown section type
\.$type.\!);
+ }
+
$input-{$name}{NAME} = $name;
$input-{$name}{TYPE} = $type;
foreach my $key (values %{$result-{$section}}) {
$key-{VAL} = smb_build::input::strtrim($key-{VAL});
- my $vartype = $attribute_types{$key-{KEY}};
+ my $vartype = $sectype-{$key-{KEY}};
if (not defined($vartype)) {
- die($filename:Unknown attribute $key-{KEY}
with value $key-{VAL} in section $section);
+ die($filename.:[.$section.]: unknown
svn commit: samba r10125 - in branches/tmp/samba4-winsrepl: .
Author: metze Date: 2005-09-09 18:23:38 + (Fri, 09 Sep 2005) New Revision: 10125 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10125 Log: update merge tag, after conflicts metze Modified: branches/tmp/samba4-winsrepl/ Changeset: Property changes on: branches/tmp/samba4-winsrepl ___ Name: svk:merge - 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10112 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495 a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11627 + 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10116 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495 a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11627
svn commit: samba r10126 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: metze Date: 2005-09-09 19:08:36 + (Fri, 09 Sep 2005) New Revision: 10126 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10126 Log: WREPL_REPL_UPDATE also takes a wrepl_table metze Modified: branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl Changeset: Modified: branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl === --- branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl 2005-09-09 18:23:38 UTC (rev 10125) +++ branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl 2005-09-09 19:08:36 UTC (rev 10126) @@ -78,7 +78,7 @@ [case(WREPL_REPL_TABLE_REPLY)] wrepl_table table; [case(WREPL_REPL_SEND_REQUEST)] wrepl_wins_owner owner; [case(WREPL_REPL_SEND_REPLY)] wrepl_send_reply reply; - [case(WREPL_REPL_UPDATE)] ; + [case(WREPL_REPL_UPDATE)] wrepl_table table; [case(WREPL_REPL_5)]wrepl_table table; [case(WREPL_REPL_INFORM)] wrepl_table table; [case(WREPL_REPL_9)]wrepl_table table;
svn commit: samba r10127 - in trunk/source: sam utils
Author: vlendec
Date: 2005-09-09 19:09:42 + (Fri, 09 Sep 2005)
New Revision: 10127
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10127
Log:
Fix the build
Modified:
trunk/source/sam/idmap_rid.c
trunk/source/utils/net_ads.c
Changeset:
Modified: trunk/source/sam/idmap_rid.c
===
--- trunk/source/sam/idmap_rid.c2005-09-09 19:08:36 UTC (rev 10126)
+++ trunk/source/sam/idmap_rid.c2005-09-09 19:09:42 UTC (rev 10127)
@@ -142,6 +142,7 @@
{
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
struct cli_state *cli;
+ struct rpc_pipe_client *pipe_hnd;
TALLOC_CTX *mem_ctx;
POLICY_HND pol;
uint32 des_access = SEC_RIGHTS_MAXIMUM_ALLOWED;
@@ -230,18 +231,22 @@
}
/* query the lsa-pipe */
- if (!cli_nt_session_open (cli, PI_LSARPC)) {
+ pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_LSARPC, status);
+ if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, (rid_idmap_get_domains: could not setup connection to
dc\n));
goto out;
}
/* query policies */
- status = cli_lsa_open_policy(cli, mem_ctx, False, des_access, pol);
+ status = rpccli_lsa_open_policy(pipe_hnd, mem_ctx, False, des_access,
+ pol);
if (!NT_STATUS_IS_OK(status)) {
goto out;
}
- status = cli_lsa_query_info_policy(cli, mem_ctx, pol, info_class,
domain_name, domain_sid);
+ status = rpccli_lsa_query_info_policy(pipe_hnd, mem_ctx, pol,
+ info_class, domain_name,
+ domain_sid);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, (rid_idmap_get_domains: cannot retrieve
domain-info\n));
goto out;
@@ -252,10 +257,10 @@
/* scan trusted domains */
DEBUG(10, (rid_idmap_get_domains: enumerating trusted domains\n));
- status = cli_lsa_enum_trust_dom(cli, mem_ctx, pol, enum_ctx,
- trusted_num_domains,
- trusted_domain_names,
- trusted_domain_sids);
+ status = rpccli_lsa_enum_trust_dom(pipe_hnd, mem_ctx, pol, enum_ctx,
+ trusted_num_domains,
+ trusted_domain_names,
+ trusted_domain_sids);
if (!NT_STATUS_IS_OK(status)
!NT_STATUS_EQUAL(status, NT_STATUS_NO_MORE_ENTRIES)
@@ -313,8 +318,8 @@
status = NT_STATUS_OK;
out:
- cli_lsa_close(cli, mem_ctx, pol);
- cli_nt_session_close(cli);
+ rpccli_lsa_close(pipe_hnd, mem_ctx, pol);
+ cli_rpc_pipe_close(pipe_hnd);
talloc_destroy(mem_ctx);
cli_shutdown(cli);
Modified: trunk/source/utils/net_ads.c
===
--- trunk/source/utils/net_ads.c2005-09-09 19:08:36 UTC (rev 10126)
+++ trunk/source/utils/net_ads.c2005-09-09 19:09:42 UTC (rev 10127)
@@ -980,6 +980,7 @@
ADS_STATUS rc;
const char *servername, *printername;
struct cli_state *cli;
+ struct rpc_pipe_client *pipe_hnd;
struct in_addr server_ip;
NTSTATUS nt_status;
TALLOC_CTX *mem_ctx = talloc_init(net_ads_printer_publish);
@@ -1038,8 +1039,9 @@
asprintf(prt_dn, cn=%s-%s,%s, srv_cn[0], printername, srv_dn);
- cli_nt_session_open(cli, PI_SPOOLSS);
- get_remote_printer_publishing_data(cli, mem_ctx, mods, printername);
+ pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_SPOOLSS, nt_status);
+ get_remote_printer_publishing_data(pipe_hnd, mem_ctx, mods,
+ printername);
rc = ads_add_printer_entry(ads, prt_dn, mem_ctx, mods);
if (!ADS_ERR_OK(rc)) {
svn commit: samba r10128 - in branches/tmp/samba4-winsrepl: . source/librpc/idl source/pidl/lib/Parse/Pidl source/pidl/lib/Parse/Pidl/Ethereal
Author: metze
Date: 2005-09-09 19:21:26 + (Fri, 09 Sep 2005)
New Revision: 10128
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10128
Log:
[EMAIL PROTECTED] (orig r10123): jelmer | 2005-09-09 20:21:59 +0200
Add more warnings. Support quotes in conformance command arguments
[EMAIL PROTECTED] (orig r10126): metze | 2005-09-09 21:08:36 +0200
WREPL_REPL_UPDATE also takes a wrepl_table
metze
Modified:
branches/tmp/samba4-winsrepl/
branches/tmp/samba4-winsrepl/source/librpc/idl/winsrepl.idl
branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Util.pm
Changeset:
Property changes on: branches/tmp/samba4-winsrepl
___
Name: svk:merge
- 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10116
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11627
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10126
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11627
Modified: branches/tmp/samba4-winsrepl/source/librpc/idl/winsrepl.idl
===
--- branches/tmp/samba4-winsrepl/source/librpc/idl/winsrepl.idl 2005-09-09
19:09:42 UTC (rev 10127)
+++ branches/tmp/samba4-winsrepl/source/librpc/idl/winsrepl.idl 2005-09-09
19:21:26 UTC (rev 10128)
@@ -78,7 +78,7 @@
[case(WREPL_REPL_TABLE_REPLY)] wrepl_table table;
[case(WREPL_REPL_SEND_REQUEST)] wrepl_wins_owner owner;
[case(WREPL_REPL_SEND_REPLY)] wrepl_send_reply reply;
- [case(WREPL_REPL_UPDATE)] ;
+ [case(WREPL_REPL_UPDATE)] wrepl_table table;
[case(WREPL_REPL_5)]wrepl_table table;
[case(WREPL_REPL_INFORM)] wrepl_table table;
[case(WREPL_REPL_9)]wrepl_table table;
Modified:
branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
===
---
branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
2005-09-09 19:09:42 UTC (rev 10127)
+++
branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
2005-09-09 19:21:26 UTC (rev 10128)
@@ -31,7 +31,7 @@
print $pos: warning: invalid FT_TYPE `$ft_type'\n;
}
- unless(alid_base_type($base_type)) {
+ unless (valid_base_type($base_type)) {
print $pos: warning: invalid BASE_TYPE `$base_type'\n;
}
@@ -74,7 +74,12 @@
return;
}
- $data-{dissectorparams}-{$dissector_name} = $value;
+ $data-{dissectorparams}-{$dissector_name} = {
+ DISSECTOR = $dissector_name,
+ PARAM = $value,
+ POS = $pos,
+ USED = 0
+ };
}
sub valid_base_type($)
@@ -158,7 +163,11 @@
{
my ($pos,$data,$field,$desc) = @_;
- $data-{fielddescription}-{$field} = $desc;
+ $data-{fielddescription}-{$field} = {
+ DESCRIPTION = $desc,
+ POS = $pos,
+ USED = 0
+ };
}
sub handle_import
@@ -172,7 +181,12 @@
return;
}
- $data-{imports}-{$dissectorname} = join(' ', @_);
+ $data-{imports}-{$dissectorname} = {
+ NAME = $dissectorname,
+ DATA = join(' ', @_),
+ USED = 0,
+ POS = $pos
+ };
}
my %field_handlers = (
Modified:
branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
===
--- branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
2005-09-09 19:09:42 UTC (rev 10127)
+++ branches/tmp/samba4-winsrepl/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
2005-09-09 19:21:26 UTC (rev 10128)
@@ -10,12 +10,11 @@
use strict;
use Parse::Pidl::Typelist;
-use Parse::Pidl::Util qw(has_property ParseExpr property_matches);
+use Parse::Pidl::Util qw(has_property ParseExpr property_matches make_str);
use Parse::Pidl::NDR;
use Parse::Pidl::Dump qw(DumpTypedef DumpFunction);
use Parse::Pidl::Ethereal::Conformance qw(ReadConformance);
-my %types;
my @ett;
my %hf_used = ();
@@ -238,7 +237,8 @@
my $param = 0;
if (defined($conformance-{dissectorparams}-{$myname})) {
- $param = $conformance-{dissectorparams}-{$myname};
+ $conformance-{dissectorparams}-{$myname}-{PARAM} = 1;
+ $param = $conformance-{dissectorparams}-{$myname}-{PARAM};
}
if ($l-{TYPE} eq POINTER) {
@@ -285,10 +285,12 @@
svn commit: samba r10129 - in branches/SAMBA_4_0/source: libcli/wrepl librpc/idl
Author: metze
Date: 2005-09-09 19:55:34 + (Fri, 09 Sep 2005)
New Revision: 10129
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10129
Log:
fix sinple ip's in wins replication, packets
metze
Modified:
branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c
branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c
===
--- branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c 2005-09-09 19:21:26 UTC
(rev 10128)
+++ branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c 2005-09-09 19:55:34 UTC
(rev 10129)
@@ -672,10 +672,9 @@
name-num_addresses = 1;
name-addresses = talloc(io-out.names, struct
wrepl_address);
if (name-addresses == NULL) goto failed;
- name-addresses[0].owner =
talloc_steal(name-addresses,
-
wname-addresses.address.owner);
+ name-addresses[0].owner = io-in.partner.address;
name-addresses[0].address =
talloc_steal(name-addresses,
-
wname-addresses.address.ip);
+
wname-addresses.ip);
}
}
Modified: branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl 2005-09-09 19:21:26 UTC
(rev 10128)
+++ branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl 2005-09-09 19:55:34 UTC
(rev 10129)
@@ -27,11 +27,10 @@
typedef [flag(NDR_LITTLE_ENDIAN)] struct {
uint32 num_ips;
wrepl_ipips[num_ips];
- ipv4address unknown;
} wrepl_address_list;
typedef [nodiscriminant] union {
- [case(0)] wrepl_ip address;
+ [case(0)] ipv4address ip;
[case(2)] wrepl_address_list addresses;
} wrepl_addresses;
@@ -42,6 +41,7 @@
[flag(NDR_LITTLE_ENDIAN)] uint32 group_flag;
udlongr id;
[switch_is(flags 2)] wrepl_addresses addresses;
+ ipv4address unknown;
} wrepl_wins_name;
typedef struct {
svn commit: samba r10130 - in branches/tmp/samba4-winsrepl: . source/libcli/wrepl
Author: metze Date: 2005-09-09 19:55:59 + (Fri, 09 Sep 2005) New Revision: 10130 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10130 Log: [EMAIL PROTECTED] (orig r10129): metze | 2005-09-09 21:55:34 +0200 fix sinple ip's in wins replication, packets metze Modified: branches/tmp/samba4-winsrepl/ branches/tmp/samba4-winsrepl/source/libcli/wrepl/winsrepl.c Changeset: Property changes on: branches/tmp/samba4-winsrepl ___ Name: svk:merge - 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10126 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495 a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11627 + 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10129 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495 a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11627 Modified: branches/tmp/samba4-winsrepl/source/libcli/wrepl/winsrepl.c === --- branches/tmp/samba4-winsrepl/source/libcli/wrepl/winsrepl.c 2005-09-09 19:55:34 UTC (rev 10129) +++ branches/tmp/samba4-winsrepl/source/libcli/wrepl/winsrepl.c 2005-09-09 19:55:59 UTC (rev 10130) @@ -672,10 +672,9 @@ name-num_addresses = 1; name-addresses = talloc(io-out.names, struct wrepl_address); if (name-addresses == NULL) goto failed; - name-addresses[0].owner = talloc_steal(name-addresses, - wname-addresses.address.owner); + name-addresses[0].owner = io-in.partner.address; name-addresses[0].address = talloc_steal(name-addresses, - wname-addresses.address.ip); + wname-addresses.ip); } }
svn commit: samba r10131 - in branches/tmp/vl-cluster/source: . auth include lib libads libsmb modules nsswitch passdb registry rpc_client rpc_parse rpc_server rpcclient sam smbd utils
Author: vlendec Date: 2005-09-09 20:13:15 + (Fri, 09 Sep 2005) New Revision: 10131 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10131 Log: Merge head up to r1030 Modified: branches/tmp/vl-cluster/source/auth/auth_domain.c branches/tmp/vl-cluster/source/configure.in branches/tmp/vl-cluster/source/include/adt_tree.h branches/tmp/vl-cluster/source/include/client.h branches/tmp/vl-cluster/source/include/includes.h branches/tmp/vl-cluster/source/include/ntdomain.h branches/tmp/vl-cluster/source/include/rpc_client.h branches/tmp/vl-cluster/source/include/rpc_dce.h branches/tmp/vl-cluster/source/include/rpc_dfs.h branches/tmp/vl-cluster/source/include/rpc_misc.h branches/tmp/vl-cluster/source/include/rpc_netlogon.h branches/tmp/vl-cluster/source/include/smb.h branches/tmp/vl-cluster/source/lib/adt_tree.c branches/tmp/vl-cluster/source/libads/ldap_printer.c branches/tmp/vl-cluster/source/libsmb/clientgen.c branches/tmp/vl-cluster/source/libsmb/clierror.c branches/tmp/vl-cluster/source/libsmb/clireadwrite.c branches/tmp/vl-cluster/source/libsmb/clitrans.c branches/tmp/vl-cluster/source/libsmb/credentials.c branches/tmp/vl-cluster/source/libsmb/libsmbclient.c branches/tmp/vl-cluster/source/libsmb/passchange.c branches/tmp/vl-cluster/source/libsmb/pwd_cache.c branches/tmp/vl-cluster/source/libsmb/trusts_util.c branches/tmp/vl-cluster/source/modules/vfs_default_quota.c branches/tmp/vl-cluster/source/nsswitch/winbindd.h branches/tmp/vl-cluster/source/nsswitch/winbindd_ads.c branches/tmp/vl-cluster/source/nsswitch/winbindd_cm.c branches/tmp/vl-cluster/source/nsswitch/winbindd_misc.c branches/tmp/vl-cluster/source/nsswitch/winbindd_pam.c branches/tmp/vl-cluster/source/passdb/secrets.c branches/tmp/vl-cluster/source/registry/reg_cachehook.c branches/tmp/vl-cluster/source/rpc_client/cli_dfs.c branches/tmp/vl-cluster/source/rpc_client/cli_ds.c branches/tmp/vl-cluster/source/rpc_client/cli_echo.c branches/tmp/vl-cluster/source/rpc_client/cli_lsarpc.c branches/tmp/vl-cluster/source/rpc_client/cli_netlogon.c branches/tmp/vl-cluster/source/rpc_client/cli_pipe.c branches/tmp/vl-cluster/source/rpc_client/cli_reg.c branches/tmp/vl-cluster/source/rpc_client/cli_samr.c branches/tmp/vl-cluster/source/rpc_client/cli_shutdown.c branches/tmp/vl-cluster/source/rpc_client/cli_spoolss.c branches/tmp/vl-cluster/source/rpc_client/cli_spoolss_notify.c branches/tmp/vl-cluster/source/rpc_client/cli_srvsvc.c branches/tmp/vl-cluster/source/rpc_client/cli_svcctl.c branches/tmp/vl-cluster/source/rpc_client/cli_unixinfo.c branches/tmp/vl-cluster/source/rpc_client/cli_wkssvc.c branches/tmp/vl-cluster/source/rpc_parse/parse_ds.c branches/tmp/vl-cluster/source/rpc_parse/parse_net.c branches/tmp/vl-cluster/source/rpc_parse/parse_prs.c branches/tmp/vl-cluster/source/rpc_parse/parse_rpc.c branches/tmp/vl-cluster/source/rpc_server/srv_netlog_nt.c branches/tmp/vl-cluster/source/rpc_server/srv_pipe.c branches/tmp/vl-cluster/source/rpc_server/srv_spoolss_nt.c branches/tmp/vl-cluster/source/rpcclient/cmd_dfs.c branches/tmp/vl-cluster/source/rpcclient/cmd_ds.c branches/tmp/vl-cluster/source/rpcclient/cmd_echo.c branches/tmp/vl-cluster/source/rpcclient/cmd_lsarpc.c branches/tmp/vl-cluster/source/rpcclient/cmd_netlogon.c branches/tmp/vl-cluster/source/rpcclient/cmd_samr.c branches/tmp/vl-cluster/source/rpcclient/cmd_spoolss.c branches/tmp/vl-cluster/source/rpcclient/cmd_srvsvc.c branches/tmp/vl-cluster/source/rpcclient/cmd_test.c branches/tmp/vl-cluster/source/rpcclient/cmd_unixinfo.c branches/tmp/vl-cluster/source/rpcclient/cmd_wkssvc.c branches/tmp/vl-cluster/source/rpcclient/rpcclient.c branches/tmp/vl-cluster/source/rpcclient/rpcclient.h branches/tmp/vl-cluster/source/sam/idmap_rid.c branches/tmp/vl-cluster/source/smbd/change_trust_pw.c branches/tmp/vl-cluster/source/smbd/process.c branches/tmp/vl-cluster/source/smbd/server.c branches/tmp/vl-cluster/source/utils/net.c branches/tmp/vl-cluster/source/utils/net.h branches/tmp/vl-cluster/source/utils/net_ads.c branches/tmp/vl-cluster/source/utils/net_rpc.c branches/tmp/vl-cluster/source/utils/net_rpc_join.c branches/tmp/vl-cluster/source/utils/net_rpc_printer.c branches/tmp/vl-cluster/source/utils/net_rpc_registry.c branches/tmp/vl-cluster/source/utils/net_rpc_rights.c branches/tmp/vl-cluster/source/utils/net_rpc_samsync.c branches/tmp/vl-cluster/source/utils/net_rpc_service.c branches/tmp/vl-cluster/source/utils/smbcacls.c branches/tmp/vl-cluster/source/utils/smbcquotas.c Changeset: Sorry, the patch is too large (27440 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10131
svn commit: samba r10132 - in branches/SAMBA_4_0/source/torture/raw: .
Author: jra Date: 2005-09-09 21:45:36 + (Fri, 09 Sep 2005) New Revision: 10132 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10132 Log: Confirm that openX with OPEN_EXEC implies read only. Jeremy. Modified: branches/SAMBA_4_0/source/torture/raw/open.c Changeset: Modified: branches/SAMBA_4_0/source/torture/raw/open.c === --- branches/SAMBA_4_0/source/torture/raw/open.c2005-09-09 20:13:15 UTC (rev 10131) +++ branches/SAMBA_4_0/source/torture/raw/open.c2005-09-09 21:45:36 UTC (rev 10132) @@ -265,6 +265,7 @@ union smb_open io; union smb_fileinfo finfo; const char *fname = BASEDIR \\torture_openx.txt; + const char *fname_exe = BASEDIR \\torture_openx.exe; NTSTATUS status; int fnum = -1, fnum2; BOOL ret = True; @@ -444,8 +445,33 @@ status = smb_raw_open(cli-tree, mem_ctx, io); CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND); + /* Check the mapping for open exec. */ + + /* First create an .exe file. */ + smbcli_unlink(cli-tree, fname_exe); + fnum = create_complex_file(cli, mem_ctx, fname_exe); + smbcli_close(cli-tree, fnum); + + io.openx.level = RAW_OPEN_OPENX; + io.openx.in.fname = fname_exe; + io.openx.in.flags = OPENX_FLAGS_ADDITIONAL_INFO; + io.openx.in.open_mode = OPENX_MODE_ACCESS_EXEC | OPENX_MODE_DENY_NONE; + io.openx.in.search_attrs = 0; + io.openx.in.file_attrs = 0; + io.openx.in.write_time = 0; + io.openx.in.size = 0; + io.openx.in.timeout = 0; + status = smb_raw_open(cli-tree, mem_ctx, io); + CHECK_STATUS(status, NT_STATUS_OK); + + /* Can we read and write ? */ + CHECK_RDWR(io.openx.out.fnum, RDWR_RDONLY); + smbcli_close(cli-tree, io.openx.out.fnum); + smbcli_unlink(cli-tree, fname); + done: smbcli_close(cli-tree, fnum); + smbcli_unlink(cli-tree, fname_exe); smbcli_unlink(cli-tree, fname); return ret;
svn commit: samba r10133 - in branches/SAMBA_3_0/source/smbd: .
Author: jra
Date: 2005-09-09 21:49:16 + (Fri, 09 Sep 2005)
New Revision: 10133
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10133
Log:
Fix bug #3044. open-exec is read-only.
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/open.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/open.c
===
--- branches/SAMBA_3_0/source/smbd/open.c 2005-09-09 21:45:36 UTC (rev
10132)
+++ branches/SAMBA_3_0/source/smbd/open.c 2005-09-09 21:49:16 UTC (rev
10133)
@@ -1046,13 +1046,13 @@
/* Create the NT compatible access_mask. */
switch (GET_OPENX_MODE(deny_mode)) {
+ case DOS_OPEN_EXEC: /* Implies read-only - used to be
FILE_READ_DATA */
case DOS_OPEN_RDONLY:
access_mask = FILE_GENERIC_READ;
break;
case DOS_OPEN_WRONLY:
access_mask = FILE_GENERIC_WRITE;
break;
- case DOS_OPEN_EXEC: /* This used to be FILE_READ_DATA... */
case DOS_OPEN_RDWR:
case DOS_OPEN_FCB:
access_mask = FILE_GENERIC_READ|FILE_GENERIC_WRITE;
svn commit: samba r10134 - in trunk/source/smbd: .
Author: jra
Date: 2005-09-09 21:49:23 + (Fri, 09 Sep 2005)
New Revision: 10134
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10134
Log:
Fix bug #3044. open-exec is read-only.
Jeremy.
Modified:
trunk/source/smbd/open.c
Changeset:
Modified: trunk/source/smbd/open.c
===
--- trunk/source/smbd/open.c2005-09-09 21:49:16 UTC (rev 10133)
+++ trunk/source/smbd/open.c2005-09-09 21:49:23 UTC (rev 10134)
@@ -905,13 +905,13 @@
/* Create the NT compatible access_mask. */
switch (GET_OPENX_MODE(deny_mode)) {
+ case DOS_OPEN_EXEC: /* Implies read-only - used to be
FILE_READ_DATA */
case DOS_OPEN_RDONLY:
access_mask = FILE_GENERIC_READ;
break;
case DOS_OPEN_WRONLY:
access_mask = FILE_GENERIC_WRITE;
break;
- case DOS_OPEN_EXEC: /* This used to be FILE_READ_DATA... */
case DOS_OPEN_RDWR:
case DOS_OPEN_FCB:
access_mask = FILE_GENERIC_READ|FILE_GENERIC_WRITE;
svn commit: samba r10135 - in branches/SAMBA_3_0/source: . libsmb
Author: jra
Date: 2005-09-09 21:49:49 + (Fri, 09 Sep 2005)
New Revision: 10135
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10135
Log:
Remove external dependencies for libsmbsharemodes.so
Jeremy.
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0/source/libsmb/smb_share_modes.c
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===
--- branches/SAMBA_3_0/source/Makefile.in 2005-09-09 21:49:23 UTC (rev
10134)
+++ branches/SAMBA_3_0/source/Makefile.in 2005-09-09 21:49:49 UTC (rev
10135)
@@ -517,7 +517,7 @@
$(LIBMSRPC_OBJ) $(RPC_PARSE_OBJ) \
$(SECRETS_OBJ) $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ)
-LIBSMBSHAREMODES_OBJ = libsmb/smb_share_modes.o tdb/tdb.o
+LIBSMBSHAREMODES_OBJ = libsmb/smb_share_modes.o tdb/tdb.o tdb/spinlock.o
CAC_OBJ = $(LIBSMBCLIENT_OBJ) \
libmsrpc/libmsrpc.o libmsrpc/libmsrpc_internal.o \
Modified: branches/SAMBA_3_0/source/libsmb/smb_share_modes.c
===
--- branches/SAMBA_3_0/source/libsmb/smb_share_modes.c 2005-09-09 21:49:23 UTC
(rev 10134)
+++ branches/SAMBA_3_0/source/libsmb/smb_share_modes.c 2005-09-09 21:49:49 UTC
(rev 10135)
@@ -22,13 +22,18 @@
#include includes.h
#include smb_share_modes.h
+/* Remove the paranoid malloc checker. */
+#ifdef malloc
+#undef malloc
+#endif
+
/*
* open/close sharemode database.
*/
struct smbdb_ctx *smb_share_mode_db_open(const char *db_path)
{
- struct smbdb_ctx *smb_db = SMB_MALLOC_P(struct smbdb_ctx);
+ struct smbdb_ctx *smb_db = (struct smbdb_ctx *)malloc(sizeof(struct
smbdb_ctx));
if (!smb_db) {
return NULL;
@@ -36,11 +41,7 @@
memset(smb_db, '\0', sizeof(struct smbdb_ctx));
- if (!db_path) {
- db_path = lock_path(locking.tdb);
- }
-
- smb_db-smb_tdb = tdb_open_log(db_path,
+ smb_db-smb_tdb = tdb_open(db_path,
0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST,
O_RDWR|O_CREAT,
0644);
@@ -184,7 +185,7 @@
return 0;
}
- list = SMB_MALLOC_ARRAY(struct smb_share_mode_entry, num_share_modes);
+ list = (struct smb_share_mode_entry *)malloc(sizeof(struct
smb_share_mode_entry)*num_share_modes);
if (!list) {
free(db_data.dptr);
return -1;
@@ -247,7 +248,7 @@
db_data = tdb_fetch(db_ctx-smb_tdb, locking_key);
if (!db_data.dptr) {
/* We must create the entry. */
- db_data.dptr = SMB_MALLOC(sizeof(struct locking_data) +
sizeof(share_mode_entry) + strlen(filename) + 1);
+ db_data.dptr = malloc(sizeof(struct locking_data) +
sizeof(share_mode_entry) + strlen(filename) + 1);
if (!db_data.dptr) {
return -1;
}
@@ -270,7 +271,7 @@
}
/* Entry exists, we must add a new entry. */
- new_data_p = SMB_MALLOC(db_data.dsize + sizeof(share_mode_entry));
+ new_data_p = malloc(db_data.dsize + sizeof(share_mode_entry));
if (!new_data_p) {
free(db_data.dptr);
return -1;
@@ -345,7 +346,7 @@
}
/* More than one - allocate a new record minus the one we'll delete. */
- new_data_p = SMB_MALLOC(db_data.dsize - sizeof(share_mode_entry));
+ new_data_p = malloc(db_data.dsize - sizeof(share_mode_entry));
if (!new_data_p) {
free(db_data.dptr);
return -1;
Build status as of Sat Sep 10 00:00:02 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-09-09 00:00:20.0 + +++ /home/build/master/cache/broken_results.txt 2005-09-10 00:00:12.0 + @@ -1,17 +1,17 @@ -Build status as of Fri Sep 9 00:00:02 2005 +Build status as of Sat Sep 10 00:00:02 2005 Build counts: Tree Total Broken Panic -ccache 7 2 0 -distcc 7 2 0 -lorikeet-heimdal 34 18 0 +ccache 6 2 0 +distcc 6 2 0 +lorikeet-heimdal 35 17 0 ppp 23 0 0 -rsync36 2 0 -samba2 0 0 +rsync37 2 0 +samba1 0 0 samba-docs 0 0 0 -samba4 41 20 0 -samba_3_038 18 0 +samba4 42 31 0 +samba_3_039 20 0 smb-build29 3 0 -talloc 10 4 0 -tdb 7 4 0 +talloc 8 3 0 +tdb 6 3 0
svn commit: samba r10136 - in branches/SAMBA_3_0/source/smbd: .
Author: jra
Date: 2005-09-10 00:47:31 + (Sat, 10 Sep 2005)
New Revision: 10136
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10136
Log:
Fix for bug #3060 from Leo Weppelman [EMAIL PROTECTED].
Ensure SMBcreate truncates the file if it exists.
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/reply.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/reply.c
===
--- branches/SAMBA_3_0/source/smbd/reply.c 2005-09-09 21:49:49 UTC (rev
10135)
+++ branches/SAMBA_3_0/source/smbd/reply.c 2005-09-10 00:47:31 UTC (rev
10136)
@@ -1610,7 +1610,7 @@
create_disposition = FILE_CREATE;
} else {
/* Create if file doesn't exist, truncate if it does. */
- create_disposition = FILE_OPEN_IF;
+ create_disposition = FILE_OVERWRITE_IF;
}
/* Open file using ntcreate. */
svn commit: samba r10137 - in trunk/source/smbd: .
Author: jra
Date: 2005-09-10 00:47:44 + (Sat, 10 Sep 2005)
New Revision: 10137
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=10137
Log:
Fix for bug #3060 from Leo Weppelman [EMAIL PROTECTED].
Ensure SMBcreate truncates the file if it exists.
Jeremy.
Modified:
trunk/source/smbd/reply.c
Changeset:
Modified: trunk/source/smbd/reply.c
===
--- trunk/source/smbd/reply.c 2005-09-10 00:47:31 UTC (rev 10136)
+++ trunk/source/smbd/reply.c 2005-09-10 00:47:44 UTC (rev 10137)
@@ -1609,7 +1609,7 @@
create_disposition = FILE_CREATE;
} else {
/* Create if file doesn't exist, truncate if it does. */
- create_disposition = FILE_OPEN_IF;
+ create_disposition = FILE_OVERWRITE_IF;
}
/* Open file using ntcreate. */
