summaryrefslogtreecommitdiff
path: root/lib/libskey/skeyaccess.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libskey/skeyaccess.c')
-rw-r--r--lib/libskey/skeyaccess.c32
1 files changed, 15 insertions, 17 deletions
diff --git a/lib/libskey/skeyaccess.c b/lib/libskey/skeyaccess.c
index b5796abe0b0b..5a6e2d3a2963 100644
--- a/lib/libskey/skeyaccess.c
+++ b/lib/libskey/skeyaccess.c
@@ -45,12 +45,12 @@
*/
static char *prev_token = 0; /* push-back buffer */
static char *line_pointer = NULL;
-static char *first_token __P((char *, int, FILE *));
+static char *first_token();
static int line_number;
-static void unget_token __P((char *));
-static char *get_token __P((void));
-static char *need_token __P((void));
-static char *need_internet_addr __P((void));
+static void unget_token();
+static char *get_token();
+static char *need_token();
+static char *need_internet_addr();
/*
* Various forms of token matching.
@@ -58,13 +58,12 @@ static char *need_internet_addr __P((void));
#define match_host_name(l) match_token((l)->host_name)
#define match_port(l) match_token((l)->port)
#define match_user(l) match_token((l)->user)
-struct login_info;
-static int match_internet_addr __P((struct login_info *));
-static int match_group __P((struct login_info *));
-static int match_token __P((char *));
-static int is_internet_addr __P((char *));
-static struct in_addr *convert_internet_addr __P((char *));
-static struct in_addr *lookup_internet_addr __P((char *));
+static int match_internet_addr();
+static int match_group();
+static int match_token();
+static int is_internet_addr();
+static struct in_addr *convert_internet_addr();
+static struct in_addr *lookup_internet_addr();
#define MAX_ADDR 32
#define PERMIT 1
@@ -84,8 +83,7 @@ struct login_info {
char *port; /* login port */
};
-static int _skeyaccess __P((FILE *, struct login_info *));
-int skeyaccess __P((char *, char *, char *, char *));
+static int _skeyaccess __P(( FILE *, struct login_info * ));
/* skeyaccess - find out if UNIX passwords are permitted */
@@ -410,7 +408,7 @@ char *host;
for (i = 0; i < MAX_ADDR && hp->h_addr_list[i]; i++)
memcpy((char *) &list[i],
- hp->h_addr_list[i], (size_t)hp->h_length);
+ hp->h_addr_list[i], hp->h_length);
list[i].s_addr = 0;
strncpy(buf, hp->h_name, MAXHOSTNAMELEN);
@@ -429,12 +427,12 @@ char *host;
if ((hp = gethostbyaddr((char *) &list[i], length, AF_INET)) == 0) {
syslog(LOG_ERR, "address %s not registered for host %s",
inet_ntoa(list[i]), buf);
- list[i].s_addr = (u_int32_t) -1;
+ list[i].s_addr = -1;
}
if (NEQ(buf, hp->h_name) && NEQ3(buf, "localhost.", 10)) {
syslog(LOG_ERR, "address %s registered for host %s and %s",
inet_ntoa(list[i]), hp->h_name, buf);
- list[i].s_addr = (u_int32_t) -1;
+ list[i].s_addr = -1;
}
}
return (list);