diff options
author | Damien Miller <djm@mindrot.org> | 2010-11-05 10:52:37 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-11-05 10:52:37 +1100 |
commit | 34ee4204c6051f5f48113903750738e8e055a778 (patch) | |
tree | 9090ff610f7884e55b7c037cbcfbb02d96a40867 /loginrec.h | |
parent | 07331211949938b0dce95d6a8aae1500da9f5750 (diff) |
- (djm) [loginrec.c loginrec.h] Use correct uid_t/pid_t types instead of
int. Should fix bz#1817 cleanly; ok dtucker@
Diffstat (limited to 'loginrec.h')
-rw-r--r-- | loginrec.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/loginrec.h b/loginrec.h index 84b486590..28923e781 100644 --- a/loginrec.h +++ b/loginrec.h | |||
@@ -63,8 +63,8 @@ struct logininfo { | |||
63 | char progname[LINFO_PROGSIZE]; /* name of program (for PAM) */ | 63 | char progname[LINFO_PROGSIZE]; /* name of program (for PAM) */ |
64 | int progname_null; | 64 | int progname_null; |
65 | short int type; /* type of login (LTYPE_*) */ | 65 | short int type; /* type of login (LTYPE_*) */ |
66 | int pid; /* PID of login process */ | 66 | pid_t pid; /* PID of login process */ |
67 | int uid; /* UID of this user */ | 67 | uid_t uid; /* UID of this user */ |
68 | char line[LINFO_LINESIZE]; /* tty/pty name */ | 68 | char line[LINFO_LINESIZE]; /* tty/pty name */ |
69 | char username[LINFO_NAMESIZE]; /* login username */ | 69 | char username[LINFO_NAMESIZE]; /* login username */ |
70 | char hostname[LINFO_HOSTSIZE]; /* remote hostname */ | 70 | char hostname[LINFO_HOSTSIZE]; /* remote hostname */ |
@@ -86,12 +86,12 @@ struct logininfo { | |||
86 | /** 'public' functions */ | 86 | /** 'public' functions */ |
87 | 87 | ||
88 | /* construct a new login entry */ | 88 | /* construct a new login entry */ |
89 | struct logininfo *login_alloc_entry(int pid, const char *username, | 89 | struct logininfo *login_alloc_entry(pid_t pid, const char *username, |
90 | const char *hostname, const char *line); | 90 | const char *hostname, const char *line); |
91 | /* free a structure */ | 91 | /* free a structure */ |
92 | void login_free_entry(struct logininfo *li); | 92 | void login_free_entry(struct logininfo *li); |
93 | /* fill out a pre-allocated structure with useful information */ | 93 | /* fill out a pre-allocated structure with useful information */ |
94 | int login_init_entry(struct logininfo *li, int pid, const char *username, | 94 | int login_init_entry(struct logininfo *li, pid_t pid, const char *username, |
95 | const char *hostname, const char *line); | 95 | const char *hostname, const char *line); |
96 | /* place the current time in a logininfo struct */ | 96 | /* place the current time in a logininfo struct */ |
97 | void login_set_current_time(struct logininfo *li); | 97 | void login_set_current_time(struct logininfo *li); |
@@ -117,9 +117,9 @@ void login_set_addr(struct logininfo *li, const struct sockaddr *sa, | |||
117 | * lastlog retrieval functions | 117 | * lastlog retrieval functions |
118 | */ | 118 | */ |
119 | /* lastlog *entry* functions fill out a logininfo */ | 119 | /* lastlog *entry* functions fill out a logininfo */ |
120 | struct logininfo *login_get_lastlog(struct logininfo *li, const int uid); | 120 | struct logininfo *login_get_lastlog(struct logininfo *li, const uid_t uid); |
121 | /* lastlog *time* functions return time_t equivalent (uint) */ | 121 | /* lastlog *time* functions return time_t equivalent (uint) */ |
122 | unsigned int login_get_lastlog_time(const int uid); | 122 | unsigned int login_get_lastlog_time(const uid_t uid); |
123 | 123 | ||
124 | /* produce various forms of the line filename */ | 124 | /* produce various forms of the line filename */ |
125 | char *line_fullname(char *dst, const char *src, u_int dstsize); | 125 | char *line_fullname(char *dst, const char *src, u_int dstsize); |