[src/trunk]: src/dist/am-utils fix merge botches.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bad7c641d4b5
branches:  trunk
changeset: 571496:bad7c641d4b5
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Nov 27 01:39:50 2004 +0000

description:
fix merge botches.

diffstat:

 dist/am-utils/amd/amd.h                    |  4 ++--
 dist/am-utils/amd/amfs_host.c              |  5 ++---
 dist/am-utils/conf/transp/transp_sockets.c |  4 +---
 dist/am-utils/include/am_utils.h           |  4 +++-
 4 files changed, 8 insertions(+), 9 deletions(-)

diffs (73 lines):

diff -r 05916281184e -r bad7c641d4b5 dist/am-utils/amd/amd.h
--- a/dist/am-utils/amd/amd.h   Sat Nov 27 01:39:23 2004 +0000
+++ b/dist/am-utils/amd/amd.h   Sat Nov 27 01:39:50 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amd.h,v 1.1.1.7 2004/11/27 01:00:38 christos Exp $     */
+/*     $NetBSD: amd.h,v 1.2 2004/11/27 01:39:50 christos Exp $ */
 
 /*
  * Copyright (c) 1997-2004 Erez Zadok
@@ -579,7 +579,7 @@
 extern int  mapc_keyiter(mnt_map *, key_fun, opaque_t);
 extern void mapc_reload(void);
 extern int  mapc_search(mnt_map *, char *, char **);
-extern void mapc_showtypes(char *buf);
+extern void mapc_showtypes(char *buf, size_t buflen);
 extern int  mapc_type_exists(const char *type);
 extern void mk_fattr(nfsfattr *, nfsftype);
 extern int  mount_auto_node(char *, opaque_t);
diff -r 05916281184e -r bad7c641d4b5 dist/am-utils/amd/amfs_host.c
--- a/dist/am-utils/amd/amfs_host.c     Sat Nov 27 01:39:23 2004 +0000
+++ b/dist/am-utils/amd/amfs_host.c     Sat Nov 27 01:39:50 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amfs_host.c,v 1.4 2004/11/27 01:24:35 christos Exp $   */
+/*     $NetBSD: amfs_host.c,v 1.5 2004/11/27 01:39:50 christos Exp $   */
 
 /*
  * Copyright (c) 1997-2004 Erez Zadok
@@ -479,8 +479,7 @@
     if (ex) {
       strlcpy(rfs_dir, ex->ex_dir, sizeof(fs_name) - (rfs_dir - fs_name));
       make_mntpt(mntpt, sizeof(mntpt), ex, mf->mf_mount);
-      if (do_mount(&fp[j], mntpt, real_mntpt, fs_name, mf->mf_mopts,
-                  am->am_flags & AMF_AUTOFS, mf) == 0)
+      if (do_mount(&fp[j], mntpt, fs_name, mf) == 0)
        ok = TRUE;
     }
   }
diff -r 05916281184e -r bad7c641d4b5 dist/am-utils/conf/transp/transp_sockets.c
--- a/dist/am-utils/conf/transp/transp_sockets.c        Sat Nov 27 01:39:23 2004 +0000
+++ b/dist/am-utils/conf/transp/transp_sockets.c        Sat Nov 27 01:39:50 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: transp_sockets.c,v 1.6 2004/11/27 01:24:35 christos Exp $      */
+/*     $NetBSD: transp_sockets.c,v 1.7 2004/11/27 01:39:50 christos Exp $      */
 
 /*
  * Copyright (c) 1997-2004 Erez Zadok
@@ -284,8 +284,6 @@
                   struct netconfig **dummy1, int *tcp_soAMQp,
                   SVCXPRT **tcp_amqpp, struct netconfig **dummy2)
 {
-  int maxrec = RPC_MAXDATASIZE;
-
   /* first create TCP service */
   if (tcp_soAMQp) {
     *tcp_soAMQp = socket(AF_INET, SOCK_STREAM, 0);
diff -r 05916281184e -r bad7c641d4b5 dist/am-utils/include/am_utils.h
--- a/dist/am-utils/include/am_utils.h  Sat Nov 27 01:39:23 2004 +0000
+++ b/dist/am-utils/include/am_utils.h  Sat Nov 27 01:39:50 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: am_utils.h,v 1.8 2004/11/27 01:24:36 christos Exp $    */
+/*     $NetBSD: am_utils.h,v 1.9 2004/11/27 01:39:50 christos Exp $    */
 
 /*
  * Copyright (c) 1997-2004 Erez Zadok
@@ -325,6 +325,8 @@
 extern int check_pmap_up(char *host, struct sockaddr_in* sin);
 extern u_long get_nfs_version(char *host, struct sockaddr_in *sin, u_long nfs_version, const char *proto);
 extern long get_server_pid(void);
+extern void dplog(const char *fmt, ...);
+
 
 
 #ifdef MOUNT_TABLE_ON_FILE