oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(init_socket): rename variable sun to un to avoid namespace collision.

Browse Source 
(handle_stream): Cast arg of krb5_warnx.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15050 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-05-02 14:04:39 +00:00
parent 40fd46885a
commit f6a4a143c1
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kcm/connect.c
View File

@@ -155,20 +155,20 @@ update_client_creds(int s, kcm_client *peer)
static void static void
init_socket(struct descr *d) init_socket(struct descr *d)
{ {
struct sockaddr_un sun; struct sockaddr_un un;
struct sockaddr *sa = (struct sockaddr *)&sun; struct sockaddr *sa = (struct sockaddr *)&un;
krb5_socklen_t sa_size = sizeof(sun); krb5_socklen_t sa_size = sizeof(un);
init_descr (d); init_descr (d);
sun.sun_family = AF_UNIX; un.sun_family = AF_UNIX;
if (socket_path != NULL) if (socket_path != NULL)
d->path = socket_path; d->path = socket_path;
else else
d->path = _PATH_KCM_SOCKET; d->path = _PATH_KCM_SOCKET;
strlcpy(sun.sun_path, d->path, sizeof(sun.sun_path)); strlcpy(un.sun_path, d->path, sizeof(un.sun_path));
d->s = socket(AF_UNIX, SOCK_STREAM, 0); d->s = socket(AF_UNIX, SOCK_STREAM, 0);
if (d->s < 0){ if (d->s < 0){
@@ -194,14 +194,14 @@ init_socket(struct descr *d)
unlink(d->path); unlink(d->path);
if (bind(d->s, sa, sa_size) < 0) { if (bind(d->s, sa, sa_size) < 0) {
krb5_warn(kcm_context, errno, "bind %s", sun.sun_path); krb5_warn(kcm_context, errno, "bind %s", un.sun_path);
close(d->s); close(d->s);
d->s = -1; d->s = -1;
return; return;
} }
if (listen(d->s, SOMAXCONN) < 0) { if (listen(d->s, SOMAXCONN) < 0) {
krb5_warn(kcm_context, errno, "listen %s", sun.sun_path); krb5_warn(kcm_context, errno, "listen %s", un.sun_path);
close(d->s); close(d->s);
d->s = -1; d->s = -1;
return; return;
@@ -432,9 +432,9 @@ handle_stream(struct descr *d, int index, int min_free)
krb5_warn(kcm_context, errno, "recvfrom"); krb5_warn(kcm_context, errno, "recvfrom");
return; return;
} else if (n == 0) { } else if (n == 0) {
krb5_warnx(kcm_context, "connection closed before end of data after %lu " krb5_warnx(kcm_context, "connection closed before end of data "
"bytes from process %d", "after %lu bytes from process %ld",
(unsigned long)d[index].len, d[index].peercred.pid); (unsigned long) d[index].len, (long) d[index].peercred.pid);
clear_descr (d + index); clear_descr (d + index);
return; return;
} }