aboutsummaryrefslogtreecommitdiff
path: root/contrib/amd/amd/amd.c
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>1999-09-15 02:50:52 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>1999-09-15 02:50:52 +0000
commit179d036e252d325d8a57a2b058c7066bdfc48869 (patch)
treebabaa2d3f02bbec865446438f974c81f18ae2607 /contrib/amd/amd/amd.c
parent75cb9b41f6a12ac4b05d08c9dcba1872400f9166 (diff)
downloadsrc-179d036e252d325d8a57a2b058c7066bdfc48869.tar.gz
src-179d036e252d325d8a57a2b058c7066bdfc48869.zip
Virgin import of AMD (am-utils) v6.0.1
Notes
Notes: svn path=/vendor/amd/dist/; revision=51292
Diffstat (limited to 'contrib/amd/amd/amd.c')
-rw-r--r--contrib/amd/amd/amd.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/contrib/amd/amd/amd.c b/contrib/amd/amd/amd.c
index e3b1ed8a786e..a272625a7bf2 100644
--- a/contrib/amd/amd/amd.c
+++ b/contrib/amd/amd/amd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997-1998 Erez Zadok
+ * Copyright (c) 1997-1999 Erez Zadok
* Copyright (c) 1989 Jan-Simon Pendry
* Copyright (c) 1989 Imperial College of Science, Technology & Medicine
* Copyright (c) 1989 The Regents of the University of California.
@@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
- * $Id: amd.c,v 1.2 1998/12/27 06:24:45 ezk Exp $
+ * $Id: amd.c,v 1.5 1999/02/04 07:24:14 ezk Exp $
*
*/
@@ -55,13 +55,7 @@
struct amu_global_options gopt; /* where global options are stored */
char pid_fsname[16 + MAXHOSTNAMELEN]; /* "kiska.southseas.nz:(pid%d)" */
-#if 0
-char *progname; /* "amd" */
-#endif
char *hostdomain = "unknown.domain";
-#if 0
-char hostname[MAXHOSTNAMELEN + 1] = "localhost"; /* Hostname */
-#endif
char hostd[2 * MAXHOSTNAMELEN + 1]; /* Host+domain */
char *endian = ARCH_ENDIAN; /* Big or Little endian */
char *cpu = HOST_CPU; /* CPU type */
@@ -73,11 +67,6 @@ int orig_umask = 022;
int select_intr_valid;
jmp_buf select_intr;
-#if 0
-pid_t mypid; /* Current process id */
-serv_state amd_state;
-int foreground = 1; /* This is the top-level server */
-#endif
struct amd_stats amd_stats; /* Server statistics */
struct in_addr myipaddr; /* (An) IP address of this host */
time_t do_mapc_reload = 0; /* mapc_reload() call required? */
@@ -490,7 +479,7 @@ main(int argc, char *argv[])
* can mount the automounter.
*/
amu_get_myaddress(&myipaddr);
- plog(XLOG_INFO, "My ip addr is 0x%x", htonl(myipaddr.s_addr));
+ plog(XLOG_INFO, "My ip addr is %s", inet_ntoa(myipaddr));
/* avoid hanging on other NFS servers if started elsewhere */
if (chdir("/") < 0)
@@ -500,7 +489,7 @@ main(int argc, char *argv[])
* Now check we are root.
*/
if (geteuid() != 0) {
- plog(XLOG_FATAL, "Must be root to mount filesystems (euid = %d)", geteuid());
+ plog(XLOG_FATAL, "Must be root to mount filesystems (euid = %ld)", (long) geteuid());
going_down(1);
}