svn commit: lorikeet r651 - in trunk/heimdal/lib/roken: .
Author: abartlet
Date: 2006-11-06 05:00:34 + (Mon, 06 Nov 2006)
New Revision: 651
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=651
Log:
A few fixes to have Heimdal pass the make check under socket_wrapper.
The first is a missing 'break' before the (heimdal specific) IPv6 support.
The second works around the fact that sendto() *may* object to a
destination being specified. It appears to be that on Linux, this
objects (with EISCONN) for unix stream sockets, but not for TCP
sockets.
The alternate fix would be to have the KDC use 'send()' in this case.
Andrew Bartlett
Modified:
trunk/heimdal/lib/roken/socket_wrapper.c
Changeset:
Modified: trunk/heimdal/lib/roken/socket_wrapper.c
===
--- trunk/heimdal/lib/roken/socket_wrapper.c2006-11-06 00:41:47 UTC (rev
650)
+++ trunk/heimdal/lib/roken/socket_wrapper.c2006-11-06 05:00:34 UTC (rev
651)
@@ -388,6 +388,7 @@
return -1;
}
if (bcast) *bcast = is_bcast;
+ break;
}
#ifdef HAVE_IPV6
case AF_INET6: {
@@ -1673,38 +1674,45 @@
return real_sendto(s, buf, len, flags, to, tolen);
}
- if (si->bound == 0) {
- ret = swrap_auto_bind(si);
+ switch (si->type) {
+ case SOCK_STREAM:
+ ret = real_send(s, buf, len, flags);
+ break;
+ case SOCK_DGRAM:
+ if (si->bound == 0) {
+ ret = swrap_auto_bind(si);
+ if (ret == -1) return -1;
+ }
+
+ ret = sockaddr_convert_to_un(si, to, tolen, &un_addr, 0,
&bcast);
if (ret == -1) return -1;
- }
-
- ret = sockaddr_convert_to_un(si, to, tolen, &un_addr, 0, &bcast);
- if (ret == -1) return -1;
-
- if (bcast) {
- struct stat st;
- unsigned int iface;
- unsigned int prt = ntohs(((const struct sockaddr_in
*)to)->sin_port);
- char type;
-
- type = SOCKET_TYPE_CHAR_UDP;
-
- for(iface=0; iface <= MAX_WRAPPED_INTERFACES; iface++) {
- snprintf(un_addr.sun_path, sizeof(un_addr.sun_path),
"%s/"SOCKET_FORMAT,
-socket_wrapper_dir(), type, iface, prt);
- if (stat(un_addr.sun_path, &st) != 0) continue;
-
- /* ignore the any errors in broadcast sends */
- real_sendto(s, buf, len, flags, (struct sockaddr
*)&un_addr, sizeof(un_addr));
+
+ if (bcast) {
+ struct stat st;
+ unsigned int iface;
+ unsigned int prt = ntohs(((const struct sockaddr_in
*)to)->sin_port);
+ char type;
+
+ type = SOCKET_TYPE_CHAR_UDP;
+
+ for(iface=0; iface <= MAX_WRAPPED_INTERFACES; iface++) {
+ snprintf(un_addr.sun_path,
sizeof(un_addr.sun_path), "%s/"SOCKET_FORMAT,
+socket_wrapper_dir(), type, iface,
prt);
+ if (stat(un_addr.sun_path, &st) != 0) continue;
+
+ /* ignore the any errors in broadcast sends */
+ real_sendto(s, buf, len, flags, (struct
sockaddr *)&un_addr, sizeof(un_addr));
+ }
+
+ swrap_dump_packet(si, to, SWRAP_SENDTO, buf, len);
+
+ return len;
}
-
- swrap_dump_packet(si, to, SWRAP_SENDTO, buf, len);
-
- return len;
+
+ ret = real_sendto(s, buf, len, flags, (struct sockaddr
*)&un_addr, sizeof(un_addr));
+ break;
}
-
- ret = real_sendto(s, buf, len, flags, (struct sockaddr *)&un_addr,
sizeof(un_addr));
-
+
/* to give better errors */
if (ret == -1 && errno == ENOENT) {
errno = EHOSTUNREACH;
svn commit: lorikeet r650 - in trunk/heimdal/lib: gssapi/krb5 krb5
Author: abartlet
Date: 2006-11-06 00:41:47 + (Mon, 06 Nov 2006)
New Revision: 650
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=650
Log:
Add another error message, if there is no ticket to get the authz data from.
Fix extraction of authz data from the AuthorizationData sequence:
Where we had
IF-RELEVENT::
WIN2K-PAC
IF-RELEVENT::
SIGNED-PATH
The recursion into find_type_in_ad() for the second element would set
ret = ENOENT, and therefore the tail would set *found = FALSE, despite
the data already being found.
Andrew Bartlett
Modified:
trunk/heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c
trunk/heimdal/lib/krb5/ticket.c
Changeset:
Modified: trunk/heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c
===
--- trunk/heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c 2006-11-05
23:39:19 UTC (rev 649)
+++ trunk/heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c 2006-11-06
00:41:47 UTC (rev 650)
@@ -188,6 +188,7 @@
if (context_handle->ticket == NULL) {
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);
*minor_status = EINVAL;
+ _gsskrb5_set_status("No ticket to obtain authz data from");
return GSS_S_FAILURE;
}
Modified: trunk/heimdal/lib/krb5/ticket.c
===
--- trunk/heimdal/lib/krb5/ticket.c 2006-11-05 23:39:19 UTC (rev 649)
+++ trunk/heimdal/lib/krb5/ticket.c 2006-11-06 00:41:47 UTC (rev 650)
@@ -107,7 +107,11 @@
const AuthorizationData *ad,
int level)
{
-krb5_error_code ret = ENOENT;
+/* It is not an error if nothing in here, that is reported by *found */
+/* Setting a default error causes found to be set to FALSE, on
+ * recursion to an second embedded authz data even if the first
+ * element contains the required type */
+krb5_error_code ret = 0;
int i;
if (level > 9) {
@@ -117,10 +121,6 @@
goto out;
}
-/* Default case to match ret = ENOENT above */
-krb5_set_error_string(context, "Authorization data does not contain
element of type %d",
- type);
-
/*
* Only copy out the element the first time we get to it, we need
* to run over the whole authorization data fields to check if
@@ -228,9 +228,6 @@
krb5_data_free(data);
*found = 0;
}
-} else {
- /* clear default error string from above */
- krb5_clear_error_string(context);
}
return ret;
}
Build status as of Mon Nov 6 00:00:02 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-11-05 00:01:00.0 + +++ /home/build/master/cache/broken_results.txt 2006-11-06 00:00:25.0 + @@ -1,20 +1,20 @@ -Build status as of Sun Nov 5 00:00:02 2006 +Build status as of Mon Nov 6 00:00:02 2006 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 42 6 0 +ccache 41 6 0 distcc 3 0 0 ldb 40 3 0 libreplace 38 2 0 -lorikeet-heimdal 33 22 0 +lorikeet-heimdal 34 22 0 ppp 16 0 0 rsync42 4 0 samba0 0 0 samba-docs 0 0 0 -samba4 41 16 1 -samba_3_041 34 0 +samba4 41 15 1 +samba_3_042 33 0 smb-build38 1 0 talloc 42 3 0 tdb 41 2 0
svn commit: lorikeet r649 - in trunk/heimdal/lib/krb5: .
Author: abartlet
Date: 2006-11-05 23:39:19 + (Sun, 05 Nov 2006)
New Revision: 649
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=649
Log:
Add a default error message for the most common reason for failing to
find the PAC: it doesn't actually exist...
Andrew Bartlett
Modified:
trunk/heimdal/lib/krb5/ticket.c
Changeset:
Modified: trunk/heimdal/lib/krb5/ticket.c
===
--- trunk/heimdal/lib/krb5/ticket.c 2006-11-04 06:43:11 UTC (rev 648)
+++ trunk/heimdal/lib/krb5/ticket.c 2006-11-05 23:39:19 UTC (rev 649)
@@ -117,6 +117,10 @@
goto out;
}
+/* Default case to match ret = ENOENT above */
+krb5_set_error_string(context, "Authorization data does not contain
element of type %d",
+ type);
+
/*
* Only copy out the element the first time we get to it, we need
* to run over the whole authorization data fields to check if
@@ -224,6 +228,9 @@
krb5_data_free(data);
*found = 0;
}
+} else {
+ /* clear default error string from above */
+ krb5_clear_error_string(context);
}
return ret;
}
svn commit: samba-web r1056 - in trunk/team: .
Author: tpot Date: 2006-11-05 22:20:34 + (Sun, 05 Nov 2006) New Revision: 1056 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1056 Log: Remove another alumni and not alumni. Modified: trunk/team/index.html Changeset: Modified: trunk/team/index.html === --- trunk/team/index.html 2006-11-05 22:08:17 UTC (rev 1055) +++ trunk/team/index.html 2006-11-05 22:20:34 UTC (rev 1056) @@ -40,7 +40,6 @@ http://samba.org/~jra";>Jeremy Allison http://samba.org/~abartlet/";>Andrew Bartlett -mailto:[EMAIL PROTECTED]">John Blair mailto:[EMAIL PROTECTED]">Alexander Bokovoy http://www.plainjoe.org/";>Gerald Carter
svn commit: samba-web r1055 - in trunk/team: .
Author: tpot Date: 2006-11-05 22:08:17 + (Sun, 05 Nov 2006) New Revision: 1055 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1055 Log: Remove some alumni from active members list. Modified: trunk/team/index.html Changeset: Modified: trunk/team/index.html === --- trunk/team/index.html 2006-11-05 22:04:27 UTC (rev 1054) +++ trunk/team/index.html 2006-11-05 22:08:17 UTC (rev 1055) @@ -45,7 +45,6 @@ http://www.plainjoe.org/";>Gerald Carter http://samba.org/~gd";>Günther Deschner -mailto:[EMAIL PROTECTED]">David Fenwick mailto:[EMAIL PROTECTED]">Steve French mailto:[EMAIL PROTECTED]">Paul Green http://ubiqx.org/";>Chris Hertel @@ -63,12 +62,10 @@ Derrell Lipman mailto:[EMAIL PROTECTED]">Jim McDonough mailto:[EMAIL PROTECTED]">Stefan Metzmacher -mailto:[EMAIL PROTECTED]">Jean Francois Micouleau http://samba.org/~lmuelle/";>Lars Müller mailto:[EMAIL PROTECTED]">James Peach mailto:[EMAIL PROTECTED]">Tim Potter -mailto:[EMAIL PROTECTED]">Brian Roberson http://www.richardsharpe.com";>Richard Sharpe mailto:[EMAIL PROTECTED]">Dan Shearer mailto:[EMAIL PROTECTED]">Simo Sorce
svn commit: samba-web r1054 - in trunk/team: .
Author: tpot Date: 2006-11-05 22:04:27 + (Sun, 05 Nov 2006) New Revision: 1054 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1054 Log: Add some more alumni. Modified: trunk/team/index.html Changeset: Modified: trunk/team/index.html === --- trunk/team/index.html 2006-11-03 14:32:46 UTC (rev 1053) +++ trunk/team/index.html 2006-11-05 22:04:27 UTC (rev 1054) @@ -92,15 +92,19 @@ David Bannon mailto:[EMAIL PROTECTED]">Paul Blackman +John Blair mailto:[EMAIL PROTECTED]">Matt Chapman mailto:[EMAIL PROTECTED]">Elrond +Dave Fenwick mailto:[EMAIL PROTECTED]">Shirish Kalele mailto:[EMAIL PROTECTED]">Peter Kelly mailto:[EMAIL PROTECTED]">Luke Leighton mailto:[EMAIL PROTECTED]">Eckart Meyer mailto:[EMAIL PROTECTED]">Alexandre Oliva +Jean-François Micouleau http://sourcefrog.net/";>Martin Pool mailto:[EMAIL PROTECTED]">John Reilly +Brian Roberson mailto:[EMAIL PROTECTED]">Sander Striker mailto:[EMAIL PROTECTED]">Motonobu Takahashi
