diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-07-29 18:39:24 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-07-29 18:39:24 +0000 |
| commit | 6b78b159d102a0d9c9569fdfe01402c43ed808db (patch) | |
| tree | c52077c3e099acdf85db980a2c821320dbcc7463 /libexec/identd | |
| parent | ef45b046d50271fb77ae73c50cf2bb20badc690f (diff) | |
spaces
Diffstat (limited to 'libexec/identd')
| -rw-r--r-- | libexec/identd/identd.c | 4 | ||||
| -rw-r--r-- | libexec/identd/parse.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libexec/identd/identd.c b/libexec/identd/identd.c index 2dc91594ac2..100da895690 100644 --- a/libexec/identd/identd.c +++ b/libexec/identd/identd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: identd.c,v 1.35 2003/06/28 01:05:21 deraadt Exp $ */ +/* $OpenBSD: identd.c,v 1.36 2003/07/29 18:39:23 deraadt Exp $ */ /* * This program is in the public domain and may be used freely by anyone @@ -141,7 +141,7 @@ alarm_handler(int notused) /* * Main entry point into this daemon */ -int +int main(int argc, char *argv[]) { struct sockaddr_storage sa, sa2; diff --git a/libexec/identd/parse.c b/libexec/identd/parse.c index e0293d51838..b6185d22314 100644 --- a/libexec/identd/parse.c +++ b/libexec/identd/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.37 2003/06/28 01:05:21 deraadt Exp $ */ +/* $OpenBSD: parse.c,v 1.38 2003/07/29 18:39:23 deraadt Exp $ */ /* * This program is in the public domain and may be used freely by anyone @@ -255,11 +255,11 @@ parse(int fd, struct in_addr *laddr, struct in_addr *faddr) gentoken(token, sizeof token); syslog(LOG_NOTICE, "token %s == NO USER", token); n = snprintf(buf, sizeof(buf), - "%d , %d : USERID : %s%s%s :%s\r\n", lport, fport, + "%d , %d : USERID : %s%s%s :%s\r\n", lport, fport, opsys_name, charset_sep, charset_name, token); - if (timed_write(fd, buf, n, IO_TIMEOUT) != n && + if (timed_write(fd, buf, n, IO_TIMEOUT) != n && syslog_flag) { - syslog(LOG_NOTICE, "write to %s: %m", + syslog(LOG_NOTICE, "write to %s: %m", gethost4_addr(faddr)); return 1; } @@ -451,11 +451,11 @@ parse6(int fd, struct sockaddr_in6 *laddr, struct sockaddr_in6 *faddr) gentoken(token, sizeof token); syslog(LOG_NOTICE, "token %s == NO USER", token); n = snprintf(buf, sizeof(buf), - "%d , %d : USERID : %s%s%s :%s\r\n", lport, fport, + "%d , %d : USERID : %s%s%s :%s\r\n", lport, fport, opsys_name, charset_sep, charset_name, token); - if (timed_write(fd, buf, n, IO_TIMEOUT) != n && + if (timed_write(fd, buf, n, IO_TIMEOUT) != n && syslog_flag) { - syslog(LOG_NOTICE, "write to %s: %m", + syslog(LOG_NOTICE, "write to %s: %m", gethost6(faddr)); return 1; } |