diff options
| author | Mike Pechkin <mpech@cvs.openbsd.org> | 2002-01-07 08:13:32 +0000 |
|---|---|---|
| committer | Mike Pechkin <mpech@cvs.openbsd.org> | 2002-01-07 08:13:32 +0000 |
| commit | 280a5c530ab0972d3b9f442bc3c7e623aecf0387 (patch) | |
| tree | b608f376d752e0db926c1876de5f97075a647101 /libexec/identd | |
| parent | 4b2e548161262963f0831ec169e409edd1b23664 (diff) | |
o) int -> {uid,gid}_t; %d -> %u;
o) int -> pid_t;
deraadt@ ok
Diffstat (limited to 'libexec/identd')
| -rw-r--r-- | libexec/identd/identd.c | 8 | ||||
| -rw-r--r-- | libexec/identd/parse.c | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libexec/identd/identd.c b/libexec/identd/identd.c index 86561f9bc0f..7acf378ce29 100644 --- a/libexec/identd/identd.c +++ b/libexec/identd/identd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: identd.c,v 1.22 2001/11/17 19:54:56 deraadt Exp $ */ +/* $OpenBSD: identd.c,v 1.23 2002/01/07 08:13:31 mpech Exp $ */ /* * This program is in the public domain and may be used freely by anyone @@ -56,7 +56,7 @@ char *charset_name = ""; char *indirect_host = NULL; char *indirect_password = NULL; -static int child_pid; +static pid_t child_pid; #ifdef LOG_DAEMON static int syslog_facility = LOG_DAEMON; @@ -166,8 +166,8 @@ main(argc, argv) int timeout = 0; char *portno = "auth"; char *bind_address = NULL; - int set_uid = 0; - int set_gid = 0; + uid_t set_uid = 0; + gid_t set_gid = 0; extern char *optarg; extern int optind; int ch; diff --git a/libexec/identd/parse.c b/libexec/identd/parse.c index 9a17e151169..7be252081fa 100644 --- a/libexec/identd/parse.c +++ b/libexec/identd/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.27 2001/12/01 18:54:43 deraadt Exp $ */ +/* $OpenBSD: parse.c,v 1.28 2002/01/07 08:13:31 mpech Exp $ */ /* * This program is in the public domain and may be used freely by anyone @@ -282,10 +282,10 @@ parse(fd, laddr, faddr) if (!pw) { if (syslog_flag) syslog(LOG_WARNING, - "getpwuid() could not map uid (%d) to name", + "getpwuid() could not map uid (%u) to name", uid); n = snprintf(buf, sizeof(buf), - "%d , %d : USERID : %s%s%s :%d\r\n", + "%d , %d : USERID : %s%s%s :%u\r\n", lport, fport, opsys_name, charset_sep, charset_name, uid); if (timed_write(fd, buf, n, IO_TIMEOUT) != n && syslog_flag) { syslog(LOG_NOTICE, "write to %s: %m", gethost4_addr(faddr)); @@ -341,7 +341,7 @@ parse(fd, laddr, faddr) if (number_flag) { n = snprintf(buf, sizeof(buf), - "%d , %d : USERID : %s%s%s :%d\r\n", + "%d , %d : USERID : %s%s%s :%u\r\n", lport, fport, opsys_name, charset_sep, charset_name, uid); if (timed_write(fd, buf, n, IO_TIMEOUT) != n && syslog_flag) { syslog(LOG_NOTICE, "write to %s: %m", gethost4_addr(faddr)); @@ -452,10 +452,10 @@ parse6(fd, laddr, faddr) if (!pw) { if (syslog_flag) syslog(LOG_WARNING, - "getpwuid() could not map uid (%d) to name", + "getpwuid() could not map uid (%u) to name", uid); n = snprintf(buf, sizeof(buf), - "%d , %d : USERID : %s%s%s :%d\r\n", + "%d , %d : USERID : %s%s%s :%u\r\n", lport, fport, opsys_name, charset_sep, charset_name, uid); if (timed_write(fd, buf, n, IO_TIMEOUT) != n && syslog_flag) { syslog(LOG_NOTICE, "write to %s: %m", gethost6(faddr)); @@ -511,7 +511,7 @@ parse6(fd, laddr, faddr) if (number_flag) { n = snprintf(buf, sizeof(buf), - "%d , %d : USERID : %s%s%s :%d\r\n", + "%d , %d : USERID : %s%s%s :%u\r\n", lport, fport, opsys_name, charset_sep, charset_name, uid); if (timed_write(fd, buf, n, IO_TIMEOUT) != n && syslog_flag) { syslog(LOG_NOTICE, "write to %s: %m", gethost6(faddr)); |