[Samba] Question: backslash in file name
Hi I have a applikation (Oracle DB) which writes files with a backslash in names, i.e: Log\GEN_INPUT_BASED_2899.csv not a problem for Unix but Samba present it to Windows users as: L2CYOP~L.CSV Is there any way _in Samba_ to strip this 'Log\' and give back to user the GEN_INPUT_BASED_2899.csv part. Tha appliance (EMC Celerra) I've just migrated data from, was magicaly doing this. Thanks for your time and any hint. Regards, Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Question: backslash in file name
On Thu, 2007-10-25 at 16:31 +0200, Chris Osicki wrote: Hi I have a applikation (Oracle DB) which writes files with a backslash in names, i.e: Log\GEN_INPUT_BASED_2899.csv not a problem for Unix but Samba present it to Windows users as: L2CYOP~L.CSV Is there any way _in Samba_ to strip this 'Log\' and give back to user the GEN_INPUT_BASED_2899.csv part. Tha appliance (EMC Celerra) I've just migrated data from, was magicaly doing this. Thanks for your time and any hint. You could create (or ask someone to do it) a VFS module to mangle these file names before they are passed internally to Samba, and change them again when samba uses them. Simo. -- Simo Sorce Samba Team GPL Compliance Officer [EMAIL PROTECTED] Senior Software Engineer at Red Hat Inc. [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Question: backslash in file name
On Thu, 25 Oct 2007 16:31:56 +0200 Chris Osicki [EMAIL PROTECTED] wrote: Hi I have a applikation (Oracle DB) which writes files with a backslash in names, i.e: Log\GEN_INPUT_BASED_2899.csv not a problem for Unix but Samba present it to Windows users as: L2CYOP~L.CSV Is there any way _in Samba_ to strip this 'Log\' and give back to user the GEN_INPUT_BASED_2899.csv part. Tha appliance (EMC Celerra) I've just migrated data from, was magicaly doing this. Thanks for your time and any hint. Regards, Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba Replying to my own stupid question. Samba cannot do anything else, what it does is correct. Sorry for the noise. Regards, Chris -- 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.25c and Samba 3.0.26a on AIX 5.3 - Windows Service Accounts smbclient issues...
Just the beginning of a question to anyone who might have experienced the following issue with Samba 3.0.2[5-6] series. We currently have service accounts accessing Samba shares on AIX 5.3 servers ( from TL04 - TL06 ). Most of the processes access the shares via UNC rather than mapped drives. After completing the upgrade to Samba 3.0.26a on the production side, the service accounts started getting locked out of the domain due to invalid logins; but in most instances we could connect to the share using the user ID and password with no issues. A roll back to Samba 3.0.24 fixed the issue. Regular users/accounts are having no issues mapping to shares and working as normal. We are using SECURITY = SERVER and specified a DC as the password server. From the global settings of the smb.conf: [global] workgroup = AMERICREDIT server string = BCERPDB1 AIX SAMBA Server interfaces = 10.193.3.138/24 bind interfaces only = Yes security = SERVER update encrypted = Yes password server = srvdcbnt01.acf.americredit.com username map = /usr/local/samba/var/users.map restrict anonymous = 2 lanman auth = No ntlm auth = No client NTLMv2 auth = Yes client lanman auth = No client plaintext auth = No log file = /usr/local/samba/var/log/log.%m max log size = 1024 socket options = load printers = No wins server = 10.193.7.90 ldap ssl = no socket address = 10.193.3.138 admin users = mgipso1, tcato1, bhock1, amunoz1, lsaxon1 create mask = 0664 directory mask = 0775 preserve case = No short preserve case = No delete veto files = Yes veto files = /*.eml/ mangled names = No browseable = No restrict anonymous = 2 In the logs we see the following: [2007/10/17 07:29:28, 1] auth/auth_server.c:check_smbserver_security(362) password server SRVDCBNT01.ACF.AMERICREDIT.COM rejected the password: NT_STATUS_LOGON_FAILURE [2007/10/17 07:29:28, 0] lib/access.c:check_access(327) Denied connection from (10.192.7.210) [2007/10/17 07:29:28, 1] auth/auth_server.c:check_smbserver_security(362) password server SRVDCBNT01.ACF.AMERICREDIT.COM rejected the password: NT_STATUS_LOGON_FAILURE [2007/10/17 07:29:34, 0] lib/access.c:check_access(327) Denied connection from (10.192.7.210) [2007/10/17 07:29:34, 1] auth/auth_server.c:check_smbserver_security(362) password server SRVDCBNT01.ACF.AMERICREDIT.COM rejected the password: NT_STATUS_LOGON_FAILURE [2007/10/17 07:29:34, 0] lib/access.c:check_access(327) Denied connection from (10.192.7.210) [2007/10/17 07:29:34, 1] auth/auth_server.c:check_smbserver_security(362) password server SRVDCBNT01.ACF.AMERICREDIT.COM rejected the password: NT_STATUS_LOGON_FAILURE [2007/10/17 07:29:43, 0] lib/access.c:check_access(327) Denied connection from (10.192.7.210) [2007/10/17 07:29:43, 1] auth/auth_server.c:check_smbserver_security(362) password server SRVDCBNT01.ACF.AMERICREDIT.COM rejected the password: NT_STATUS_LOGON_FAILURE [2007/10/17 07:29:43, 0] lib/access.c:check_access(327) Denied connection from (10.192.7.210) [2007/10/17 07:29:43, 1] auth/auth_server.c:check_smbserver_security(362) password server SRVDCBNT01.ACF.AMERICREDIT.COM rejected the password: NT_STATUS_ACCOUNT_LOCKED_OUT Also, on the same note after upgrading Samba to 3.0.26a; smbclient has issues connecting to the same shares while 3.0.24 has none... 3.0.24 smbclient cannot connect to 3.0.26 servers nor can 3.0.26 smbclient connect to 3.0.26 servers. 3.0.24 smbclient to 3.0.24 Samba Server: [EMAIL PROTECTED]:/usr/local/samba/var/log: /usr/local/samba/sbin/smbd -V Version 3.0.24 [EMAIL PROTECTED]:/usr/local/samba/var/log: /usr/local/samba/bin/smbclient -U lsaxon1 //aoccdw1/datarepos Password: Domain=[AMERICREDIT] OS=[Unix] Server=[Samba 3.0.24] smb: \ quit 3.0.24 smbclient to 3.0.26a Samba Server: [EMAIL PROTECTED]:/usr/local/samba/var/log: /usr/local/samba/bin/smbclient -U lsaxon1 //aoctoolbox/instimages Password: session setup failed: NT_STATUS_LOGON_FAILURE [EMAIL PROTECTED]:/usr/local/samba/var/log: With debug 5: [EMAIL PROTECTED]:/usr/local/samba/var/log: /usr/local/samba/bin/smbclient -d 5 -U lsaxon1 //aoctoolbox/instimages INFO: Current debug levels: all: True/5 tdb: False/0 printdrivers: False/0 lanman: False/0 smb: False/0 rpc_parse: False/0 rpc_srv: False/0 rpc_cli: False/0 passdb: False/0 sam: False/0 auth: False/0 winbind: False/0 vfs: False/0 idmap: False/0 quota: False/0 acls: False/0 locking: False/0 msdfs: False/0 dmapi: False/0 lp_load: refreshing parameters Initialising global parameters params.c:pm_process() - Processing configuration file /usr/local/samba/etc/smb.conf Processing section [global] doing parameter workgroup = AMERICREDIT doing parameter server string = BCERPDB1 AIX SAMBA Server doing parameter
[Samba] Hosts Disappearing
I have a problem with my long-running Samba workgroup where hosts will stop coming up in View Network Computers. Only the UNIX system with Samba running shows up. If I restart Samba on the UNIX system then the hosts start showing up again in a few minutes. Any thoughts out there? Thanks, Rick -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba PDC without encryption
I setup a working PDC, with exception of one major issue: These are the two relevant lines: encrypt passwords = no obey pam restrictions = yes If I set encrypt passwords = yes I can join the domain and login and everything works perfectly from windows xp sp2. However; pam doesn't work with encrypt passwords, so I can't use encrypt passwords in authenticating users. The end goal is to authenticate windows machines to the same auth servers we have in the linux/mac/solaris realm, which is an ldap server (or NIS for solaris), that uses kerberos for password authentication. I've heard it's possible to get windows to authenticate to the kerberos server through samba, but windows expects the kerberos server to have an NT hash to authenticate to, which would break the rest of the network, so I went down the pam path, and got that working fine in pam for accessing shares, but kept getting a this user is unauthorized to login to this machine error when I tried to join the domain as root (which will authenticate through pam files just fine for accessing shares). I also have root with the same password encrypted, via smbpasswd, and when I set encypt passwords = yes, the domain works like a charm, for root and my other user I manually created accounts for. Has anyone attempted to do something like this? I know it's kinda stretching the limits of samba (or more likely the flexibility of windows), but if I could make this work, everyone in the department would only have one password to worry about, and to allow someone to login to windows machines, all I'd have to do is add them to the winusers group. Our current setup is a windows 2000 server that is completely disconnected from the rest of the network that I'm trying to retire. If it comes down to it, I could keep this new server as a separate entity on the network as well, but I'd much rather get this to work. Sam -- Sam Leathers Penn State University Astronomy Astrophysics Department 520 Davey Lab (814)863-9347 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Hosts Disappearing
I have a problem with my long-running Samba workgroup where hosts will stop coming up in View Network Computers. Only the UNIX system with Samba running shows up. If I restart Samba on the UNIX system then the hosts start showing up again in a few minutes. Any thoughts out there? Thanks, Rick Past experience with this is that it's a browser service issue. Programs like browmon and browstat can be downloaded to figure out which machine thinks it's the master browser on the network. An easy fix is to disable/stop the computer browser service on all machines except the server. Shawn -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba PDC without encryption
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 I can tell you that you MUST use encrypted passwords on a PDC. Any information about this and more is in the docs. Sam Leathers wrote: I setup a working PDC, with exception of one major issue: These are the two relevant lines: encrypt passwords = no obey pam restrictions = yes If I set encrypt passwords = yes I can join the domain and login and everything works perfectly from windows xp sp2. However; pam doesn't work with encrypt passwords, so I can't use encrypt passwords in authenticating users. The end goal is to authenticate windows machines to the same auth servers we have in the linux/mac/solaris realm, which is an ldap server (or NIS for solaris), that uses kerberos for password authentication. I've heard it's possible to get windows to authenticate to the kerberos server through samba, but windows expects the kerberos server to have an NT hash to authenticate to, which would break the rest of the network, so I went down the pam path, and got that working fine in pam for accessing shares, but kept getting a this user is unauthorized to login to this machine error when I tried to join the domain as root (which will authenticate through pam files just fine for accessing shares). I also have root with the same password encrypted, via smbpasswd, and when I set encypt passwords = yes, the domain works like a charm, for root and my other user I manually created accounts for. Has anyone attempted to do something like this? I know it's kinda stretching the limits of samba (or more likely the flexibility of windows), but if I could make this work, everyone in the department would only have one password to worry about, and to allow someone to login to windows machines, all I'd have to do is add them to the winusers group. Our current setup is a windows 2000 server that is completely disconnected from the rest of the network that I'm trying to retire. If it comes down to it, I could keep this new server as a separate entity on the network as well, but I'd much rather get this to work. Sam - -- _ _ _ _ ___ _ _ _ |Y#| | | |\/| | \ |\ | | |Ryan Novosielski - Systems Programmer II |$| |__| | | |__/ | \| _| |[EMAIL PROTECTED] - 973/972.0922 (2-0922) \__/ Univ. of Med. and Dent.|IST/AST - NJMS Medical Science Bldg - C630 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFHIOQTmb+gadEcsb4RAhHCAKDcR2qSIrUei38dAssn38lLSUgMzACgzw/a nZUtTngLQ7eeALSUJ0TcOnI= =Bx3N -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Accumulating smbd processes and sockets in CLOSE_WAIT state
Hello list Our central fileserver is a Samba 3.0.25b on Solaris 9 and has 10'000 users (several hundreds at the same time). This week it died on us and when I inspected the machine, it was out of 8GB Memory and 16GB Swap because thousands of smbd processes were running. netstat -na showed that many hundreds of connections to port 445 were in CLOSE_WAIT state. We first thought it could be some sort of DoS Attack, but now I also discovered a lot of the following entries in smbd.log at the times the server became unresponsive: 8 [2007/10/25 15:40:30, 0] lib/util_tdb.c:tdb_chainlock_with_timeout_internal(84) tdb_chainlock_with_timeout_internal: alarm (10) timed out for key replay cache mutex in tdb /etc/samba/private/secrets.tdb 8 The same thing happened three times now, all of them at a time when presumably a peak of users (around 600-900) tried to use the server. Every time the number of network connections in CLOSE_WAIT state and the number of smbd processes was massively increasing. Others seem to have similar problems (like http://marc.info/?l=sambam=119263114612187w=2). The fileserver has been performing OK now for several months with this Samba Release. I'd be grateful if anybody could give me some insight about how we can solve this. Loosing fileservice for all of staff and students several times a week builds some considerable pressure on me... Thanks Chris -- -- Christoph Kaegi [EMAIL PROTECTED] -- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Accumulating smbd processes and sockets in CLOSE_WAIT state
On Thu, 25 Oct 2007, Christoph Kaegi might have said: Hello list Our central fileserver is a Samba 3.0.25b on Solaris 9 and has 10'000 users (several hundreds at the same time). This week it died on us and when I inspected the machine, it was out of 8GB Memory and 16GB Swap because thousands of smbd processes were running. netstat -na showed that many hundreds of connections to port 445 were in CLOSE_WAIT state. We first thought it could be some sort of DoS Attack, but now I also discovered a lot of the following entries in smbd.log at the times the server became unresponsive: 8 [2007/10/25 15:40:30, 0] lib/util_tdb.c:tdb_chainlock_with_timeout_internal(84) tdb_chainlock_with_timeout_internal: alarm (10) timed out for key replay cache mutex in tdb /etc/samba/private/secrets.tdb 8 The same thing happened three times now, all of them at a time when presumably a peak of users (around 600-900) tried to use the server. Every time the number of network connections in CLOSE_WAIT state and the number of smbd processes was massively increasing. Others seem to have similar problems (like http://marc.info/?l=sambam=119263114612187w=2). The fileserver has been performing OK now for several months with this Samba Release. I'd be grateful if anybody could give me some insight about how we can solve this. Loosing fileservice for all of staff and students several times a week builds some considerable pressure on me... A recent problem I had of hundreds of smbd processes running for only 15 users was fixed by adding 'deadtime = 60' to the global section of /etc/samba/smb.conf. Mike -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Any SAMBA consultants for hire?
Hello, Is anyone on this list in the Santa Cruz, California area, and available immediately for a short term project to configure two OpenSUSE 10.2 machines as PDC BDC with SAMBA and OpenLDAP? If so, please email me your rate, and approximately how long you think it will take to accomplish the task, including documentation of the process. Thanks, Joel Braverman -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: svn commit: samba r25722 - in branches/SAMBA_4_0: . source/selftest
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] schrieb: Author: jelmer Date: 2007-10-24 19:16:10 + (Wed, 24 Oct 2007) New Revision: 25722 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25722 Log: Start merging the various test plan files for Samba 4 into one, so that it'll be easier to split selftest/ into a generic, a Samba 3 and a Samba 4-specific bit. Hi Jelmer, can you also fix make quicktest? metze -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iD8DBQFHIDj1m70gjA5TCD8RAjOjAKC1sZrsn6QNoljGAsMTSA2rDPqT3ACgyhDB dmqSREiIk9kl2ELJ6/7yKU0= =96I+ -END PGP SIGNATURE-
svn commit: samba r25724 - in branches/SAMBA_4_0/source/lib/replace: . system
Author: metze
Date: 2007-10-25 06:53:38 + (Thu, 25 Oct 2007)
New Revision: 25724
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25724
Log:
- include getaddrinfo.h after we have defined struct addrinfo
- use rep_ instead of pg_ as prefix in getaddrinfo.[ch]
- define HAVE_name macros when we replace functions
metze
Modified:
branches/SAMBA_4_0/source/lib/replace/getaddrinfo.c
branches/SAMBA_4_0/source/lib/replace/getaddrinfo.h
branches/SAMBA_4_0/source/lib/replace/system/network.h
Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/getaddrinfo.c
===
--- branches/SAMBA_4_0/source/lib/replace/getaddrinfo.c 2007-10-25 05:04:55 UTC
(rev 25723)
+++ branches/SAMBA_4_0/source/lib/replace/getaddrinfo.c 2007-10-25 06:53:38 UTC
(rev 25724)
@@ -253,7 +253,7 @@
* Bugs: - servname can only be a number, not text.
*/
-int getaddrinfo(const char *node,
+int rep_getaddrinfo(const char *node,
const char *service,
const struct addrinfo * hintp,
struct addrinfo ** res)
@@ -315,7 +315,7 @@
}
-void freeaddrinfo(struct addrinfo *res)
+void rep_freeaddrinfo(struct addrinfo *res)
{
struct addrinfo *next = NULL;
@@ -332,7 +332,7 @@
}
-const char *gai_strerror(int errcode)
+const char *rep_gai_strerror(int errcode)
{
#ifdef HAVE_HSTRERROR
int hcode;
@@ -468,7 +468,7 @@
*
* Bugs: - No IPv6 support.
*/
-int getnameinfo(const struct sockaddr *sa, socklen_t salen,
+int rep_getnameinfo(const struct sockaddr *sa, socklen_t salen,
char *node, size_t nodelen,
char *service, size_t servicelen, int flags)
{
Modified: branches/SAMBA_4_0/source/lib/replace/getaddrinfo.h
===
--- branches/SAMBA_4_0/source/lib/replace/getaddrinfo.h 2007-10-25 05:04:55 UTC
(rev 25723)
+++ branches/SAMBA_4_0/source/lib/replace/getaddrinfo.h 2007-10-25 06:53:38 UTC
(rev 25724)
@@ -37,6 +37,9 @@
* struct definitions needed to call it. To avoid conflict with the libbind
* definition in such cases, we rename our routines to pg_xxx() via macros.
*
+
+in lib/replace we use rep_xxx()
+
* This code will also work on platforms where struct addrinfo is defined
* in the system headers but no getaddrinfo() can be located.
*
@@ -53,28 +56,32 @@
#ifdef getaddrinfo
#undef getaddrinfo
#endif
-#define getaddrinfo pg_getaddrinfo
+#define getaddrinfo rep_getaddrinfo
+#define HAVE_GETADDRINFO
#ifdef freeaddrinfo
#undef freeaddrinfo
#endif
-#define freeaddrinfo pg_freeaddrinfo
+#define freeaddrinfo rep_freeaddrinfo
+#define HAVE_FREEADDRINFO
#ifdef gai_strerror
#undef gai_strerror
#endif
-#define gai_strerror pg_gai_strerror
+#define gai_strerror rep_gai_strerror
+#define HAVE_GAI_STRERROR
#ifdef getnameinfo
#undef getnameinfo
#endif
-#define getnameinfo pg_getnameinfo
+#define getnameinfo rep_getnameinfo
+#define HAVE_GETNAMEINFO
-extern int getaddrinfo(const char *node, const char *service,
+extern int rep_getaddrinfo(const char *node, const char *service,
const struct addrinfo * hints, struct addrinfo ** res);
-extern void freeaddrinfo(struct addrinfo * res);
-extern const char *gai_strerror(int errcode);
-extern int getnameinfo(const struct sockaddr * sa, socklen_t salen,
+extern void rep_freeaddrinfo(struct addrinfo * res);
+extern const char *rep_gai_strerror(int errcode);
+extern int rep_getnameinfo(const struct sockaddr * sa, socklen_t salen,
char *node, size_t nodelen,
char *service, size_t servicelen, int flags);
#endif /* HAVE_GETADDRINFO */
Modified: branches/SAMBA_4_0/source/lib/replace/system/network.h
===
--- branches/SAMBA_4_0/source/lib/replace/system/network.h 2007-10-25
05:04:55 UTC (rev 25723)
+++ branches/SAMBA_4_0/source/lib/replace/system/network.h 2007-10-25
06:53:38 UTC (rev 25724)
@@ -93,10 +93,6 @@
const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size);
#endif
-#if !defined(HAVE_GETADDRINFO)
-#include getaddrinfo.h
-#endif
-
/*
* Some systems have getaddrinfo but not the
* defines needed to use it.
@@ -212,6 +208,7 @@
#endif
#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
+#define HAVE_STRUCT_SOCKADDR_STORAGE
#ifdef HAVE_STRUCT_SOCKADDR_IN6
#define sockaddr_storage sockaddr_in6
#define ss_family sin6_family
@@ -235,6 +232,10 @@
};
#endif /* HAVE_STRUCT_ADDRINFO */
+#if !defined(HAVE_GETADDRINFO)
+#include getaddrinfo.h
+#endif
+
#ifdef SOCKET_WRAPPER
#ifndef SOCKET_WRAPPER_NOT_REPLACE
#define SOCKET_WRAPPER_REPLACE
svn commit: samba r25725 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze
Date: 2007-10-25 06:56:27 + (Thu, 25 Oct 2007)
New Revision: 25725
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25725
Log:
merge commit bc9008aa1dcb66890795f0ff2d3046da7df867d9 from v3-2-test:
Author: Jeremy Allison [EMAIL PROTECTED]
AuthorDate: Wed Oct 24 14:40:24 2007 -0700
We do support name lookups for host and service in our replacement
code - remove the restrictions from the original Postgres code.
Jeremy.
Modified:
branches/SAMBA_4_0/source/lib/replace/getaddrinfo.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/getaddrinfo.c
===
--- branches/SAMBA_4_0/source/lib/replace/getaddrinfo.c 2007-10-25 06:53:38 UTC
(rev 25724)
+++ branches/SAMBA_4_0/source/lib/replace/getaddrinfo.c 2007-10-25 06:56:27 UTC
(rev 25725)
@@ -486,11 +486,6 @@
return EAI_FAIL;
}
- /* We don't support those. */
- if ((node !(flags NI_NUMERICHOST))
- || (service !(flags NI_NUMERICSERV)))
- return EAI_FAIL;
-
if (node) {
return gethostnameinfo(sa, node, nodelen, flags);
}
svn commit: samba r25726 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze
Date: 2007-10-25 08:43:00 + (Thu, 25 Oct 2007)
New Revision: 25726
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25726
Log:
[libreplace] move and fix getaddrinfo configure checks
- move getaddrinfo check into getaddrinfo.m4
- add getaddrinfo.o to LIBREPLACEOBJ so that we really build the replacements
metze
Added:
branches/SAMBA_4_0/source/lib/replace/getaddrinfo.m4
Modified:
branches/SAMBA_4_0/source/lib/replace/libreplace.m4
Changeset:
Added: branches/SAMBA_4_0/source/lib/replace/getaddrinfo.m4
===
--- branches/SAMBA_4_0/source/lib/replace/getaddrinfo.m42007-10-25
06:56:27 UTC (rev 25725)
+++ branches/SAMBA_4_0/source/lib/replace/getaddrinfo.m42007-10-25
08:43:00 UTC (rev 25726)
@@ -0,0 +1,32 @@
+dnl test for getaddrinfo/getnameinfo
+AC_CACHE_CHECK([for getaddrinfo],libreplace_cv_HAVE_GETADDRINFO,[
+AC_TRY_COMPILE([
+#include sys/types.h
+#if STDC_HEADERS
+#include stdlib.h
+#include stddef.h
+#endif
+#include sys/socket.h
+#include netdb.h],
+[
+struct sockaddr sa;
+struct addrinfo *ai = NULL;
+int ret = getaddrinfo(NULL, NULL, NULL, ai);
+if (ret != 0) {
+ const char *es = gai_strerror(ret);
+}
+freeaddrinfo(ai);
+ret = getnameinfo(sa, sizeof(sa),
+ NULL, 0,
+ NULL, 0, 0);
+
+],
+libreplace_cv_HAVE_GETADDRINFO=yes,libreplace_cv_HAVE_GETADDRINFO=no)])
+if test x$libreplace_cv_HAVE_GETADDRINFO = xyes; then
+ AC_DEFINE(HAVE_GETADDRINFO,1,[Whether the system has getaddrinfo])
+ AC_DEFINE(HAVE_GETNAMEINFO,1,[Whether the system has getnameinfo])
+ AC_DEFINE(HAVE_FREEADDRINFO,1,[Whether the system has freeaddrinfo])
+ AC_DEFINE(HAVE_GAI_STRERROR,1,[Whether the system has gai_strerror])
+else
+ LIBREPLACEOBJ=${LIBREPLACEOBJ} getaddrinfo.o
+fi
Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4
===
--- branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2007-10-25 06:56:27 UTC
(rev 25725)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2007-10-25 08:43:00 UTC
(rev 25726)
@@ -152,36 +152,6 @@
#include netinet/in.h
])
-dnl test for getaddrinfo/getnameinfo
-AC_CACHE_CHECK([for getaddrinfo],samba_cv_HAVE_GETADDRINFO,[
-AC_TRY_COMPILE([
-#include sys/types.h
-#if STDC_HEADERS
-#include stdlib.h
-#include stddef.h
-#endif
-#include sys/socket.h
-#include netdb.h],
-[
-struct sockaddr sa;
-struct addrinfo *ai = NULL;
-int ret = getaddrinfo(NULL, NULL, NULL, ai);
-if (ret != 0) {
- const char *es = gai_strerror(ret);
-}
-freeaddrinfo(ai);
-ret = getnameinfo(sa, sizeof(sa),
- NULL, 0,
- NULL, 0, 0);
-
-],
-samba_cv_HAVE_GETADDRINFO=yes,samba_cv_HAVE_GETADDRINFO=no)])
-if test x$samba_cv_HAVE_GETADDRINFO = xyes; then
-AC_DEFINE(HAVE_GETADDRINFO,1,[Whether the system has getaddrinfo and
getnameinfo])
-AC_DEFINE(HAVE_FREEADDRINFO,1,[Whether the system has freeaddrinfo])
-AC_DEFINE(HAVE_GAI_STRERROR,1,[Whether the system has gai_strerror])
-fi
-
AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
AC_CHECK_FUNCS(waitpid strlcpy strlcat initgroups memmove strdup)
@@ -358,6 +328,7 @@
m4_include(timegm.m4)
m4_include(inet_ntop.m4)
m4_include(inet_pton.m4)
+m4_include(getaddrinfo.m4)
m4_include(repdir.m4)
AC_CHECK_FUNCS([syslog memset memcpy],,[AC_MSG_ERROR([Required function not
found])])
svn commit: samba r25727 - in branches/SAMBA_4_0/source/heimdal_build: .
Author: metze Date: 2007-10-25 08:48:53 + (Thu, 25 Oct 2007) New Revision: 25727 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25727 Log: include system/network.h instead of sys/socket.h to make sure socklen_t is typedef'ed metze Modified: branches/SAMBA_4_0/source/heimdal_build/krb5-types.h Changeset: Modified: branches/SAMBA_4_0/source/heimdal_build/krb5-types.h === --- branches/SAMBA_4_0/source/heimdal_build/krb5-types.h2007-10-25 08:43:00 UTC (rev 25726) +++ branches/SAMBA_4_0/source/heimdal_build/krb5-types.h2007-10-25 08:48:53 UTC (rev 25727) @@ -5,12 +5,8 @@ #define __krb5_types_h__ #include replace.h +#include system/network.h -#ifdef HAVE_SYS_SOCKET_H -#include sys/socket.h -#endif - - typedef socklen_t krb5_socklen_t; typedef ssize_t krb5_ssize_t;
svn commit: samba r25728 - in branches/SAMBA_4_0/source/lib/replace/system: .
Author: metze Date: 2007-10-25 09:16:11 + (Thu, 25 Oct 2007) New Revision: 25728 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25728 Log: [libreplace] define AI_NUMERICSERV as it's used in getaddrinfo.c metze Modified: branches/SAMBA_4_0/source/lib/replace/system/network.h Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/system/network.h === --- branches/SAMBA_4_0/source/lib/replace/system/network.h 2007-10-25 08:48:53 UTC (rev 25727) +++ branches/SAMBA_4_0/source/lib/replace/system/network.h 2007-10-25 09:16:11 UTC (rev 25728) @@ -136,6 +136,17 @@ #define AI_ADDRCONFIG 0x0020 #endif +#ifndef AI_NUMERICSERV +/* + * logic copied from AI_NUMERICHOST + */ +#if defined(HAVE_STRUCT_ADDRINFO) defined(HAVE_GETADDRINFO) +#define AI_NUMERICSERV 0 +#else +#define AI_NUMERICSERV 0x0400 +#endif +#endif + #ifndef NI_NUMERICHOST #define NI_NUMERICHOST 1 #endif
svn commit: samba r25729 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .
Author: abartlet
Date: 2007-10-25 11:07:30 + (Thu, 25 Oct 2007)
New Revision: 25729
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25729
Log:
Fix silly regression in the subtree_rename - I broke normal renames.
Bug 5041
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/subtree_rename.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/subtree_rename.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/subtree_rename.c
2007-10-25 09:16:11 UTC (rev 25728)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/subtree_rename.c
2007-10-25 11:07:30 UTC (rev 25729)
@@ -97,7 +97,7 @@
/* Only entries are interesting, and we handle the case of the parent
seperatly */
if (ares-type == LDB_REPLY_ENTRY
-ldb_dn_compare(ares-message-dn, ac-orig_req-op.rename.olddn)
== 0) {
+ldb_dn_compare(ares-message-dn, ac-orig_req-op.rename.olddn)
!= 0) {
/* And it is an actual entry: now create a rename from it */
int ret;
svn commit: samba r25730 - in branches/SAMBA_4_0/source: librpc/idl torture/rpc
Author: gd
Date: 2007-10-25 11:12:02 + (Thu, 25 Oct 2007)
New Revision: 25730
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25730
Log:
Fix IDL for incorrect winreg_SetKeySecurity.
Guenther
Modified:
branches/SAMBA_4_0/source/librpc/idl/winreg.idl
branches/SAMBA_4_0/source/torture/rpc/winreg.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/winreg.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2007-10-25 11:07:30 UTC
(rev 25729)
+++ branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2007-10-25 11:12:02 UTC
(rev 25730)
@@ -273,7 +273,7 @@
/* Function: 0x15 */
WERROR winreg_SetKeySecurity(
[in,ref] policy_handle *handle,
- [in] winreg_AccessMask access_mask,
+ [in] security_secinfo sec_info,
[in,ref] KeySecurityData *sd
);
Modified: branches/SAMBA_4_0/source/torture/rpc/winreg.c
===
--- branches/SAMBA_4_0/source/torture/rpc/winreg.c 2007-10-25 11:07:30 UTC
(rev 25729)
+++ branches/SAMBA_4_0/source/torture/rpc/winreg.c 2007-10-25 11:12:02 UTC
(rev 25730)
@@ -228,6 +228,7 @@
struct winreg_SetKeySecurity r;
struct KeySecurityData *sdata = NULL;
DATA_BLOB sdblob;
+ uint32_t sec_info;
ZERO_STRUCT(r);
@@ -245,8 +246,23 @@
sdata-size = sdblob.length;
sdata-len = sdblob.length;
+ sec_info = SECINFO_UNPROTECTED_SACL | SECINFO_UNPROTECTED_DACL;
+
+ if (sd-owner_sid) {
+ sec_info |= SECINFO_OWNER;
+ }
+ if (sd-group_sid) {
+ sec_info |= SECINFO_GROUP;
+ }
+ if (sd-sacl) {
+ sec_info |= SECINFO_SACL;
+ }
+ if (sd-dacl) {
+ sec_info |= SECINFO_DACL;
+ }
+
r.in.handle = handle;
- r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+ r.in.sec_info = sec_info;
r.in.sd = sdata;
torture_assert_ntstatus_ok(tctx,
svn commit: samba r25731 - in branches/SAMBA_4_0/source: librpc/idl torture/rpc
Author: gd
Date: 2007-10-25 11:26:02 + (Thu, 25 Oct 2007)
New Revision: 25731
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25731
Log:
Document winreg_NotifyChangeKeyValue's notify flags.
Guenther
Modified:
branches/SAMBA_4_0/source/librpc/idl/winreg.idl
branches/SAMBA_4_0/source/torture/rpc/winreg.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/winreg.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2007-10-25 11:12:02 UTC
(rev 25730)
+++ branches/SAMBA_4_0/source/librpc/idl/winreg.idl 2007-10-25 11:26:02 UTC
(rev 25731)
@@ -19,8 +19,8 @@
KEY_QUERY_VALUE = 0x1,
KEY_SET_VALUE = 0x2,
KEY_CREATE_SUB_KEY = 0x4,
- KEY_ENUMERATE_SUB_KEYS = 0x8,
- KEY_NOTIFY = 0x00010,
+ KEY_ENUMERATE_SUB_KEYS = 0x8,
+ KEY_NOTIFY = 0x00010,
KEY_CREATE_LINK = 0x00020,
KEY_WOW64_64KEY = 0x00100,
KEY_WOW64_32KEY = 0x00200
@@ -195,13 +195,20 @@
/**/
/* Function: 0x0e */
+ typedef [public,bitmap32bit] bitmap {
+ REG_NOTIFY_CHANGE_NAME = 0x0001,
+ REG_NOTIFY_CHANGE_ATTRIBUTES= 0x0002,
+ REG_NOTIFY_CHANGE_LAST_SET = 0x0004,
+ REG_NOTIFY_CHANGE_SECURITY = 0x0008
+ } winreg_NotifyChangeType;
+
[public] WERROR winreg_NotifyChangeKeyValue(
[in,ref] policy_handle *handle,
- [in] uint8 watch_subtree,
- [in] uint32 notify_filter,
+ [in] boolean8 watch_subtree,
+ [in] winreg_NotifyChangeType notify_filter,
[in] uint32 unknown,
[in] winreg_String string1,
- [in] winreg_String string2,
+ [in] winreg_String string2,
[in] uint32 unknown2
);
Modified: branches/SAMBA_4_0/source/torture/rpc/winreg.c
===
--- branches/SAMBA_4_0/source/torture/rpc/winreg.c 2007-10-25 11:12:02 UTC
(rev 25730)
+++ branches/SAMBA_4_0/source/torture/rpc/winreg.c 2007-10-25 11:26:02 UTC
(rev 25731)
@@ -78,7 +78,7 @@
struct winreg_NotifyChangeKeyValue r;
r.in.handle = handle;
- r.in.watch_subtree = 1;
+ r.in.watch_subtree = true;
r.in.notify_filter = 0;
r.in.unknown = r.in.unknown2 = 0;
init_winreg_String(r.in.string1, NULL);
@@ -90,7 +90,8 @@
if (!W_ERROR_IS_OK(r.out.result)) {
torture_comment(tctx,
- NotifyChangeKeyValue failed - %s - not
considering\n, win_errstr(r.out.result));
+ NotifyChangeKeyValue failed - %s - not
considering\n,
+ win_errstr(r.out.result));
return true;
}
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-111-g11a977a
The branch, v3-2-test has been updated
via 11a977aa0757801fb0fa805b123e7bc75c8be447 (commit)
via de01c503f4d16b8c3c0ad75225cf0b1822fd8c7f (commit)
via e56977ea459b3615d33237d19ed8e7ad8b509853 (commit)
via b81d8bc43cd7167a5cd4b18c26ba3eecf75043eb (commit)
via 45150075677451b48ce56ebdce96aca1ed13fa80 (commit)
via fa120f7c50d0084e7d887811e5fa59ae3bcfe53e (commit)
via f1d434a132e424f2fdce59d51a7c398988c1474d (commit)
from d04a8a6cdcc505e0244882a9abb7174eadbf81a7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 11a977aa0757801fb0fa805b123e7bc75c8be447
Author: metze [EMAIL PROTECTED]
Date: Thu Oct 25 09:16:11 2007 +
[libreplace] define AI_NUMERICSERV as it's used in getaddrinfo.c
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/[EMAIL
PROTECTED] 0c0555d6-39d7-0310-84fc-f1cc0bd64818
commit de01c503f4d16b8c3c0ad75225cf0b1822fd8c7f
Author: metze [EMAIL PROTECTED]
Date: Thu Oct 25 08:43:00 2007 +
[libreplace] move and fix getaddrinfo configure checks
- move getaddrinfo check into getaddrinfo.m4
- add getaddrinfo.o to LIBREPLACEOBJ so that we really build the
replacements
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/[EMAIL
PROTECTED] 0c0555d6-39d7-0310-84fc-f1cc0bd64818
commit e56977ea459b3615d33237d19ed8e7ad8b509853
Author: metze [EMAIL PROTECTED]
Date: Thu Oct 25 06:53:38 2007 +
- include getaddrinfo.h after we have defined struct addrinfo
- use rep_ instead of pg_ as prefix in getaddrinfo.[ch]
- define HAVE_name macros when we replace functions
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/[EMAIL
PROTECTED] 0c0555d6-39d7-0310-84fc-f1cc0bd64818
commit b81d8bc43cd7167a5cd4b18c26ba3eecf75043eb
Author: metze [EMAIL PROTECTED]
Date: Wed Oct 24 13:01:03 2007 +
[libreplace] if we replace types define the HAVE_type macro
this is needed as heimdal's roken.h also tries to replace the types
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/[EMAIL
PROTECTED] 0c0555d6-39d7-0310-84fc-f1cc0bd64818
commit 45150075677451b48ce56ebdce96aca1ed13fa80
Author: metze [EMAIL PROTECTED]
Date: Wed Oct 24 12:57:57 2007 +
[libreplace] move definition of struct addrinfo so that it can use socklen_t
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/[EMAIL
PROTECTED] 0c0555d6-39d7-0310-84fc-f1cc0bd64818
commit fa120f7c50d0084e7d887811e5fa59ae3bcfe53e
Author: metze [EMAIL PROTECTED]
Date: Wed Oct 24 12:55:40 2007 +
[libreplace] move define of a constant to near to the others
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/[EMAIL
PROTECTED] 0c0555d6-39d7-0310-84fc-f1cc0bd64818
commit f1d434a132e424f2fdce59d51a7c398988c1474d
Author: metze [EMAIL PROTECTED]
Date: Wed Oct 24 12:53:34 2007 +
[libreplace] include socket_wrapper.h after we have typedef'ed socklen_t
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/[EMAIL
PROTECTED] 0c0555d6-39d7-0310-84fc-f1cc0bd64818
---
Summary of changes:
source/lib/replace/getaddrinfo.c|8 ++--
source/lib/replace/getaddrinfo.h| 23
source/lib/replace/getaddrinfo.m4 | 32
source/lib/replace/libreplace.m4| 31 +---
source/lib/replace/system/network.h | 69 +--
5 files changed, 93 insertions(+), 70 deletions(-)
create mode 100644 source/lib/replace/getaddrinfo.m4
Changeset truncated at 500 lines:
diff --git a/source/lib/replace/getaddrinfo.c b/source/lib/replace/getaddrinfo.c
index 0bff746..063bacd 100644
--- a/source/lib/replace/getaddrinfo.c
+++ b/source/lib/replace/getaddrinfo.c
@@ -253,7 +253,7 @@ static int getaddr_info_name(const char *node,
* Bugs: - servname can only be a number, not text.
*/
-int getaddrinfo(const char *node,
+int rep_getaddrinfo(const char *node,
const char *service,
const struct addrinfo * hintp,
struct addrinfo ** res)
@@ -315,7 +315,7 @@ int getaddrinfo(const char *node,
}
-void freeaddrinfo(struct addrinfo *res)
+void rep_freeaddrinfo(struct addrinfo *res)
{
struct addrinfo *next = NULL;
@@ -332,7 +332,7 @@ void freeaddrinfo(struct addrinfo *res)
}
-const char *gai_strerror(int errcode)
+const char *rep_gai_strerror(int errcode)
{
#ifdef HAVE_HSTRERROR
int hcode;
@@ -468,7 +468,7 @@ static int getservicenameinfo(const struct sockaddr *sa,
*
* Bugs: - No IPv6 support.
*/
-int getnameinfo(const struct sockaddr *sa, socklen_t salen,
+int rep_getnameinfo(const struct
svn commit: samba r25732 - in branches/SAMBA_4_0/source/heimdal/lib: asn1 com_err
Author: metze
Date: 2007-10-25 19:50:34 + (Thu, 25 Oct 2007)
New Revision: 25732
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25732
Log:
import updated parse.y files from lorikeet-heimdal
I wonder why they're not updated as the parse.[ch]
are generated from the new versions already...
metze
Modified:
branches/SAMBA_4_0/source/heimdal/lib/asn1/parse.y
branches/SAMBA_4_0/source/heimdal/lib/com_err/parse.y
Changeset:
Modified: branches/SAMBA_4_0/source/heimdal/lib/asn1/parse.y
===
--- branches/SAMBA_4_0/source/heimdal/lib/asn1/parse.y 2007-10-25 11:26:02 UTC
(rev 25731)
+++ branches/SAMBA_4_0/source/heimdal/lib/asn1/parse.y 2007-10-25 19:50:34 UTC
(rev 25732)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997 - 2005 Kungliga Tekniska H�gskolan
+ * Copyright (c) 1997 - 2007 Kungliga Tekniska H�gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*/
-/* $Id: parse.y,v 1.29 2006/12/28 17:15:02 lha Exp $ */
+/* $Id: parse.y 21597 2007-07-16 18:48:58Z lha $ */
%{
#ifdef HAVE_CONFIG_H
@@ -45,7 +45,7 @@
#include gen_locl.h
#include der.h
-RCSID($Id: parse.y,v 1.29 2006/12/28 17:15:02 lha Exp $);
+RCSID($Id: parse.y 21597 2007-07-16 18:48:58Z lha $);
static Type *new_type (Typetype t);
static struct constraint_spec *new_constraint_spec(enum ctype);
@@ -65,7 +65,7 @@
%union {
int constant;
struct value *value;
-struct range range;
+struct range *range;
char *name;
Type *type;
Member *member;
@@ -214,7 +214,7 @@
%type members NamedNumberList
%type objid objid objid_list objid_element objid_opt
-%type range range
+%type range range size
%type sl referencenames
@@ -224,11 +224,13 @@
%type constraint_spec ContentsConstraint
%type constraint_spec UserDefinedConstraint
+
+
%start ModuleDefinition
%%
-ModuleDefinition: IDENTIFIER kw_DEFINITIONS TagDefault ExtensionDefault
+ModuleDefinition: IDENTIFIER objid_opt kw_DEFINITIONS TagDefault
ExtensionDefault
EEQUAL kw_BEGIN ModuleBody kw_END
{
checkundefined();
@@ -337,14 +339,41 @@
range : '(' Value RANGE Value ')'
{
- if($2-type != integervalue ||
- $4-type != integervalue)
- error_message(Non-integer value used in
range);
- $$.min = $2-u.integervalue;
- $$.max = $4-u.integervalue;
+ if($2-type != integervalue)
+ error_message(Non-integer used in first part of
range);
+ if($2-type != integervalue)
+ error_message(Non-integer in second part of range);
+ $$ = ecalloc(1, sizeof(*$$));
+ $$-min = $2-u.integervalue;
+ $$-max = $4-u.integervalue;
}
+ | '(' Value RANGE kw_MAX ')'
+ {
+ if($2-type != integervalue)
+ error_message(Non-integer in first part of range);
+ $$ = ecalloc(1, sizeof(*$$));
+ $$-min = $2-u.integervalue;
+ $$-max = $2-u.integervalue - 1;
+ }
+ | '(' kw_MIN RANGE Value ')'
+ {
+ if($4-type != integervalue)
+ error_message(Non-integer in second part of range);
+ $$ = ecalloc(1, sizeof(*$$));
+ $$-min = $4-u.integervalue + 2;
+ $$-max = $4-u.integervalue;
+ }
+ | '(' Value ')'
+ {
+ if($2-type != integervalue)
+ error_message(Non-integer used in limit);
+ $$ = ecalloc(1, sizeof(*$$));
+ $$-min = $2-u.integervalue;
+ $$-max = $2-u.integervalue;
+ }
;
+
IntegerType: kw_INTEGER
{
$$ = new_tag(ASN1_C_UNIV, UT_Integer,
@@ -353,8 +382,7 @@
| kw_INTEGER range
{
$$ = new_type(TInteger);
- $$-range = emalloc(sizeof(*$$-range));
- *($$-range) = $2;
+ $$-range = $2;
$$ = new_tag(ASN1_C_UNIV, UT_Integer, TE_EXPLICIT, $$);
}
| kw_INTEGER '{' NamedNumberList '}'
@@ -425,10 +453,12 @@
TE_EXPLICIT, new_type(TOID));
}
;
-OctetStringType: kw_OCTET kw_STRING
+OctetStringType: kw_OCTET kw_STRING size
{
- $$ = new_tag(ASN1_C_UNIV, UT_OctetString,
-
svn commit: samba r25733 - in branches/SAMBA_4_0/source/script: .
Author: metze Date: 2007-10-25 19:51:38 + (Thu, 25 Oct 2007) New Revision: 25733 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25733 Log: fix filename substitution and bail out if yacc output isn't generated metze Modified: branches/SAMBA_4_0/source/script/yacc_compile.sh Changeset: Modified: branches/SAMBA_4_0/source/script/yacc_compile.sh === --- branches/SAMBA_4_0/source/script/yacc_compile.sh2007-10-25 19:50:34 UTC (rev 25732) +++ branches/SAMBA_4_0/source/script/yacc_compile.sh2007-10-25 19:51:38 UTC (rev 25733) @@ -32,9 +32,12 @@ if cd $dir $YACC -d $file; then if [ -r y.tab.h -a -r y.tab.c ];then #echo info: move files - sed -e /^#/!b -e /^#/ s|y\.tab\.h|$SRC| -e /^#/ s|\$base.y|\$SRC| y.tab.h $base.h - sed -e /^#/ s|y\.tab\.c|$SRC| -e /^#/ s|\$base.y|\$SRC| y.tab.c $base.c + sed -e /^#/!b -e s|y\.tab\.h|$SRC| -e s|\$base.y|\$SRC| y.tab.h $base.h + sed -e s|y\.tab\.c|$SRC| -e s|\$base.y|\$SRC| y.tab.c $base.c rm -f y.tab.c y.tab.h + elif [ ! -r $base.h -a ! -r $base.c]; then + echo $base.h nor $base.c generated. + exit 1 fi fi cd $TOP
svn commit: samba r25734 - in branches/SAMBA_4_0/source/heimdal/lib: asn1 com_err
Author: metze Date: 2007-10-25 19:52:37 + (Thu, 25 Oct 2007) New Revision: 25734 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25734 Log: regenerate yacc output (parse.[ch] files) metze Modified: branches/SAMBA_4_0/source/heimdal/lib/asn1/parse.c branches/SAMBA_4_0/source/heimdal/lib/asn1/parse.h branches/SAMBA_4_0/source/heimdal/lib/com_err/parse.c branches/SAMBA_4_0/source/heimdal/lib/com_err/parse.h Changeset: Sorry, the patch is too large (988 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25734
svn commit: samba r25735 - in branches/SAMBA_4_0/source/heimdal_build: .
Author: metze Date: 2007-10-25 20:12:23 + (Thu, 25 Oct 2007) New Revision: 25735 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25735 Log: make sure we include config.h as first header in files generated from asn1_compile metze Modified: branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl Changeset: Modified: branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl === --- branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl2007-10-25 19:52:37 UTC (rev 25734) +++ branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl2007-10-25 20:12:23 UTC (rev 25735) @@ -45,7 +45,7 @@ $o_file = $dirname/asn1_$output.o; print $x_file: $header\n; print $c_file: $dirname/asn1_$output.x\n; - print [EMAIL PROTECTED] $x_file $c_file\n\n; + print [EMAIL PROTECTED] \#include \\\config.h $c_file cat $x_file $c_file\n\n; push @x_files, $x_file; push @c_files, $c_file; push @o_files, $o_file;
svn commit: samba r25736 - in branches/SAMBA_4_0/source/heimdal_build: .
Author: metze
Date: 2007-10-25 20:13:06 + (Thu, 25 Oct 2007)
New Revision: 25736
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25736
Log:
make sure we include config.h as first header
in code generated from et_compile
metze
Modified:
branches/SAMBA_4_0/source/heimdal_build/et_compile_wrapper.sh
branches/SAMBA_4_0/source/heimdal_build/et_deps.pl
Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/et_compile_wrapper.sh
===
--- branches/SAMBA_4_0/source/heimdal_build/et_compile_wrapper.sh
2007-10-25 20:12:23 UTC (rev 25735)
+++ branches/SAMBA_4_0/source/heimdal_build/et_compile_wrapper.sh
2007-10-25 20:13:06 UTC (rev 25736)
@@ -10,7 +10,8 @@
CMD=$4
FILE=$5
-shift 5
+SOURCE=$6
+shift 6
test -z ${SRCDIR} {
echo ${SELF}:SRCDIR: '${SRCDIR}' 2;
@@ -37,6 +38,11 @@
exit 1;
}
+test -z ${SOURCE} {
+ echo ${SELF}:SOURCE: '${SOURCE}' 2;
+ exit 1;
+}
+
CURDIR=`pwd`
cd ${SRCDIR} {
@@ -58,6 +64,13 @@
cd ${DESTDIR} {
${ABS_BUILDDIR}/${CMD} ${ABS_SRCDIR}/${FILE} 2 || exit 1;
cd ${CURDIR}
+ TMP=${SOURCE}.$$
+ mv ${SOURCE} ${TMP} {
+ echo #include \config.h\ ${SOURCE} {
+ cat ${TMP} ${SOURCE}
+ }
+ }
+ rm ${TMP}
} || {
echo ${SELF}:cannot cd into '${BUILDDIR}' 2;
exit 1;
Modified: branches/SAMBA_4_0/source/heimdal_build/et_deps.pl
===
--- branches/SAMBA_4_0/source/heimdal_build/et_deps.pl 2007-10-25 20:12:23 UTC
(rev 25735)
+++ branches/SAMBA_4_0/source/heimdal_build/et_deps.pl 2007-10-25 20:13:06 UTC
(rev 25736)
@@ -10,7 +10,7 @@
my $source = $dirname/$basename; $source =~ s/\.et$/.c/;
print $header $source: $file bin/compile_et\n;
print [EMAIL PROTECTED] \Compiling error table $file\\n;
-print [EMAIL PROTECTED](builddir)/heimdal_build/et_compile_wrapper.sh
\$(srcdir) \$(builddir) $dirname bin/compile_et $file\n\n;
+print [EMAIL PROTECTED](builddir)/heimdal_build/et_compile_wrapper.sh
\$(srcdir) \$(builddir) $dirname bin/compile_et $file $source\n\n;
print clean:: \n;
print [EMAIL PROTECTED] -f $header $source\n\n;
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-112-g2ec6224
The branch, v3-2-test has been updated
via 2ec6224b552ef86fa1739c9e396c39c7ec6c76c6 (commit)
from 11a977aa0757801fb0fa805b123e7bc75c8be447 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 2ec6224b552ef86fa1739c9e396c39c7ec6c76c6
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Thu Oct 25 14:11:35 2007 -0700
Ensure we don't terminate if we fail to bind to a socket,
only fail if we can't bind to any socket.
Jeremy.
---
Summary of changes:
source/smbd/server.c |7 ++-
1 files changed, 6 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/server.c b/source/smbd/server.c
index 0a292bc..abad0ef 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -435,7 +435,7 @@ static bool open_sockets_smbd(bool is_daemon, bool
interactive, const char *smb_
s = open_socket_in(SOCK_STREAM, port, 0,
ss, true);
if (s == -1) {
- return false;
+ continue;
}
/* ready to listen */
@@ -471,6 +471,11 @@ static bool open_sockets_smbd(bool is_daemon, bool
interactive, const char *smb_
SAFE_FREE(ports);
+ if (num_sockets == 0) {
+ DEBUG(0,(open_sockets_smbd: No
+ sockets available to bind to.\n));
+ return false;
+ }
/* Setup the main smbd so that we can get messages. Note that
do this after starting listening. This is needed as when in
--
Samba Shared Repository
svn commit: samba r25737 - in branches/SAMBA_4_0: . source source/selftest source/selftest/env
Author: jelmer Date: 2007-10-25 22:20:52 + (Thu, 25 Oct 2007) New Revision: 25737 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25737 Log: Integrate more of the test recipe code into one file, use different mechanism for determining the quicktest list. Quicktest is a bit verbose now (reports all the tests not run as SKIP:) Added: branches/SAMBA_4_0/source/selftest/samba4_tests.sh Removed: branches/SAMBA_4_0/source/selftest/mk-keyblobs.sh branches/SAMBA_4_0/source/selftest/test_echo.sh branches/SAMBA_4_0/source/selftest/test_ejs.sh branches/SAMBA_4_0/source/selftest/test_functions.sh branches/SAMBA_4_0/source/selftest/test_ldap.sh branches/SAMBA_4_0/source/selftest/test_nbt.sh branches/SAMBA_4_0/source/selftest/test_nss.sh branches/SAMBA_4_0/source/selftest/test_rpc.sh branches/SAMBA_4_0/source/selftest/test_s3upgrade.sh branches/SAMBA_4_0/source/selftest/test_session_key.sh branches/SAMBA_4_0/source/selftest/test_swig.sh branches/SAMBA_4_0/source/selftest/test_winbind.sh branches/SAMBA_4_0/source/selftest/tests_all.sh branches/SAMBA_4_0/source/selftest/tests_quick.sh Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/samba4-skip branches/SAMBA_4_0/source/selftest/config.mk branches/SAMBA_4_0/source/selftest/env/Samba4.pm branches/SAMBA_4_0/source/selftest/selftest.pl Changeset: Sorry, the patch is too large (1328 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25737
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-113-ga68bbea
The branch, v3-2-test has been updated
via a68bbea0d42cc64b9fa731ab2a1da82ef30937c6 (commit)
from 2ec6224b552ef86fa1739c9e396c39c7ec6c76c6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit a68bbea0d42cc64b9fa731ab2a1da82ef30937c6
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Thu Oct 25 15:43:44 2007 -0700
Try and fix the Solaris build by adding a missing define
(from Jerry).
Jeremy
---
Summary of changes:
source/lib/replace/system/network.h |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/replace/system/network.h
b/source/lib/replace/system/network.h
index c7b499a..d3ae2bf 100644
--- a/source/lib/replace/system/network.h
+++ b/source/lib/replace/system/network.h
@@ -247,6 +247,11 @@ struct addrinfo {
#include getaddrinfo.h
#endif
+/* Needed for some systems that don't define it (Solaris). */
+#ifndef ifr_netmask
+#define ifr_netmask ifr_addrs
+#endif
+
#ifdef SOCKET_WRAPPER
#ifndef SOCKET_WRAPPER_NOT_REPLACE
#define SOCKET_WRAPPER_REPLACE
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-115-gec891be
The branch, v3-2-test has been updated
via ec891be53cc4042baf418c1f7b037a11e5055273 (commit)
via 9aa9ecd8cc29d055d78f16b8fb2156ec04063c42 (commit)
from a68bbea0d42cc64b9fa731ab2a1da82ef30937c6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit ec891be53cc4042baf418c1f7b037a11e5055273
Merge: 9aa9ecd8cc29d055d78f16b8fb2156ec04063c42
a68bbea0d42cc64b9fa731ab2a1da82ef30937c6
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Thu Oct 25 16:22:40 2007 -0700
Merge branch 'v3-2-test' of ssh://[EMAIL PROTECTED]/data/git/samba into
v3-2-test
commit 9aa9ecd8cc29d055d78f16b8fb2156ec04063c42
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Thu Oct 25 16:14:52 2007 -0700
When doing reverse lookups actually look up the name, not
just the numeric address (doh!) :-).
Jeremy.
---
Summary of changes:
source/lib/util_sock.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index 2d78471..8a85f7a 100644
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -1879,7 +1879,7 @@ const char *get_peer_name(int fd, bool force_lookup)
sizeof(name_buf),
NULL,
0,
- NI_NUMERICHOST);
+ 0);
if (ret) {
DEBUG(1,(get_peer_name: getnameinfo failed
--
Samba Shared Repository
Build status as of Fri Oct 26 00:00:03 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-10-25 00:00:30.0 + +++ /home/build/master/cache/broken_results.txt 2007-10-26 00:00:58.0 + @@ -1,4 +1,4 @@ -Build status as of Thu Oct 25 00:00:01 2007 +Build status as of Fri Oct 26 00:00:03 2007 Build counts: Tree Total Broken Panic @@ -7,7 +7,7 @@ ccache 29 11 0 ctdb 0 0 0 distcc 1 0 0 -ldb 29 7 0 +ldb 29 6 0 libreplace 28 11 0 lorikeet-heimdal 23 14 0 pidl 16 3 0 @@ -16,10 +16,10 @@ rsync29 13 0 samba-docs 0 0 0 samba-gtk2 2 0 -samba4 26 17 4 +samba4 26 18 2 samba_3_20 0 0 -samba_3_2_test 29 27 1 +samba_3_2_test 29 28 0 smb-build28 28 0 -talloc 29 3 0 -tdb 29 4 0 +talloc 29 2 0 +tdb 29 3 0
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-116-ga13e8bd
The branch, v3-2-test has been updated
via a13e8bd39de978d69666b8aeb884d943885a3605 (commit)
from ec891be53cc4042baf418c1f7b037a11e5055273 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit a13e8bd39de978d69666b8aeb884d943885a3605
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Thu Oct 25 17:17:46 2007 -0700
Fix reversed bool check for access. Found by kukks.
Thanks !
Jeremy.
---
Summary of changes:
source/lib/access.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/access.c b/source/lib/access.c
index 0d47711..7b78017 100644
--- a/source/lib/access.c
+++ b/source/lib/access.c
@@ -52,7 +52,7 @@ static bool masked_match(const char *tok, const char *slash,
const char *s)
SAFE_FREE(tok_copy);
if (strlen(slash + 1) 2) {
- if (interpret_string_addr(ss_mask, slash+1, 0)) {
+ if (!interpret_string_addr(ss_mask, slash+1, 0)) {
return false;
}
} else {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-117-gf982774
The branch, v3-2-test has been updated
via f982774c8d95c48355bbd821c8224fadb8bb303e (commit)
from a13e8bd39de978d69666b8aeb884d943885a3605 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit f982774c8d95c48355bbd821c8224fadb8bb303e
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Thu Oct 25 18:11:29 2007 -0700
Fixed missing in_addr - sockaddr_storage conversion (how did
I miss this...).
Jeremy.
---
Summary of changes:
source/utils/smbtree.c | 24 ++--
1 files changed, 14 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/smbtree.c b/source/utils/smbtree.c
index 0974039..0e0c993 100644
--- a/source/utils/smbtree.c
+++ b/source/utils/smbtree.c
@@ -70,7 +70,7 @@ static void add_name(const char *machine_name, uint32
server_type,
static bool get_workgroups(struct user_auth_info *user_info)
{
struct cli_state *cli;
-struct in_addr server_ip;
+struct sockaddr_storage server_ss;
pstring master_workgroup;
/* Try to connect to a #1d name of our current workgroup. If that
@@ -79,22 +79,24 @@ static bool get_workgroups(struct user_auth_info *user_info)
pstrcpy(master_workgroup, lp_workgroup());
-if (!use_bcast !find_master_ip(lp_workgroup(), server_ip)) {
+if (!use_bcast !find_master_ip(lp_workgroup(), server_ss)) {
DEBUG(4, (Unable to find master browser for workgroup %s,
falling back to broadcast\n,
master_workgroup));
use_bcast = True;
} else if(!use_bcast) {
- if (!(cli = get_ipc_connect(inet_ntoa(server_ip), server_ip,
user_info)))
+ char addr[INET6_ADDRSTRLEN];
+ print_sockaddr(addr, sizeof(addr), server_ss);
+ if (!(cli = get_ipc_connect(addr, server_ss,
user_info)))
return False;
}
-
+
if (!(cli = get_ipc_connect_master_ip_bcast(master_workgroup,
user_info))) {
DEBUG(4, (Unable to find master browser by
broadcast\n));
return False;
}
-if (!cli_NetServerEnum(cli, master_workgroup,
+if (!cli_NetServerEnum(cli, master_workgroup,
SV_TYPE_DOMAIN_ENUM, add_name, workgroups))
return False;
@@ -106,27 +108,29 @@ static bool get_workgroups(struct user_auth_info
*user_info)
static bool get_servers(char *workgroup, struct user_auth_info *user_info)
{
struct cli_state *cli;
-struct in_addr server_ip;
+struct sockaddr_storage server_ss;
+ char addr[INET6_ADDRSTRLEN];
/* Open an IPC$ connection to the master browser for the workgroup */
-if (!find_master_ip(workgroup, server_ip)) {
+if (!find_master_ip(workgroup, server_ss)) {
DEBUG(4, (Cannot find master browser for workgroup %s\n,
workgroup));
return False;
}
-if (!(cli = get_ipc_connect(inet_ntoa(server_ip), server_ip,
user_info)))
+ print_sockaddr(addr, sizeof(addr), server_ss);
+if (!(cli = get_ipc_connect(addr, server_ss, user_info)))
return False;
-if (!cli_NetServerEnum(cli, workgroup, SV_TYPE_ALL, add_name,
+if (!cli_NetServerEnum(cli, workgroup, SV_TYPE_ALL, add_name,
servers))
return False;
return True;
}
-static bool get_rpc_shares(struct cli_state *cli,
+static bool get_rpc_shares(struct cli_state *cli,
void (*fn)(const char *, uint32, const char *, void
*),
void *state)
{
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-118-g17ea899
The branch, v3-2-test has been updated via 17ea899f39e80241afa235cb933695ba6bae846a (commit) from f982774c8d95c48355bbd821c8224fadb8bb303e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 17ea899f39e80241afa235cb933695ba6bae846a Author: Jeremy Allison [EMAIL PROTECTED] Date: Thu Oct 25 18:15:02 2007 -0700 Fix cast typo - would have broken all dgram sends. Jeremy. --- Summary of changes: source/libsmb/clidgram.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/libsmb/clidgram.c b/source/libsmb/clidgram.c index 9f6f448..5b619b6 100644 --- a/source/libsmb/clidgram.c +++ b/source/libsmb/clidgram.c @@ -99,7 +99,7 @@ bool cli_send_mailslot(struct messaging_context *msg_ctx, dgram-datasize = PTR_DIFF(p2,ptr+4); /* +4 for tcp length. */ p.packet_type = DGRAM_PACKET; - p.ip = ((const struct sockaddr_in *)dest_ss)-sin_addr; + p.ip = ((const struct sockaddr_in *)dest_ss)-sin_addr; p.timestamp = time(NULL); DEBUG(4,(send_mailslot: Sending to mailslot %s from %s , -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-119-g2df8252
The branch, v3-2-test has been updated
via 2df8252ff76406bfe57cd76e9927b5056e89e6ae (commit)
from 17ea899f39e80241afa235cb933695ba6bae846a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 2df8252ff76406bfe57cd76e9927b5056e89e6ae
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Thu Oct 25 18:29:49 2007 -0700
Fix a mismatched interface where we were using
uint32 instead of enum lsa_SidType.
Jeremy.
---
Summary of changes:
source/rpc_client/cli_lsarpc.c | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_client/cli_lsarpc.c b/source/rpc_client/cli_lsarpc.c
index 916b57b..a92031d 100644
--- a/source/rpc_client/cli_lsarpc.c
+++ b/source/rpc_client/cli_lsarpc.c
@@ -139,7 +139,7 @@ static NTSTATUS rpccli_lsa_lookup_sids_noalloc(struct
rpc_pipe_client *cli,
const DOM_SID *sids,
char **domains,
char **names,
- uint32 *types)
+ enum lsa_SidType *types)
{
prs_struct qbuf, rbuf;
LSA_Q_LOOKUP_SIDS q;
@@ -252,7 +252,7 @@ NTSTATUS rpccli_lsa_lookup_sids(struct rpc_pipe_client *cli,
const DOM_SID *sids,
char ***domains,
char ***names,
- uint32 **types)
+ enum lsa_SidType **types)
{
NTSTATUS result = NT_STATUS_OK;
int sids_left = 0;
@@ -260,7 +260,7 @@ NTSTATUS rpccli_lsa_lookup_sids(struct rpc_pipe_client *cli,
const DOM_SID *hunk_sids = sids;
char **hunk_domains = NULL;
char **hunk_names = NULL;
- uint32 *hunk_types = NULL;
+ enum lsa_SidType *hunk_types = NULL;
if (num_sids) {
if (!((*domains) = TALLOC_ARRAY(mem_ctx, char *, num_sids))) {
@@ -359,7 +359,7 @@ NTSTATUS rpccli_lsa_lookup_names(struct rpc_pipe_client
*cli,
const char ***dom_names,
int level,
DOM_SID **sids,
-uint32 **types)
+enum lsa_SidType **types)
{
prs_struct qbuf, rbuf;
LSA_Q_LOOKUP_NAMES q;
@@ -407,7 +407,7 @@ NTSTATUS rpccli_lsa_lookup_names(struct rpc_pipe_client
*cli,
goto done;
}
- if (!((*types = TALLOC_ARRAY(mem_ctx, uint32, num_names {
+ if (!((*types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType,
num_names {
DEBUG(0, (cli_lsa_lookup_sids(): out of memory\n));
result = NT_STATUS_NO_MEMORY;
goto done;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-120-ge6609ca
The branch, v3-2-test has been updated
via e6609cab732d5cd5cc9a5ae50aee15147f2ec6ec (commit)
from 2df8252ff76406bfe57cd76e9927b5056e89e6ae (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit e6609cab732d5cd5cc9a5ae50aee15147f2ec6ec
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Thu Oct 25 18:28:36 2007 -0700
Fix resolve name to resolve IPv6 addresses of link-local%ifaddr
Jeremy.
---
Summary of changes:
source/lib/interface.c| 117 +
source/lib/interfaces.c | 117 +++--
source/lib/util_sock.c|6 ++-
source/libsmb/namequery.c | 26 ++
4 files changed, 166 insertions(+), 100 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/interface.c b/source/lib/interface.c
index 49bbcec..9d073bc 100644
--- a/source/lib/interface.c
+++ b/source/lib/interface.c
@@ -88,6 +88,29 @@ bool is_local_net(const struct sockaddr_storage *from)
return false;
}
+#if defined(HAVE_IPV6)
+void setup_linklocal_scope_id(struct sockaddr_storage *pss)
+{
+ struct interface *i;
+ for (i=local_interfaces;i;i=i-next) {
+ if (addr_equal(i-ip,pss)) {
+ struct sockaddr_in6 *psa6 =
+ (struct sockaddr_in6 *)pss;
+ psa6-sin6_scope_id = if_nametoindex(i-name);
+ return;
+ }
+ }
+ for (i=local_interfaces;i;i=i-next) {
+ if (same_net(pss, i-ip, i-netmask)) {
+ struct sockaddr_in6 *psa6 =
+ (struct sockaddr_in6 *)pss;
+ psa6-sin6_scope_id = if_nametoindex(i-name);
+ return;
+ }
+ }
+}
+#endif
+
/
Check if a packet is from a local (known) net.
**/
@@ -326,100 +349,6 @@ static void add_interface(const struct iface_struct *ifs)
}
/
- Create a struct sockaddr_storage with the netmask bits set to 1.
-/
-
-bool make_netmask(struct sockaddr_storage *pss_out,
- const struct sockaddr_storage *pss_in,
- unsigned long masklen)
-{
- *pss_out = *pss_in;
- /* Now apply masklen bits of mask. */
-#if defined(HAVE_IPV6)
- if (pss_in-ss_family == AF_INET6) {
- char *p = (char *)((struct sockaddr_in6 *)pss_out)-sin6_addr;
- unsigned int i;
-
- if (masklen 128) {
- return false;
- }
- for (i = 0; masklen = 8; masklen -= 8, i++) {
- *p++ = 0xff;
- }
- /* Deal with the partial byte. */
- *p++ = (0xff ~(0xffmasklen));
- i++;
- for (;i sizeof(struct in6_addr); i++) {
- *p++ = '\0';
- }
- return true;
- }
-#endif
- if (pss_in-ss_family == AF_INET) {
- if (masklen 32) {
- return false;
- }
- ((struct sockaddr_in *)pss_out)-sin_addr.s_addr =
- htonl(((0xL masklen) ^ 0xL));
- return true;
- }
- return false;
-}
-
-/
- Create a struct sockaddr_storage set to the broadcast or network adress from
- an incoming sockaddr_storage.
-/
-
-static void make_bcast_or_net(struct sockaddr_storage *pss_out,
- const struct sockaddr_storage *pss_in,
- const struct sockaddr_storage *nmask,
- bool make_bcast)
-{
- unsigned int i = 0, len = 0;
- char *pmask = NULL;
- char *p = NULL;
- *pss_out = *pss_in;
-
- /* Set all zero netmask bits to 1. */
-#if defined(HAVE_IPV6)
- if (pss_in-ss_family == AF_INET6) {
- p = (char *)((struct sockaddr_in6 *)pss_out)-sin6_addr;
- pmask = (char *)((struct sockaddr_in6 *)nmask)-sin6_addr;
- len = 16;
- }
-#endif
- if (pss_in-ss_family == AF_INET) {
- p = (char *)((struct sockaddr_in *)pss_out)-sin_addr;
- pmask = (char *)((struct sockaddr_in *)nmask)-sin_addr;
- len = 4;
- }
-
- for (i = 0; i len; i++, p++, pmask++) {
- if (make_bcast) {
-
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-121-gf109f82
The branch, v3-2-test has been updated
via f109f82622ca30ae2360e8300152e90b9587ffd8 (commit)
from e6609cab732d5cd5cc9a5ae50aee15147f2ec6ec (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit f109f82622ca30ae2360e8300152e90b9587ffd8
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Thu Oct 25 19:07:25 2007 -0700
Fix bug in writing names into gencache
as well as 2 typos where AF_INET6 was mistypes as AF_INET.
JERRY YOU NEED THESE FIXES.
Fixes smbclient -L localhost -U%
Bugs reported by Kukks (thanks kukks).
Jeremy.
---
Summary of changes:
source/lib/interface.c |8
source/lib/util_sock.c |4 ++--
source/lib/util_str.c |7 ---
3 files changed, 6 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/interface.c b/source/lib/interface.c
index 9d073bc..9627bf6 100644
--- a/source/lib/interface.c
+++ b/source/lib/interface.c
@@ -100,14 +100,6 @@ void setup_linklocal_scope_id(struct sockaddr_storage *pss)
return;
}
}
- for (i=local_interfaces;i;i=i-next) {
- if (same_net(pss, i-ip, i-netmask)) {
- struct sockaddr_in6 *psa6 =
- (struct sockaddr_in6 *)pss;
- psa6-sin6_scope_id = if_nametoindex(i-name);
- return;
- }
- }
}
#endif
diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index c30f21e..80d4af8 100644
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -234,7 +234,7 @@ bool is_loopback_ip_v4(struct in_addr ip)
bool is_loopback_addr(const struct sockaddr_storage *pss)
{
#if defined(HAVE_IPV6)
- if (pss-ss_family == AF_INET) {
+ if (pss-ss_family == AF_INET6) {
struct in6_addr *pin6 =
((struct sockaddr_in6 *)pss)-sin6_addr;
return IN6_IS_ADDR_LOOPBACK(pin6);
@@ -265,7 +265,7 @@ bool is_zero_ip_v4(struct in_addr ip)
bool is_zero_addr(const struct sockaddr_storage *pss)
{
#if defined(HAVE_IPV6)
- if (pss-ss_family == AF_INET) {
+ if (pss-ss_family == AF_INET6) {
struct in6_addr *pin6 =
((struct sockaddr_in6 *)pss)-sin6_addr;
return IN6_IS_ADDR_UNSPECIFIED(pin6);
diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index 226bf82..1f3aab3 100644
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -2280,11 +2280,12 @@ static char *ipstr_list_add(char **ipstr_list, const
struct ip_service *service)
return NULL;
}
+ print_sockaddr(addr_buf,
+ sizeof(addr_buf),
+ service-ss);
+
/* attempt to convert ip to a string and append colon separator to it */
if (*ipstr_list) {
- print_sockaddr(addr_buf,
- sizeof(addr_buf),
- service-ss);
if (service-ss.ss_family == AF_INET) {
/* IPv4 */
asprintf(new_ipstr, %s%s%s:%d,
--
Samba Shared Repository
Rev 671: added monitoring of ftp ports in http://samba.org/~tridge/ctdb
revno: 671 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Fri 2007-10-26 14:53:09 +1000 message: added monitoring of ftp ports modified: config/events.d/40.vsftpd 40.vsftpd-20070605080716-mih15mjbgsjt7niv-1 === modified file 'config/events.d/40.vsftpd' --- a/config/events.d/40.vsftpd 2007-09-14 04:14:03 + +++ b/config/events.d/40.vsftpd 2007-10-26 04:53:09 + @@ -40,6 +40,10 @@ /bin/rm -f $CTDB_BASE/state/vsftpd/restart ;; + + monitor) + ctdb_check_tcp_ports ftp 20 21 + ;; esac exit 0
