use port/proto to represent services (not proto/port).
add FBSDID
This commit is contained in:
Philippe Charnier 2003-07-06 10:37:00 +00:00
parent 659045ffbf
commit 51f5c480cd
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=117278
5 changed files with 31 additions and 28 deletions

View File

@ -380,7 +380,7 @@ main(argc, argv)
...
sp = getservbyname("login", "tcp");
if (sp == NULL) {
fprintf(stderr, "rlogin: tcp/login: unknown service\en");
fprintf(stderr, "rlogin: login/tcp: unknown service\en");
exit(1);
}
hp = gethostbyname(argv[1]);

View File

@ -30,6 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)4.t 8.1 (Berkeley) 6/8/93
.\" $FreeBSD$
.\"
.\".ds RH "Client/Server Model
.bp
@ -123,7 +124,7 @@ main(argc, argv)
sp = getservbyname("login", "tcp");
if (sp == NULL) {
fprintf(stderr, "rlogind: tcp/login: unknown service\en");
fprintf(stderr, "rlogind: login/tcp: unknown service\en");
exit(1);
}
...
@ -172,7 +173,7 @@ definition:
.if n .ta .7i 1.4i 2.1i 2.8i
sp = getservbyname("login", "tcp");
if (sp == NULL) {
fprintf(stderr, "rlogind: tcp/login: unknown service\en");
fprintf(stderr, "rlogind: login/tcp: unknown service\en");
exit(1);
}
.sp 1
@ -272,7 +273,7 @@ login:
.DS
sp = getservbyname("login", "tcp");
if (sp == NULL) {
fprintf(stderr, "rlogin: tcp/login: unknown service\en");
fprintf(stderr, "rlogin: login/tcp: unknown service\en");
exit(1);
}
.DE

View File

@ -37,13 +37,14 @@ static const char copyright[] =
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
#if 0
#ifndef lint
static char sccsid[] = "@(#)rwhod.c 8.1 (Berkeley) 6/6/93";
#endif
static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/socket.h>
@ -163,8 +164,7 @@ int verify(char *, int);
static void usage(void);
#ifdef DEBUG
char *interval(int, char *);
void Sendto __P((int, const void *, size_t, int,
const struct sockaddr *, int));
void Sendto(int, const void *, size_t, int, const struct sockaddr *, int);
#define sendto Sendto
#endif
@ -217,7 +217,7 @@ main(int argc, char *argv[])
openlog("rwhod", LOG_PID, LOG_DAEMON);
sp = getservbyname("who", "udp");
if (sp == NULL) {
syslog(LOG_ERR, "udp/who: unknown service");
syslog(LOG_ERR, "who/udp: unknown service");
exit(1);
}
if (chdir(_PATH_RWHODIR) < 0) {

View File

@ -37,13 +37,14 @@ static const char copyright[] =
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
#if 0
#ifndef lint
static char sccsid[] = "@(#)timed.c 8.1 (Berkeley) 6/6/93";
#endif
static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#define TSPTYPES
#include "globals.h"
@ -93,10 +94,10 @@ static struct goodhost { /* hosts that we trust */
} *goodhosts;
static char *goodgroup; /* net group of trusted hosts */
static void checkignorednets __P((void));
static void pickslavenet __P((struct netinfo *));
static void add_good_host __P((char *, int));
static void usage __P((void));
static void checkignorednets(void);
static void pickslavenet(struct netinfo *);
static void add_good_host(char *, int);
static void usage(void);
/*
* The timedaemons synchronize the clocks of hosts in a local area network.
@ -216,7 +217,7 @@ main(argc, argv)
srvp = getservbyname("timed", "udp");
if (srvp == 0)
errx(1, "unknown service 'timed/udp'");
errx(1, "timed/udp: unknown service");
port = srvp->s_port;
bzero(&server, sizeof(struct sockaddr_in));
server.sin_port = srvp->s_port;

View File

@ -31,13 +31,14 @@
* SUCH DAMAGE.
*/
#ifndef lint
#if 0
#ifndef lint
static char sccsid[] = "@(#)cmds.c 8.1 (Berkeley) 6/6/93";
#endif
static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include "timedc.h"
#include <sys/file.h>
@ -188,7 +189,7 @@ clockdiff(argc, argv)
/* get the address for the date ready */
sp = getservbyname(DATE_PORT, DATE_PROTO);
if (!sp) {
warnx("%s/%s is an unknown service", DATE_PORT, DATE_PROTO);
warnx("%s/%s: unknown service", DATE_PORT, DATE_PROTO);
dayaddr.sin_port = 0;
} else {
dayaddr.sin_port = sp->s_port;
@ -287,7 +288,7 @@ msite(argc, argv)
srvp = getservbyname("timed", "udp");
if (srvp == 0) {
warnx("udp/timed: unknown service");
warnx("timed/udp: unknown service");
return;
}
dest.sin_port = srvp->s_port;
@ -390,7 +391,7 @@ testing(argc, argv)
srvp = getservbyname("timed", "udp");
if (srvp == 0) {
warnx("udp/timed: unknown service");
warnx("timed/udp: unknown service");
return;
}
@ -446,7 +447,7 @@ tracing(argc, argv)
srvp = getservbyname("timed", "udp");
if (srvp == 0) {
warnx("udp/timed: unknown service");
warnx("timed/udp: unknown service");
return;
}
dest.sin_port = srvp->s_port;